diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b02e4f8359..68e182ef3d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,24 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-26 02:43 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/xhb/hbcrypt.c + * contrib/hbw32/tprinter.c + * contrib/hbw32/w32_ole.c + * contrib/hbw32/w32_prn.c + * contrib/hbfbird/tests/testapi.c + * contrib/hbziparch/hbziparc.c + * contrib/hbziparch/hbzipnew.cpp + * contrib/hbhpdf/harupdf.c + * contrib/hbfimage/fi_winfu.c + * contrib/hbfimage/fi_wrp.c + * contrib/hbgf/hbgfw32/win32.c + * contrib/hbgf/hbgfos2/os2pm.c + * source/rtl/filesys.c + * utils/hbtest/rt_miscc.c + * // -> ANSI comments. + ; NOTE: hbwhat32 and gtwvg remain with //. + 2008-08-26 00:43 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vc.bat * make_vcce.bat diff --git a/harbour/contrib/hbfbird/tests/testapi.c b/harbour/contrib/hbfbird/tests/testapi.c index 92f1198cac..0c4cb753f8 100644 --- a/harbour/contrib/hbfbird/tests/testapi.c +++ b/harbour/contrib/hbfbird/tests/testapi.c @@ -105,24 +105,24 @@ int query( char *sel_str ) if ( isc_start_transaction ( status, &trans, 1, &db, 0, NULL ) ) ERREXIT(status, 1); - // Allocate an output SQLDA. Just to check number of columns + /* Allocate an output SQLDA. Just to check number of columns */ sqlda = ( XSQLDA * ) malloc( XSQLDA_LENGTH ( 1 ) ); sqlda->sqln = 1; sqlda->version = 1; - // Allocate a statement + /* Allocate a statement */ if (isc_dsql_allocate_statement(status, &db, &stmt)) ERREXIT(status, 1); - // Prepare the statement. + /* Prepare the statement. */ if (isc_dsql_prepare(status, &trans, &stmt, 0, sel_str, dialect, sqlda)) ERREXIT(status, 1); - // Describe sql contents + /* Describe sql contents */ if (isc_dsql_describe(status, &stmt, dialect, sqlda)) ERREXIT(status, 1); - // Relocate necessary number of columns + /* Relocate necessary number of columns */ if ( sqlda->sqld > sqlda->sqln ) { free( sqlda ); n = sqlda->sqld; @@ -158,7 +158,7 @@ int query( char *sel_str ) } if ( !sqlda->sqld ) { - // Execute and commit non-select querys + /* Execute and commit non-select querys */ if ( isc_dsql_execute ( status, &trans, &stmt, dialect, NULL ) ) ERREXIT(status, 1); diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c index c35bc98458..ae2d51ae10 100644 --- a/harbour/contrib/hbfimage/fi_winfu.c +++ b/harbour/contrib/hbfimage/fi_winfu.c @@ -73,12 +73,12 @@ #include "FreeImage.h" -// -------------------------------------------------------------------------- -// Convert from FreeImage to HBITMAP ---------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Convert from FreeImage to HBITMAP ---------------------------------------- */ +/* -------------------------------------------------------------------------- */ #if ( defined(HB_OS_WIN_32) || defined(__WIN32__) ) -// implementation: HBITMAP bitmap = FI_FiToBitmap( FIBITMAP *dib ); +/* implementation: HBITMAP bitmap = FI_FiToBitmap( FIBITMAP *dib ); */ HB_FUNC( FI_FITOBITMAP ) { if ( hb_pcount() == 1 && @@ -108,7 +108,7 @@ HB_FUNC( FI_FITOBITMAP ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -118,13 +118,13 @@ HB_FUNC( FI_FITOBITMAP ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -------------------------------------------------------------------------- -// Convert from HBITMAP to FreeImage ---------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Convert from HBITMAP to FreeImage ---------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// implementation: FIBITMAP *dib = FI_BitmapToFi( HBITMAP bitmap ); +/* implementation: FIBITMAP *dib = FI_BitmapToFi( HBITMAP bitmap ); */ HB_FUNC( FI_BITMAPTOFI ) { if ( hb_pcount() == 1 && @@ -161,7 +161,7 @@ HB_FUNC( FI_BITMAPTOFI ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -171,13 +171,13 @@ HB_FUNC( FI_BITMAPTOFI ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -------------------------------------------------------------------------- -// Draw an image in a window Box -------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Draw an image in a window Box -------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// implementation: int scanlines = FI_WinDraw( FIBITMAP *dib, HDC hDC, nTop, nLeft, nBottom, nRight ); +/* implementation: int scanlines = FI_WinDraw( FIBITMAP *dib, HDC hDC, nTop, nLeft, nBottom, nRight ); */ HB_FUNC( FI_WINDRAW ) { if ( hb_pcount() == 6 && @@ -219,7 +219,7 @@ HB_FUNC( FI_WINDRAW ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 6, @@ -231,6 +231,6 @@ HB_FUNC( FI_WINDRAW ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -#endif // ( defined(HB_OS_WIN_32) || defined(__WIN32__) ) +#endif /* ( defined(HB_OS_WIN_32) || defined(__WIN32__) ) */ diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index 2d07e25c81..491eacd9fe 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -75,14 +75,14 @@ /* ************************* WRAPPED FUNCTIONS ****************************** */ -// static for error handler (see below FI_SETOUTPUTMESSAGE ) +/* static for error handler (see below FI_SETOUTPUTMESSAGE ) */ static void *pErrorHandler = NULL; -// -------------------------------------------------------------------------- -// Init / Error routines ---------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Init / Error routines ---------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only FI_DEFAULT(FALSE)); +/* DLL_API void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only FI_DEFAULT(FALSE)); */ HB_FUNC( FI_INITIALISE ) { BOOL bLoadPluginsOnly; @@ -94,45 +94,45 @@ HB_FUNC( FI_INITIALISE ) FreeImage_Initialise( bLoadPluginsOnly ); } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_DeInitialise(void); +/* DLL_API void DLL_CALLCONV FreeImage_DeInitialise(void); */ HB_FUNC( FI_DEINITIALISE ) { /* Run function */ FreeImage_DeInitialise(); } -// -------------------------------------------------------------------------- -// Version routines --------------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Version routines --------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API const char *DLL_CALLCONV FreeImage_GetVersion(void); +/* DLL_API const char *DLL_CALLCONV FreeImage_GetVersion(void); */ HB_FUNC( FI_GETVERSION ) { /* Run function & return value */ hb_retc( FreeImage_GetVersion() ); } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); +/* DLL_API const char *DLL_CALLCONV FreeImage_GetCopyrightMessage(void); */ HB_FUNC( FI_GETCOPYRIGHTMESSAGE ) { /* Run function & return value */ hb_retc( FreeImage_GetCopyrightMessage() ); } -// -------------------------------------------------------------------------- -// Message output functions ------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Message output functions ------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...); +/* DLL_API void DLL_CALLCONV FreeImage_OutputMessageProc(int fif, const char *fmt, ...); */ -// typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg); -// DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf); +/* typedef void (*FreeImage_OutputMessageFunction)(FREE_IMAGE_FORMAT fif, const char *msg); */ +/* DLL_API void DLL_CALLCONV FreeImage_SetOutputMessage(FreeImage_OutputMessageFunction omf); */ -// implementation: void FreeImage_SetOutputMessage( pFunctionPointer ) +/* implementation: void FreeImage_SetOutputMessage( pFunctionPointer ) */ /** FreeImage error handler @@ -146,13 +146,13 @@ void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) if ( pErrorHandler == NULL ) { - // Do nothing + /* Do nothing */ return; } pSymbol = (PHB_SYMB) pErrorHandler; - //TraceLog( NULL, "ErrorHandle %p\n\r", pErrorHandler ); + /*TraceLog( NULL, "ErrorHandle %p\n\r", pErrorHandler );*/ if( pSymbol == NULL ) { @@ -182,16 +182,16 @@ HB_FUNC( FI_SETOUTPUTMESSAGE ) { if ( hb_parinfo( 1 ) & HB_IT_POINTER ) { - // Set the pointer + /* Set the pointer */ pErrorHandler = hb_parptr( 1 ); } else if ( ISNIL( 1 ) ) { - // do nothing + /* do nothing */ } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -202,11 +202,12 @@ HB_FUNC( FI_SETOUTPUTMESSAGE ) } } } -// -------------------------------------------------------------------------- -// Allocate / Clone / Unload routines --------------------------------------- -// -------------------------------------------------------------------------- -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Allocate(int width, int height, int bpp, unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); +/* -------------------------------------------------------------------------- */ +/* Allocate / Clone / Unload routines --------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Allocate(int width, int height, int bpp, unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); */ HB_FUNC( FI_ALLOCATE ) { if ( hb_pcount() >= 3 && @@ -232,7 +233,7 @@ HB_FUNC( FI_ALLOCATE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -243,9 +244,9 @@ HB_FUNC( FI_ALLOCATE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateT(FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_AllocateT(FREE_IMAGE_TYPE type, int width, int height, int bpp FI_DEFAULT(8), unsigned red_mask FI_DEFAULT(0), unsigned green_mask FI_DEFAULT(0), unsigned blue_mask FI_DEFAULT(0)); */ HB_FUNC( FI_ALLOCATET ) { if ( hb_pcount() >= 3 && @@ -273,7 +274,7 @@ HB_FUNC( FI_ALLOCATET ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -284,9 +285,9 @@ HB_FUNC( FI_ALLOCATET ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP * DLL_CALLCONV FreeImage_Clone(FIBITMAP *dib); +/* DLL_API FIBITMAP * DLL_CALLCONV FreeImage_Clone(FIBITMAP *dib); */ HB_FUNC( FI_CLONE ) { if ( hb_pcount() == 1 && @@ -311,7 +312,7 @@ HB_FUNC( FI_CLONE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -321,9 +322,9 @@ HB_FUNC( FI_CLONE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_Unload(FIBITMAP *dib); +/* DLL_API void DLL_CALLCONV FreeImage_Unload(FIBITMAP *dib); */ HB_FUNC( FI_UNLOAD ) { if ( hb_pcount() == 1 && @@ -343,7 +344,7 @@ HB_FUNC( FI_UNLOAD ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -353,12 +354,13 @@ HB_FUNC( FI_UNLOAD ) } } -// -------------------------------------------------------------------------- -// Load / Save routines ----------------------------------------------------- -// -------------------------------------------------------------------------- -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); -// DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); -// DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); +/* -------------------------------------------------------------------------- */ +/* Load / Save routines ----------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); */ +/* DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); */ +/* DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); */ HB_FUNC( FI_LOADFROMMEM ) { if ( hb_pcount() == 3 && @@ -392,7 +394,7 @@ HB_FUNC( FI_LOADFROMMEM ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -402,7 +404,7 @@ HB_FUNC( FI_LOADFROMMEM ) } } -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Load(FREE_IMAGE_FORMAT fif, const char *filename, int flags FI_DEFAULT(0)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Load(FREE_IMAGE_FORMAT fif, const char *filename, int flags FI_DEFAULT(0)); */ HB_FUNC( FI_LOAD ) { if ( hb_pcount() == 3 && @@ -433,7 +435,7 @@ HB_FUNC( FI_LOAD ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -443,14 +445,14 @@ HB_FUNC( FI_LOAD ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags FI_DEFAULT(0)); -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, int flags FI_DEFAULT(0)); */ +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_Save(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const char *filename, int flags FI_DEFAULT(0)); +/* DLL_API BOOL DLL_CALLCONV FreeImage_Save(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const char *filename, int flags FI_DEFAULT(0)); */ HB_FUNC( FI_SAVE ) { if ( hb_pcount() == 4 && @@ -477,7 +479,7 @@ HB_FUNC( FI_SAVE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, @@ -487,52 +489,56 @@ HB_FUNC( FI_SAVE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_SaveU(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const wchar_t *filename, int flags FI_DEFAULT(0)); -// DLL_API BOOL DLL_CALLCONV FreeImage_SaveToHandle(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); +/* DLL_API BOOL DLL_CALLCONV FreeImage_SaveU(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, const wchar_t *filename, int flags FI_DEFAULT(0)); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SaveToHandle(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FreeImageIO *io, fi_handle handle, int flags FI_DEFAULT(0)); */ -// -------------------------------------------------------------------------- -// Memory I/O stream routines ----------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Memory I/O stream routines ----------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); -// DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); -// DLL_API BOOL DLL_CALLCONV FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags FI_DEFAULT(0)); -// DLL_API long DLL_CALLCONV FreeImage_TellMemory(FIMEMORY *stream); -// DLL_API BOOL DLL_CALLCONV FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin); -// DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, BYTE **data, DWORD *size_in_bytes); +/* +DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(BYTE *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); +DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); +DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); +DLL_API BOOL DLL_CALLCONV FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags FI_DEFAULT(0)); +DLL_API long DLL_CALLCONV FreeImage_TellMemory(FIMEMORY *stream); +DLL_API BOOL DLL_CALLCONV FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin); +DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, BYTE **data, DWORD *size_in_bytes); +*/ -// -------------------------------------------------------------------------- -// Plugin Interface --------------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Plugin Interface --------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterLocalPlugin(FI_InitProc proc_address, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterExternalPlugin(const char *path, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); -// DLL_API int DLL_CALLCONV FreeImage_GetFIFCount(void); -// DLL_API int DLL_CALLCONV FreeImage_SetPluginEnabled(FREE_IMAGE_FORMAT fif, BOOL enable); -// DLL_API int DLL_CALLCONV FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFormat(const char *format); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromMime(const char *mime); -// DLL_API const char *DLL_CALLCONV FreeImage_GetFormatFromFIF(FREE_IMAGE_FORMAT fif); -// DLL_API const char *DLL_CALLCONV FreeImage_GetFIFExtensionList(FREE_IMAGE_FORMAT fif); -// DLL_API const char *DLL_CALLCONV FreeImage_GetFIFDescription(FREE_IMAGE_FORMAT fif); -// DLL_API const char *DLL_CALLCONV FreeImage_GetFIFRegExpr(FREE_IMAGE_FORMAT fif); -// DLL_API const char *DLL_CALLCONV FreeImage_GetFIFMimeType(FREE_IMAGE_FORMAT fif); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilename(const char *filename); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilenameU(const wchar_t *filename); -// DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsReading(FREE_IMAGE_FORMAT fif); -// DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsWriting(FREE_IMAGE_FORMAT fif); -// DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportBPP(FREE_IMAGE_FORMAT fif, int bpp); -// DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportType(FREE_IMAGE_FORMAT fif, FREE_IMAGE_TYPE type); -// DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif); +/* +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterLocalPlugin(FI_InitProc proc_address, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterExternalPlugin(const char *path, const char *format FI_DEFAULT(0), const char *description FI_DEFAULT(0), const char *extension FI_DEFAULT(0), const char *regexpr FI_DEFAULT(0)); +DLL_API int DLL_CALLCONV FreeImage_GetFIFCount(void); +DLL_API int DLL_CALLCONV FreeImage_SetPluginEnabled(FREE_IMAGE_FORMAT fif, BOOL enable); +DLL_API int DLL_CALLCONV FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif); +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFormat(const char *format); +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromMime(const char *mime); +DLL_API const char *DLL_CALLCONV FreeImage_GetFormatFromFIF(FREE_IMAGE_FORMAT fif); +DLL_API const char *DLL_CALLCONV FreeImage_GetFIFExtensionList(FREE_IMAGE_FORMAT fif); +DLL_API const char *DLL_CALLCONV FreeImage_GetFIFDescription(FREE_IMAGE_FORMAT fif); +DLL_API const char *DLL_CALLCONV FreeImage_GetFIFRegExpr(FREE_IMAGE_FORMAT fif); +DLL_API const char *DLL_CALLCONV FreeImage_GetFIFMimeType(FREE_IMAGE_FORMAT fif); +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilename(const char *filename); +DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromFilenameU(const wchar_t *filename); +DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsReading(FREE_IMAGE_FORMAT fif); +DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsWriting(FREE_IMAGE_FORMAT fif); +DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportBPP(FREE_IMAGE_FORMAT fif, int bpp); +DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsExportType(FREE_IMAGE_FORMAT fif, FREE_IMAGE_TYPE type); +DLL_API BOOL DLL_CALLCONV FreeImage_FIFSupportsICCProfiles(FREE_IMAGE_FORMAT fif); +*/ -// -------------------------------------------------------------------------- -// Multipaging interface ---------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Multipaging interface ---------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory FI_DEFAULT(FALSE), int flags FI_DEFAULT(0)); +/* DLL_API FIMULTIBITMAP * DLL_CALLCONV FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL create_new, BOOL read_only, BOOL keep_cache_in_memory FI_DEFAULT(FALSE), int flags FI_DEFAULT(0)); */ HB_FUNC( FI_OPENMULTIBITMAP ) { if ( hb_pcount() >= 4 && @@ -570,7 +576,7 @@ HB_FUNC( FI_OPENMULTIBITMAP ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, @@ -580,9 +586,9 @@ HB_FUNC( FI_OPENMULTIBITMAP ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags FI_DEFAULT(0)); +/* DLL_API BOOL DLL_CALLCONV FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags FI_DEFAULT(0)); */ HB_FUNC( FI_CLOSEMULTIBITMAP ) { if ( hb_pcount() >= 1 && @@ -602,7 +608,7 @@ HB_FUNC( FI_CLOSEMULTIBITMAP ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -612,9 +618,9 @@ HB_FUNC( FI_CLOSEMULTIBITMAP ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API int DLL_CALLCONV FreeImage_GetPageCount(FIMULTIBITMAP *bitmap); +/* DLL_API int DLL_CALLCONV FreeImage_GetPageCount(FIMULTIBITMAP *bitmap); */ HB_FUNC( FI_GETPAGECOUNT ) { if ( hb_pcount() >= 1 && @@ -632,7 +638,7 @@ HB_FUNC( FI_GETPAGECOUNT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -642,9 +648,9 @@ HB_FUNC( FI_GETPAGECOUNT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_AppendPage(FIMULTIBITMAP *bitmap, FIBITMAP *data); +/* DLL_API void DLL_CALLCONV FreeImage_AppendPage(FIMULTIBITMAP *bitmap, FIBITMAP *data); */ HB_FUNC( FI_APPENDPAGE ) { if ( hb_pcount() == 2 && @@ -665,7 +671,7 @@ HB_FUNC( FI_APPENDPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -675,9 +681,9 @@ HB_FUNC( FI_APPENDPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_InsertPage(FIMULTIBITMAP *bitmap, int page, FIBITMAP *data); +/* DLL_API void DLL_CALLCONV FreeImage_InsertPage(FIMULTIBITMAP *bitmap, int page, FIBITMAP *data); */ HB_FUNC( FI_INSERTPAGE ) { if ( hb_pcount() == 3 && @@ -692,7 +698,7 @@ HB_FUNC( FI_INSERTPAGE ) /* Retrieve parameters */ bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 ); - page = hb_parni( 2 ) - 1; // 0-based index + page = hb_parni( 2 ) - 1; /* 0-based index */ data = ( FIBITMAP * ) hb_parptr( 3 ); /* run function & return value */ @@ -701,7 +707,7 @@ HB_FUNC( FI_INSERTPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -711,9 +717,9 @@ HB_FUNC( FI_INSERTPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_DeletePage(FIMULTIBITMAP *bitmap, int page); +/* DLL_API void DLL_CALLCONV FreeImage_DeletePage(FIMULTIBITMAP *bitmap, int page); */ HB_FUNC( FI_DELETEPAGE ) { if ( hb_pcount() == 2 && @@ -726,7 +732,7 @@ HB_FUNC( FI_DELETEPAGE ) /* Retrieve parameters */ bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 ); - page = hb_parni( 2 ) - 1; // 0-based index + page = hb_parni( 2 ) - 1; /* 0-based index */ /* run function & return value */ FreeImage_DeletePage(bitmap, page); @@ -734,7 +740,7 @@ HB_FUNC( FI_DELETEPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -744,9 +750,9 @@ HB_FUNC( FI_DELETEPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP * DLL_CALLCONV FreeImage_LockPage(FIMULTIBITMAP *bitmap, int page); +/* DLL_API FIBITMAP * DLL_CALLCONV FreeImage_LockPage(FIMULTIBITMAP *bitmap, int page); */ HB_FUNC( FI_LOCKPAGE ) { if ( hb_pcount() == 2 && @@ -759,7 +765,7 @@ HB_FUNC( FI_LOCKPAGE ) /* Retrieve parameters */ bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 ); - page = hb_parni( 2 ) - 1; // 0-based index + page = hb_parni( 2 ) - 1; /* 0-based index */ /* run function & return value */ hb_retptr( FreeImage_LockPage(bitmap, page) ); @@ -767,7 +773,7 @@ HB_FUNC( FI_LOCKPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -777,9 +783,9 @@ HB_FUNC( FI_LOCKPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *page, BOOL changed); +/* DLL_API void DLL_CALLCONV FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *page, BOOL changed); */ HB_FUNC( FI_UNLOCKPAGE ) { if ( hb_pcount() == 3 && @@ -803,7 +809,7 @@ HB_FUNC( FI_UNLOCKPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -813,9 +819,9 @@ HB_FUNC( FI_UNLOCKPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_MovePage(FIMULTIBITMAP *bitmap, int target, int source); +/* DLL_API BOOL DLL_CALLCONV FreeImage_MovePage(FIMULTIBITMAP *bitmap, int target, int source); */ HB_FUNC( FI_MOVEPAGE ) { if ( hb_pcount() == 3 && @@ -838,7 +844,7 @@ HB_FUNC( FI_MOVEPAGE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -848,17 +854,17 @@ HB_FUNC( FI_MOVEPAGE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_GetLockedPageNumbers(FIMULTIBITMAP *bitmap, int *pages, int *count); +/* DLL_API BOOL DLL_CALLCONV FreeImage_GetLockedPageNumbers(FIMULTIBITMAP *bitmap, int *pages, int *count); */ -// -------------------------------------------------------------------------- -// Filetype request routines ------------------------------------------------ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Filetype request routines ------------------------------------------------ */ +/* -------------------------------------------------------------------------- */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileType(const char *filename, int size FI_DEFAULT(0)); +/* DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileType(const char *filename, int size FI_DEFAULT(0)); */ HB_FUNC( FI_GETFILETYPE ) { if ( hb_pcount() >= 1 && @@ -878,7 +884,7 @@ HB_FUNC( FI_GETFILETYPE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -888,11 +894,11 @@ HB_FUNC( FI_GETFILETYPE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeU(const wchar_t *filename, int size FI_DEFAULT(0)); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size FI_DEFAULT(0)); -// DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromMemory(FIMEMORY *stream, int size FI_DEFAULT(0)); +/* DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeU(const wchar_t *filename, int size FI_DEFAULT(0)); */ +/* DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromHandle(FreeImageIO *io, fi_handle handle, int size FI_DEFAULT(0)); */ +/* DLL_API FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFileTypeFromMemory(FIMEMORY *stream, int size FI_DEFAULT(0)); */ HB_FUNC( FI_GETFILETYPEFROMMEM ) { if ( hb_pcount() >= 1 && @@ -915,7 +921,7 @@ HB_FUNC( FI_GETFILETYPEFROMMEM ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -925,11 +931,11 @@ HB_FUNC( FI_GETFILETYPEFROMMEM ) } } -// -------------------------------------------------------------------------- -// Image type request routine ----------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Image type request routine ----------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API FREE_IMAGE_TYPE DLL_CALLCONV FreeImage_GetImageType(FIBITMAP *dib); +/* DLL_API FREE_IMAGE_TYPE DLL_CALLCONV FreeImage_GetImageType(FIBITMAP *dib); */ HB_FUNC( FI_GETIMAGETYPE ) { if ( hb_pcount() == 1 && @@ -947,7 +953,7 @@ HB_FUNC( FI_GETIMAGETYPE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -957,28 +963,28 @@ HB_FUNC( FI_GETIMAGETYPE ) } } -// -------------------------------------------------------------------------- -// FreeImage helper routines ------------------------------------------------ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* FreeImage helper routines ------------------------------------------------ */ +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_IsLittleEndian(void); +/* DLL_API BOOL DLL_CALLCONV FreeImage_IsLittleEndian(void); */ HB_FUNC( FI_ISLITTLEENDIAN ) { /* run function & return value */ hb_retl( FreeImage_IsLittleEndian() ); } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_LookupX11Color(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); -// DLL_API BOOL DLL_CALLCONV FreeImage_LookupSVGColor(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); +/* DLL_API BOOL DLL_CALLCONV FreeImage_LookupX11Color(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_LookupSVGColor(const char *szColor, BYTE *nRed, BYTE *nGreen, BYTE *nBlue); */ -// -------------------------------------------------------------------------- -// Pixel access routines ---------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Pixel access routines ---------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API BYTE *DLL_CALLCONV FreeImage_GetBits(FIBITMAP *dib); +/* DLL_API BYTE *DLL_CALLCONV FreeImage_GetBits(FIBITMAP *dib); */ HB_FUNC( FI_GETBITS ) { if ( hb_pcount() == 1 && @@ -996,7 +1002,7 @@ HB_FUNC( FI_GETBITS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1006,9 +1012,9 @@ HB_FUNC( FI_GETBITS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BYTE *DLL_CALLCONV FreeImage_GetScanLine(FIBITMAP *dib, int scanline); +/* DLL_API BYTE *DLL_CALLCONV FreeImage_GetScanLine(FIBITMAP *dib, int scanline); */ HB_FUNC( FI_GETSCANLINE ) { if ( hb_pcount() == 2 && @@ -1029,7 +1035,7 @@ HB_FUNC( FI_GETSCANLINE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1039,19 +1045,20 @@ HB_FUNC( FI_GETSCANLINE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); -// DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); +/* +DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); +DLL_API BOOL DLL_CALLCONV FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); +DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value); +DLL_API BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value); +*/ -// -------------------------------------------------------------------------- -// DIB info routines -------------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* DIB info routines -------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetColorsUsed(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetColorsUsed(FIBITMAP *dib); */ HB_FUNC( FI_GETCOLORSUSED ) { if ( hb_pcount() == 1 && @@ -1069,7 +1076,7 @@ HB_FUNC( FI_GETCOLORSUSED ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1079,9 +1086,9 @@ HB_FUNC( FI_GETCOLORSUSED ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetBPP(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetBPP(FIBITMAP *dib); */ HB_FUNC( FI_GETBPP ) { if ( hb_pcount() == 1 && @@ -1099,7 +1106,7 @@ HB_FUNC( FI_GETBPP ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1109,9 +1116,9 @@ HB_FUNC( FI_GETBPP ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetWidth(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetWidth(FIBITMAP *dib); */ HB_FUNC( FI_GETWIDTH ) { if ( hb_pcount() == 1 && @@ -1129,7 +1136,7 @@ HB_FUNC( FI_GETWIDTH ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1139,9 +1146,9 @@ HB_FUNC( FI_GETWIDTH ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetHeight(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetHeight(FIBITMAP *dib); */ HB_FUNC( FI_GETHEIGHT ) { if ( hb_pcount() == 1 && @@ -1159,7 +1166,7 @@ HB_FUNC( FI_GETHEIGHT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1169,9 +1176,9 @@ HB_FUNC( FI_GETHEIGHT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetLine(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetLine(FIBITMAP *dib); */ HB_FUNC( FI_GETLINE ) { if ( hb_pcount() == 1 && @@ -1189,7 +1196,7 @@ HB_FUNC( FI_GETLINE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1199,9 +1206,9 @@ HB_FUNC( FI_GETLINE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetPitch(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetPitch(FIBITMAP *dib); */ HB_FUNC( FI_GETPITCH ) { if ( hb_pcount() == 1 && @@ -1219,7 +1226,7 @@ HB_FUNC( FI_GETPITCH ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1229,9 +1236,9 @@ HB_FUNC( FI_GETPITCH ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetDIBSize(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetDIBSize(FIBITMAP *dib); */ HB_FUNC( FI_GETDIBSIZE ) { if ( hb_pcount() == 1 && @@ -1249,7 +1256,7 @@ HB_FUNC( FI_GETDIBSIZE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1259,9 +1266,9 @@ HB_FUNC( FI_GETDIBSIZE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API RGBQUAD *DLL_CALLCONV FreeImage_GetPalette(FIBITMAP *dib); +/* DLL_API RGBQUAD *DLL_CALLCONV FreeImage_GetPalette(FIBITMAP *dib); */ HB_FUNC( FI_GETPALETTE ) { if ( hb_pcount() == 1 && @@ -1279,7 +1286,7 @@ HB_FUNC( FI_GETPALETTE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1289,9 +1296,9 @@ HB_FUNC( FI_GETPALETTE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterX(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterX(FIBITMAP *dib); */ HB_FUNC( FI_GETDOTSPERMETERX ) { if ( hb_pcount() == 1 && @@ -1309,7 +1316,7 @@ HB_FUNC( FI_GETDOTSPERMETERX ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1319,9 +1326,9 @@ HB_FUNC( FI_GETDOTSPERMETERX ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterY(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetDotsPerMeterY(FIBITMAP *dib); */ HB_FUNC( FI_GETDOTSPERMETERY ) { if ( hb_pcount() == 1 && @@ -1339,7 +1346,7 @@ HB_FUNC( FI_GETDOTSPERMETERY ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1349,9 +1356,9 @@ HB_FUNC( FI_GETDOTSPERMETERY ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterX(FIBITMAP *dib, unsigned res); +/* DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterX(FIBITMAP *dib, unsigned res); */ HB_FUNC( FI_SETDOTSPERMETERX ) { if ( hb_pcount() == 2 && @@ -1372,7 +1379,7 @@ HB_FUNC( FI_SETDOTSPERMETERX ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1382,9 +1389,9 @@ HB_FUNC( FI_SETDOTSPERMETERX ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res); +/* DLL_API void DLL_CALLCONV FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res); */ HB_FUNC( FI_SETDOTSPERMETERY ) { if ( hb_pcount() == 2 && @@ -1405,7 +1412,7 @@ HB_FUNC( FI_SETDOTSPERMETERY ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1415,10 +1422,9 @@ HB_FUNC( FI_SETDOTSPERMETERY ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API BITMAPINFOHEADER *DLL_CALLCONV FreeImage_GetInfoHeader(FIBITMAP *dib); +/* DLL_API BITMAPINFOHEADER *DLL_CALLCONV FreeImage_GetInfoHeader(FIBITMAP *dib); */ HB_FUNC( FI_GETINFOHEADER ) { @@ -1427,8 +1433,8 @@ HB_FUNC( FI_GETINFOHEADER ) ) { FIBITMAP *dib; - // We need not worry about Memory Management - will be automatically released! - //BITMAPINFOHEADER *bmpinfoheader = (BITMAPINFOHEADER *) hb_xgrab( sizeof( BITMAPINFOHEADER ) ); + /* We need not worry about Memory Management - will be automatically released! */ + /*BITMAPINFOHEADER *bmpinfoheader = (BITMAPINFOHEADER *) hb_xgrab( sizeof( BITMAPINFOHEADER ) );*/ BITMAPINFOHEADER *bmpinfoheader; /* Retrieve parameters */ @@ -1437,13 +1443,13 @@ HB_FUNC( FI_GETINFOHEADER ) /* run function & return value */ bmpinfoheader = FreeImage_GetInfoHeader(dib); - //hb_retclenAdoptRaw( (char *) bmpinfoheader, sizeof( BITMAPINFOHEADER ) ); + /*hb_retclenAdoptRaw( (char *) bmpinfoheader, sizeof( BITMAPINFOHEADER ) );*/ hb_retptr( bmpinfoheader ); } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1453,9 +1459,9 @@ HB_FUNC( FI_GETINFOHEADER ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BITMAPINFO *DLL_CALLCONV FreeImage_GetInfo(FIBITMAP *dib); +/* DLL_API BITMAPINFO *DLL_CALLCONV FreeImage_GetInfo(FIBITMAP *dib); */ HB_FUNC( FI_GETINFO ) { @@ -1477,7 +1483,7 @@ HB_FUNC( FI_GETINFO ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1487,9 +1493,9 @@ HB_FUNC( FI_GETINFO ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FREE_IMAGE_COLOR_TYPE DLL_CALLCONV FreeImage_GetColorType(FIBITMAP *dib); +/* DLL_API FREE_IMAGE_COLOR_TYPE DLL_CALLCONV FreeImage_GetColorType(FIBITMAP *dib); */ HB_FUNC( FI_GETCOLORTYPE ) { if ( hb_pcount() == 1 && @@ -1507,7 +1513,7 @@ HB_FUNC( FI_GETCOLORTYPE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1517,10 +1523,9 @@ HB_FUNC( FI_GETCOLORTYPE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API unsigned DLL_CALLCONV FreeImage_GetRedMask(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetRedMask(FIBITMAP *dib); */ HB_FUNC( FI_GETREDMASK ) { if ( hb_pcount() == 1 && @@ -1538,7 +1543,7 @@ HB_FUNC( FI_GETREDMASK ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1548,9 +1553,9 @@ HB_FUNC( FI_GETREDMASK ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetGreenMask(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetGreenMask(FIBITMAP *dib); */ HB_FUNC( FI_GETGREENMASK ) { if ( hb_pcount() == 1 && @@ -1568,7 +1573,7 @@ HB_FUNC( FI_GETGREENMASK ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1578,9 +1583,9 @@ HB_FUNC( FI_GETGREENMASK ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API unsigned DLL_CALLCONV FreeImage_GetBlueMask(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetBlueMask(FIBITMAP *dib); */ HB_FUNC( FI_GETBLUEMASK ) { if ( hb_pcount() == 1 && @@ -1598,7 +1603,7 @@ HB_FUNC( FI_GETBLUEMASK ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1608,10 +1613,9 @@ HB_FUNC( FI_GETBLUEMASK ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API unsigned DLL_CALLCONV FreeImage_GetTransparencyCount(FIBITMAP *dib); +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetTransparencyCount(FIBITMAP *dib); */ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) { if ( hb_pcount() == 1 && @@ -1629,7 +1633,7 @@ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1639,9 +1643,9 @@ HB_FUNC( FI_GETTRANSPARENCYCOUNT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BYTE * DLL_CALLCONV FreeImage_GetTransparencyTable(FIBITMAP *dib); +/* DLL_API BYTE * DLL_CALLCONV FreeImage_GetTransparencyTable(FIBITMAP *dib); */ HB_FUNC( FI_GETTRANSPARENCYTABLE ) { if ( hb_pcount() == 1 && @@ -1659,7 +1663,7 @@ HB_FUNC( FI_GETTRANSPARENCYTABLE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1669,9 +1673,9 @@ HB_FUNC( FI_GETTRANSPARENCYTABLE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled); +/* DLL_API void DLL_CALLCONV FreeImage_SetTransparent(FIBITMAP *dib, BOOL enabled); */ HB_FUNC( FI_SETTRANSPARENT ) { if ( hb_pcount() == 2 && @@ -1692,7 +1696,7 @@ HB_FUNC( FI_SETTRANSPARENT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1702,9 +1706,9 @@ HB_FUNC( FI_SETTRANSPARENT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count); +/* DLL_API void DLL_CALLCONV FreeImage_SetTransparencyTable(FIBITMAP *dib, BYTE *table, int count); */ HB_FUNC( FI_SETTRANSPARENCYTABLE ) { if ( hb_pcount() == 3 && @@ -1728,7 +1732,7 @@ HB_FUNC( FI_SETTRANSPARENCYTABLE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -1738,9 +1742,9 @@ HB_FUNC( FI_SETTRANSPARENCYTABLE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_IsTransparent(FIBITMAP *dib); +/* DLL_API BOOL DLL_CALLCONV FreeImage_IsTransparent(FIBITMAP *dib); */ HB_FUNC( FI_ISTRANSPARENT ) { if ( hb_pcount() == 1 && @@ -1758,7 +1762,7 @@ HB_FUNC( FI_ISTRANSPARENT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1768,10 +1772,9 @@ HB_FUNC( FI_ISTRANSPARENT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib); +/* DLL_API BOOL DLL_CALLCONV FreeImage_HasBackgroundColor(FIBITMAP *dib); */ HB_FUNC( FI_HASBACKGROUNDCOLOR ) { if ( hb_pcount() == 1 && @@ -1789,7 +1792,7 @@ HB_FUNC( FI_HASBACKGROUNDCOLOR ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1799,15 +1802,14 @@ HB_FUNC( FI_HASBACKGROUNDCOLOR ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); +/* DLL_API BOOL DLL_CALLCONV FreeImage_GetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); */ HB_FUNC( FI_GETBACKGROUNDCOLOR ) { if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER //&& - //hb_parinfo( 2 ) & HB_IT_STRING + hb_parinfo( 1 ) & HB_IT_POINTER /*&& hb_parinfo( 2 ) & HB_IT_STRING*/ ) { FIBITMAP *dib; @@ -1815,18 +1817,18 @@ HB_FUNC( FI_GETBACKGROUNDCOLOR ) /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); - //bkcolor = ( RGBQUAD * ) hb_param( 2, HB_IT_STRING )->item.asString.value; - //bkcolor = ( RGBQUAD * ) hb_parptr( 2 ); + /*bkcolor = ( RGBQUAD * ) hb_param( 2, HB_IT_STRING )->item.asString.value;*/ + /*bkcolor = ( RGBQUAD * ) hb_parptr( 2 );*/ /* run function & return value */ - //hb_retl( FreeImage_GetBackgroundColor(dib, bkcolor) ); + /*hb_retl( FreeImage_GetBackgroundColor(dib, bkcolor) );*/ FreeImage_GetBackgroundColor(dib, bkcolor); - //hb_storptr( bkcolor, 2 ); + /*hb_storptr( bkcolor, 2 );*/ hb_retptr( bkcolor ); } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1836,15 +1838,15 @@ HB_FUNC( FI_GETBACKGROUNDCOLOR ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetBackgroundColor(FIBITMAP *dib, RGBQUAD *bkcolor); */ HB_FUNC( FI_SETBACKGROUNDCOLOR ) { if ( hb_pcount() == 2 && hb_parinfo( 1 ) & HB_IT_POINTER && - //hb_parinfo( 2 ) & HB_IT_POINTER + /*hb_parinfo( 2 ) & HB_IT_POINTER*/ hb_parinfo( 2 ) & HB_IT_STRING ) { @@ -1854,17 +1856,17 @@ HB_FUNC( FI_SETBACKGROUNDCOLOR ) /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); bkcolor = (RGBQUAD * ) hb_itemGetCPtr( hb_param( 2, HB_IT_STRING ) ); - //bkcolor = ( RGBQUAD * ) hb_parptr( 2 ); + /*bkcolor = ( RGBQUAD * ) hb_parptr( 2 );*/ /* run function & return value */ hb_retl( FreeImage_SetBackgroundColor(dib, bkcolor) ); - //FreeImage_GetBackgroundColor(dib, bkcolor); - //hb_retptr( bkcolor ); + /*FreeImage_GetBackgroundColor(dib, bkcolor);*/ + /*hb_retptr( bkcolor );*/ } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -1874,15 +1876,15 @@ HB_FUNC( FI_SETBACKGROUNDCOLOR ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -------------------------------------------------------------------------- -// ICC profile routines ----------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* ICC profile routines ----------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_GetICCProfile(FIBITMAP *dib); +/* DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_GetICCProfile(FIBITMAP *dib); */ HB_FUNC( FI_GETICCPROFILE ) { @@ -1901,7 +1903,7 @@ HB_FUNC( FI_GETICCPROFILE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1911,9 +1913,9 @@ HB_FUNC( FI_GETICCPROFILE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size); +/* DLL_API FIICCPROFILE *DLL_CALLCONV FreeImage_CreateICCProfile(FIBITMAP *dib, void *data, long size); */ HB_FUNC( FI_CREATEICCPROFILE ) { @@ -1938,7 +1940,7 @@ HB_FUNC( FI_CREATEICCPROFILE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 3, @@ -1949,9 +1951,9 @@ HB_FUNC( FI_CREATEICCPROFILE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_DestroyICCProfile(FIBITMAP *dib); +/* DLL_API void DLL_CALLCONV FreeImage_DestroyICCProfile(FIBITMAP *dib); */ HB_FUNC( FI_DESTROYICCPROFILE ) { @@ -1970,7 +1972,7 @@ HB_FUNC( FI_DESTROYICCPROFILE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -1980,52 +1982,54 @@ HB_FUNC( FI_DESTROYICCPROFILE ) } } -// -------------------------------------------------------------------------- -// Line conversion routines ------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Line conversion routines ------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To4(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_565_To16_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_555_To16_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_555(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_565(BYTE *target, BYTE *source, int width_in_pixels); -// DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels); +/* +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To4_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To4(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_555(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_565_To16_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To16_565(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16_555_To16_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To16_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To24(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To24_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine1To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine4To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine8To32(BYTE *target, BYTE *source, int width_in_pixels, RGBQUAD *palette); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_555(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine16To32_565(BYTE *target, BYTE *source, int width_in_pixels); +DLL_API void DLL_CALLCONV FreeImage_ConvertLine24To32(BYTE *target, BYTE *source, int width_in_pixels); +*/ -// -------------------------------------------------------------------------- -// Smart conversion routines ------------------------------------------------ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Smart conversion routines ------------------------------------------------ */ +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO4BITS ) { if ( hb_pcount() == 1 && @@ -2043,7 +2047,7 @@ HB_FUNC( FI_CONVERTTO4BITS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2054,9 +2058,9 @@ HB_FUNC( FI_CONVERTTO4BITS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO8BITS ) { if ( hb_pcount() == 1 && @@ -2074,7 +2078,7 @@ HB_FUNC( FI_CONVERTTO8BITS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2085,9 +2089,9 @@ HB_FUNC( FI_CONVERTTO8BITS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTOGREYSCALE ) { if ( hb_pcount() == 1 && @@ -2105,7 +2109,7 @@ HB_FUNC( FI_CONVERTTOGREYSCALE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2116,9 +2120,9 @@ HB_FUNC( FI_CONVERTTOGREYSCALE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO16BITS555 ) { if ( hb_pcount() == 1 && @@ -2136,7 +2140,7 @@ HB_FUNC( FI_CONVERTTO16BITS555 ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2147,9 +2151,9 @@ HB_FUNC( FI_CONVERTTO16BITS555 ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO16BITS565 ) { if ( hb_pcount() == 1 && @@ -2167,7 +2171,7 @@ HB_FUNC( FI_CONVERTTO16BITS565 ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2178,9 +2182,9 @@ HB_FUNC( FI_CONVERTTO16BITS565 ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO24BITS ) { if ( hb_pcount() == 1 && @@ -2198,7 +2202,7 @@ HB_FUNC( FI_CONVERTTO24BITS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2209,9 +2213,9 @@ HB_FUNC( FI_CONVERTTO24BITS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTO32BITS ) { if ( hb_pcount() == 1 && @@ -2229,7 +2233,7 @@ HB_FUNC( FI_CONVERTTO32BITS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2240,9 +2244,9 @@ HB_FUNC( FI_CONVERTTO32BITS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize); */ HB_FUNC( FI_COLORQUANTIZE ) { if ( hb_pcount() == 1 && @@ -2263,7 +2267,7 @@ HB_FUNC( FI_COLORQUANTIZE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2274,14 +2278,14 @@ HB_FUNC( FI_COLORQUANTIZE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize FI_DEFAULT(FIQ_WUQUANT), int PaletteSize FI_DEFAULT(256), int ReserveSize FI_DEFAULT(0), RGBQUAD *ReservePalette FI_DEFAULT(NULL)); -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Threshold(FIBITMAP *dib, BYTE T); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize FI_DEFAULT(FIQ_WUQUANT), int PaletteSize FI_DEFAULT(256), int ReserveSize FI_DEFAULT(0), RGBQUAD *ReservePalette FI_DEFAULT(NULL)); */ +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Threshold(FIBITMAP *dib, BYTE T); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm); */ HB_FUNC( FI_DITHER ) { if ( hb_pcount() == 1 && @@ -2302,7 +2306,7 @@ HB_FUNC( FI_DITHER ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2313,15 +2317,14 @@ HB_FUNC( FI_DITHER ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertFromRawBits(BYTE *bits, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); -// DLL_API void DLL_CALLCONV FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); -// -// -------------------------------------------------------------------------- +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertFromRawBits(BYTE *bits, int width, int height, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); */ +/* DLL_API void DLL_CALLCONV FreeImage_ConvertToRawBits(BYTE *bits, FIBITMAP *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown FI_DEFAULT(FALSE)); */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib); +/* -------------------------------------------------------------------------- */ + +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToRGBF(FIBITMAP *dib); */ HB_FUNC( FI_CONVERTTORGBF ) { if ( hb_pcount() == 1 && @@ -2339,7 +2342,7 @@ HB_FUNC( FI_CONVERTTORGBF ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2350,10 +2353,9 @@ HB_FUNC( FI_CONVERTTORGBF ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear FI_DEFAULT(TRUE)); */ HB_FUNC( FI_CONVERTTOSTANDARDTYPE ) { if ( hb_pcount() >= 1 && @@ -2373,7 +2375,7 @@ HB_FUNC( FI_CONVERTTOSTANDARDTYPE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2384,9 +2386,9 @@ HB_FUNC( FI_CONVERTTOSTANDARDTYPE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear FI_DEFAULT(TRUE)); */ HB_FUNC( FI_CONVERTTOTYPE ) { if ( hb_pcount() >= 2 && @@ -2409,7 +2411,7 @@ HB_FUNC( FI_CONVERTTOTYPE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2420,74 +2422,73 @@ HB_FUNC( FI_CONVERTTOTYPE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// -// // tone mapping operators -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param FI_DEFAULT(0), double second_param FI_DEFAULT(0)); -// DLL_API FIBITMAP* DLL_CALLCONV FreeImage_TmoDrago03(FIBITMAP *src, double gamma FI_DEFAULT(2.2), double exposure FI_DEFAULT(0)); -// DLL_API FIBITMAP* DLL_CALLCONV FreeImage_TmoReinhard05(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0)); +/* tone mapping operators */ +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param FI_DEFAULT(0), double second_param FI_DEFAULT(0)); */ +/* DLL_API FIBITMAP* DLL_CALLCONV FreeImage_TmoDrago03(FIBITMAP *src, double gamma FI_DEFAULT(2.2), double exposure FI_DEFAULT(0)); */ +/* DLL_API FIBITMAP* DLL_CALLCONV FreeImage_TmoReinhard05(FIBITMAP *src, double intensity FI_DEFAULT(0), double contrast FI_DEFAULT(0)); */ -// -------------------------------------------------------------------------- -// ZLib interface ----------------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* ZLib interface ----------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -// DLL_API DWORD DLL_CALLCONV FreeImage_ZLibUncompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -// DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -// DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGUnzip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); -// DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCRC32(DWORD crc, BYTE *source, DWORD source_size); +/* DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_ZLibUncompress(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGUnzip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_size); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCRC32(DWORD crc, BYTE *source, DWORD source_size); */ -// -------------------------------------------------------------------------- -// Metadata routines -------------------------------------------------------- -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* Metadata routines -------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// tag creation / destruction -// DLL_API FITAG *DLL_CALLCONV FreeImage_CreateTag(); -// DLL_API void DLL_CALLCONV FreeImage_DeleteTag(FITAG *tag); -// DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag); +/* tag creation / destruction */ +/* DLL_API FITAG *DLL_CALLCONV FreeImage_CreateTag(); */ +/* DLL_API void DLL_CALLCONV FreeImage_DeleteTag(FITAG *tag); */ +/* DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag); */ -// tag getters and setters -// DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag); -// DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag); -// DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag); -// DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag); -// DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag); -// DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag); -// DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag); -// -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetTagValue(FITAG *tag, const void *value); +/* tag getters and setters */ +/* DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag); */ +/* DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag); */ +/* DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag); */ +/* DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag); */ +/* DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag); */ +/* DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag); */ -// iterator -// DLL_API FIMETADATA *DLL_CALLCONV FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag); -// DLL_API BOOL DLL_CALLCONV FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag); -// DLL_API void DLL_CALLCONV FreeImage_FindCloseMetadata(FIMETADATA *mdhandle); +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length) */; +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetTagValue(FITAG *tag, const void *value); */ -// metadata setter and getter -// DLL_API BOOL DLL_CALLCONV FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag); -// DLL_API BOOL DLL_CALLCONV FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag); +/* iterator */ +/* DLL_API FIMETADATA *DLL_CALLCONV FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag); */ +/* DLL_API void DLL_CALLCONV FreeImage_FindCloseMetadata(FIMETADATA *mdhandle); */ -// helpers -// DLL_API unsigned DLL_CALLCONV FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib); +/* metadata setter and getter */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag); */ -// tag to C string conversion -// DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, FITAG *tag, char *Make FI_DEFAULT(NULL)); +/* helpers */ +/* DLL_API unsigned DLL_CALLCONV FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib); */ -// -------------------------------------------------------------------------- -// Image manipulation toolkit ----------------------------------------------- -// -------------------------------------------------------------------------- +/* tag to C string conversion */ +/* DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, FITAG *tag, char *Make FI_DEFAULT(NULL)); */ -// rotation and flipping +/* -------------------------------------------------------------------------- */ +/* Image manipulation toolkit ----------------------------------------------- */ +/* -------------------------------------------------------------------------- */ -// -------------------------------------------------------------------------- +/* rotation and flipping */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle); +/* -------------------------------------------------------------------------- */ + +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateClassic(FIBITMAP *dib, double angle); */ HB_FUNC( FI_ROTATECLASSIC ) { if ( hb_pcount() == 2 && @@ -2508,7 +2509,7 @@ HB_FUNC( FI_ROTATECLASSIC ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2518,9 +2519,9 @@ HB_FUNC( FI_ROTATECLASSIC ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x_origin, double y_origin, BOOL use_mask); */ HB_FUNC( FI_ROTATEEX ) { if ( hb_pcount() == 7 && @@ -2552,7 +2553,7 @@ HB_FUNC( FI_ROTATEEX ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 7, @@ -2564,9 +2565,9 @@ HB_FUNC( FI_ROTATEEX ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib); +/* DLL_API BOOL DLL_CALLCONV FreeImage_FlipHorizontal(FIBITMAP *dib); */ HB_FUNC( FI_FLIPHORIZONTAL ) { if ( hb_pcount() == 1 && @@ -2584,7 +2585,7 @@ HB_FUNC( FI_FLIPHORIZONTAL ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2594,9 +2595,9 @@ HB_FUNC( FI_FLIPHORIZONTAL ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib); +/* DLL_API BOOL DLL_CALLCONV FreeImage_FlipVertical(FIBITMAP *dib); */ HB_FUNC( FI_FLIPVERTICAL ) { if ( hb_pcount() == 1 && @@ -2614,7 +2615,7 @@ HB_FUNC( FI_FLIPVERTICAL ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2624,17 +2625,17 @@ HB_FUNC( FI_FLIPVERTICAL ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(FALSE)); +/* DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(FALSE)); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// upsampling / downsampling +/* upsampling / downsampling */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Rescale(FIBITMAP *dib, int dst_width, int dst_height, FREE_IMAGE_FILTER filter); */ HB_FUNC( FI_RESCALE ) { if ( hb_pcount() == 4 && @@ -2660,7 +2661,7 @@ HB_FUNC( FI_RESCALE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 4, @@ -2671,17 +2672,17 @@ HB_FUNC( FI_RESCALE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// color manipulation routines (point operations) +/* color manipulation routines (point operations) */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_AdjustCurve(FIBITMAP *dib, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel); +/* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustCurve(FIBITMAP *dib, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma); +/* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma); */ HB_FUNC( FI_ADJUSTGAMMA ) { if ( hb_pcount() == 2 && @@ -2702,7 +2703,7 @@ HB_FUNC( FI_ADJUSTGAMMA ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2713,9 +2714,9 @@ HB_FUNC( FI_ADJUSTGAMMA ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage); +/* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage); */ HB_FUNC( FI_ADJUSTBRIGHTNESS ) { if ( hb_pcount() == 2 && @@ -2736,7 +2737,7 @@ HB_FUNC( FI_ADJUSTBRIGHTNESS ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2747,9 +2748,9 @@ HB_FUNC( FI_ADJUSTBRIGHTNESS ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage); +/* DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage); */ HB_FUNC( FI_ADJUSTCONTRAST ) { if ( hb_pcount() == 2 && @@ -2770,7 +2771,7 @@ HB_FUNC( FI_ADJUSTCONTRAST ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2781,9 +2782,9 @@ HB_FUNC( FI_ADJUSTCONTRAST ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib); +/* DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib); */ HB_FUNC( FI_INVERT ) { if ( hb_pcount() == 1 && @@ -2801,7 +2802,7 @@ HB_FUNC( FI_INVERT ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, @@ -2812,17 +2813,17 @@ HB_FUNC( FI_INVERT ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK)); +/* DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK)); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// channel processing routines +/* channel processing routines */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *dib, FREE_IMAGE_COLOR_CHANNEL channel); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *dib, FREE_IMAGE_COLOR_CHANNEL channel); */ HB_FUNC( FI_GETCHANNEL ) { if ( hb_pcount() == 2 && @@ -2843,7 +2844,7 @@ HB_FUNC( FI_GETCHANNEL ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 2, @@ -2854,19 +2855,17 @@ HB_FUNC( FI_GETCHANNEL ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_SetChannel(FIBITMAP *dib, FIBITMAP *dib8, FREE_IMAGE_COLOR_CHANNEL channel); -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); -// DLL_API BOOL DLL_CALLCONV FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetChannel(FIBITMAP *dib, FIBITMAP *dib8, FREE_IMAGE_COLOR_CHANNEL channel); */ +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); */ +/* DLL_API BOOL DLL_CALLCONV FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ +/* copy / paste / composite routines */ +/* -------------------------------------------------------------------------- */ -// copy / paste / composite routines - -// -------------------------------------------------------------------------- - -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Copy(FIBITMAP *dib, int left, int top, int right, int bottom); */ HB_FUNC( FI_COPY ) { if ( hb_pcount() == 5 && @@ -2893,7 +2892,7 @@ HB_FUNC( FI_COPY ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 5, @@ -2905,9 +2904,9 @@ HB_FUNC( FI_COPY ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha); +/* DLL_API BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha); */ HB_FUNC( FI_PASTE ) { if ( hb_pcount() == 5 && @@ -2935,7 +2934,7 @@ HB_FUNC( FI_PASTE ) } else { - // Parameter error + /* Parameter error */ { hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 5, @@ -2947,8 +2946,8 @@ HB_FUNC( FI_PASTE ) } } -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ -// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(NULL), FIBITMAP *bg FI_DEFAULT(NULL)); +/* DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(NULL), FIBITMAP *bg FI_DEFAULT(NULL)); */ -// -------------------------------------------------------------------------- +/* -------------------------------------------------------------------------- */ diff --git a/harbour/contrib/hbgf/hbgfos2/os2pm.c b/harbour/contrib/hbgf/hbgfos2/os2pm.c index 36941ed846..20100cf57b 100644 --- a/harbour/contrib/hbgf/hbgfos2/os2pm.c +++ b/harbour/contrib/hbgf/hbgfos2/os2pm.c @@ -239,9 +239,9 @@ HB_FUNC( WINADDMENUITEM ) } -// Given an id of a menuitem changes it to a MIS_SUBMENU type of menu item -// NOTE: You have to delete and reinsert a menu item if you want to change it from -// a MIS_TEXT to a MIS_SUBMENU type of menuitem +/* Given an id of a menuitem changes it to a MIS_SUBMENU type of menu item + NOTE: You have to delete and reinsert a menu item if you want to change it from + a MIS_TEXT to a MIS_SUBMENU type of menuitem */ HB_FUNC( WINMAKESUBMENUITEM ) { MENUITEM mit; @@ -256,7 +256,7 @@ HB_FUNC( WINMAKESUBMENUITEM ) mit.hwndSubMenu = hb_parnl(3); mit.afStyle |= MIS_SUBMENU; - // re-insert the menuitem + /* re-insert the menuitem */ WinSendMsg((HWND) hb_parnl(1), MM_INSERTITEM, &mit, &text); } hb_retnl(0); @@ -309,10 +309,10 @@ HB_FUNC( WINSETWIDTH ) HB_FUNC( SENDMESSAGE ) { hb_retnl( (LONG) WinSendMsg( - (HWND) hb_parnl( 1 ), // handle of destination window - (ULONG) hb_parnl( 2 ), // message to send - (MPARAM) hb_parnl( 3 ), // first message parameter - (MPARAM) hb_parnl( 4 ) // second message parameter + (HWND) hb_parnl( 1 ), /* handle of destination window */ + (ULONG) hb_parnl( 2 ), /* message to send */ + (MPARAM) hb_parnl( 3 ), /* first message parameter */ + (MPARAM) hb_parnl( 4 ) /* second message parameter */ ) ); } @@ -401,7 +401,7 @@ HB_FUNC( WINSETLEFT ) HB_FUNC( POSTQUITMESSAGE ) { WinPostMsg((HWND) hb_parnl( 1 ), WM_QUIT, 0L, 0L); - //PostQuitMessage( hb_parnl( 1 ) ); + /*PostQuitMessage( hb_parnl( 1 ) );*/ } diff --git a/harbour/contrib/hbgf/hbgfw32/win32.c b/harbour/contrib/hbgf/hbgfw32/win32.c index d9eecfde5f..3c4c5c1b8f 100644 --- a/harbour/contrib/hbgf/hbgfw32/win32.c +++ b/harbour/contrib/hbgf/hbgfw32/win32.c @@ -67,7 +67,7 @@ HB_FUNC( WINREGISTERCLASS ) LPTSTR lpszClassName = HB_TCHAR_CONVTO( hb_parcx( 1 ) ); wndclass.lpszClassName = lpszClassName; - wndclass.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW; // hb_parnl( 2 ); + wndclass.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW; /* hb_parnl( 2 ); */ wndclass.cbClsExtra = hb_parnl( 3 ); wndclass.cbWndExtra = 0; wndclass.lpfnWndProc = WndProc; @@ -222,10 +222,10 @@ HB_FUNC( SETMENU ) HB_FUNC( SENDMESSAGE ) { hb_retnl( (LONG) SendMessage( - (HWND) hb_parptr( 1 ), // handle of destination window - (UINT) hb_parni( 2 ), // message to send - (WPARAM) hb_parnl( 3 ), // first message parameter - (LPARAM) hb_parnl( 4 ) // second message parameter + (HWND) hb_parptr( 1 ), /* handle of destination window */ + (UINT) hb_parni( 2 ), /* message to send */ + (WPARAM) hb_parnl( 3 ), /* first message parameter */ + (LPARAM) hb_parnl( 4 ) /* second message parameter */ ) ); } diff --git a/harbour/contrib/hbhpdf/harupdf.c b/harbour/contrib/hbhpdf/harupdf.c index 0d91a0aeb3..1f3fbfb7ad 100644 --- a/harbour/contrib/hbhpdf/harupdf.c +++ b/harbour/contrib/hbhpdf/harupdf.c @@ -47,28 +47,21 @@ * */ -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// -// HaruLib (x)Harbour Wrappers -// . -// http://www.libharu.org/ -// http://sourceforge.net/projects/libharu/ -// -// Pritpal Bedi -// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// (x)Harbour headers -// +/*----------------------------------------------------------------------* + * * + * HaruLib (x)Harbour Wrappers * + * . * + * http://www.libharu.org/ * + * http://sourceforge.net/projects/libharu/ * + * * + * Pritpal Bedi * + * * + *----------------------------------------------------------------------*/ + #include "hbapi.h" #include "hbapifs.h" #include "hbapiitm.h" -// harupdf header -// #include "hpdf.h" static HB_GARBAGE_FUNC( HPDF_Doc_release ) @@ -93,13 +86,13 @@ static HPDF_Doc HPDF_Doc_par( int iParam ) return ph ? ( HPDF_Doc ) * ph : NULL; } -//----------------------------------------------------------------------// +/*----------------------------------------------------------------------*/ /* Most of the functions return hStatus == HPDF_OK or ERROR Code */ -//----------------------------------------------------------------------// -// HPdf_New() -> hDoc -// +/*----------------------------------------------------------------------*/ +/* HPdf_New() -> hDoc +*/ HB_FUNC( HPDF_NEW ) { void ** ph = ( void ** ) hb_gcAlloc( sizeof( HPDF_Doc ), HPDF_Doc_release ); @@ -108,9 +101,9 @@ HB_FUNC( HPDF_NEW ) hb_retptrGC( ph ); } -//----------------------------------------------------------------------// -// HPdf_Free( hDoc ) -> NIL -// +/*----------------------------------------------------------------------*/ +/* HPdf_Free( hDoc ) -> NIL +*/ HB_FUNC( HPDF_FREE ) { void ** ph = ( void ** ) hb_parptrGC( HPDF_Doc_release, 1 ); @@ -124,30 +117,30 @@ HB_FUNC( HPDF_FREE ) * ph = NULL; } } -//----------------------------------------------------------------------// -// HPdf_NewDoc( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_NewDoc( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_NEWDOC ) { hb_retnl( (long) HPDF_NewDoc( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_FreeDoc( hNewDoc ) -> NIL -// +/*----------------------------------------------------------------------*/ +/* HPdf_FreeDoc( hNewDoc ) -> NIL +*/ HB_FUNC( HPDF_FREEDOC ) { HPDF_FreeDoc( HPDF_Doc_par( 1 ) ); } -//----------------------------------------------------------------------// -// HPdf_FreeDocAll() -> NIL -// +/*----------------------------------------------------------------------*/ +/* HPdf_FreeDocAll() -> NIL +*/ HB_FUNC( HPDF_FREEDOCALL ) { HPDF_FreeDocAll( HPDF_Doc_par( 1 ) ); } -//----------------------------------------------------------------------// -// HPdf_SaveToFile( hDoc, cFileToSave ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SaveToFile( hDoc, cFileToSave ) -> hStatus +*/ HB_FUNC( HPDF_SAVETOFILE ) { BOOL fFree; @@ -158,23 +151,23 @@ HB_FUNC( HPDF_SAVETOFILE ) if( fFree ) hb_xfree( ( void * ) pszFileName ); } -//----------------------------------------------------------------------// -// HPdf_SaveToStream( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SaveToStream( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_SAVETOSTREAM ) { hb_retnl( (long) HPDF_SaveToStream( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetStreamSize( hDoc ) -> nSize -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetStreamSize( hDoc ) -> nSize +*/ HB_FUNC( HPDF_GETSTREAMSIZE ) { hb_retnl( (long) HPDF_GetStreamSize( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_ReadFromStream( hDoc, @cBuffer ) -> nBytesRead -// +/*----------------------------------------------------------------------*/ +/* HPdf_ReadFromStream( hDoc, @cBuffer ) -> nBytesRead +*/ HB_FUNC( HPDF_READFROMSTREAM ) { HPDF_UINT32 size = hb_parclen( 2 ); @@ -190,23 +183,23 @@ HB_FUNC( HPDF_READFROMSTREAM ) if( ! hb_storclen_buffer( ( char * ) buffer, size, 2 ) ) hb_xfree( buffer ); } -//----------------------------------------------------------------------// -// HPdf_ResetStream( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_ResetStream( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_RESETSTREAM ) { hb_retnl( (long) HPDF_ResetStream( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_HasDoc( hDoc ) -> lHasDoc -// +/*----------------------------------------------------------------------*/ +/* HPdf_HasDoc( hDoc ) -> lHasDoc +*/ HB_FUNC( HPDF_HASDOC ) { hb_retl( HPDF_HasDoc( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetErrorHandler( hDoc, procErrHandler ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetErrorHandler( hDoc, procErrHandler ) -> hStatus +*/ HB_FUNC( HPDF_SETERRORHANDLER ) { /* TOFIX: This should be extended to pass a wrapper which calls a @@ -214,105 +207,105 @@ HB_FUNC( HPDF_SETERRORHANDLER ) hb_retnl( (long) HPDF_SetErrorHandler( HPDF_Doc_par( 1 ), (HPDF_Error_Handler) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetError( hDoc ) -> nErrorCode -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetError( hDoc ) -> nErrorCode +*/ HB_FUNC( HPDF_GETERROR ) { hb_retnl( (long) HPDF_GetError( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_ResetError( hDoc ) -> NIL -// +/*----------------------------------------------------------------------*/ +/* HPdf_ResetError( hDoc ) -> NIL +*/ HB_FUNC( HPDF_RESETERROR ) { HPDF_ResetError( HPDF_Doc_par( 1 ) ); } -//----------------------------------------------------------------------// -// HPdf_SetPagesConfiguration( hDoc, nPagePerPages ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetPagesConfiguration( hDoc, nPagePerPages ) -> hStatus +*/ HB_FUNC( HPDF_SETPAGESCONFIGURATION ) { hb_retnl( (long) HPDF_SetPagesConfiguration( HPDF_Doc_par( 1 ), hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetPageLayout( hDoc, nLayout ) -> hStatus -// nLayout == -// HPDF_PAGE_LAYOUT_SINGLE 0 -// HPDF_PAGE_LAYOUT_ONE_COLUMN 1 -// HPDF_PAGE_LAYOUT_TWO_COLUMN_LEFT 2 -// HPDF_PAGE_LAYOUT_TWO_COLUMN_RIGHT 3 -// HPDF_PAGE_LAYOUT_EOF 4 -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetPageLayout( hDoc, nLayout ) -> hStatus + nLayout == + HPDF_PAGE_LAYOUT_SINGLE 0 + HPDF_PAGE_LAYOUT_ONE_COLUMN 1 + HPDF_PAGE_LAYOUT_TWO_COLUMN_LEFT 2 + HPDF_PAGE_LAYOUT_TWO_COLUMN_RIGHT 3 + HPDF_PAGE_LAYOUT_EOF 4 +*/ HB_FUNC( HPDF_SETPAGELAYOUT ) { hb_retnl( (long) HPDF_SetPageLayout( HPDF_Doc_par( 1 ), (HPDF_PageLayout) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetPageLayout( hDoc ) -> nLayout -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetPageLayout( hDoc ) -> nLayout +*/ HB_FUNC( HPDF_GETPAGELAYOUT ) { hb_retni( (int) HPDF_GetPageLayout( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetPageMode( hDoc, nPageMode ) -> hStatus -// nPageMode == -// HPDF_PAGE_MODE_USE_NONE 0 Display the document with neither outline nor thumbnail. -// HPDF_PAGE_MODE_USE_OUTLINE 1 Display the document with outline pane. -// HPDF_PAGE_MODE_USE_THUMBS 2 Display the document with thumbnail pane. -// HPDF_PAGE_MODE_FULL_SCREEN 3 Display the document with full screen mode. -// HPDF_PAGE_MODE_EOF 4 -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetPageMode( hDoc, nPageMode ) -> hStatus + nPageMode == + HPDF_PAGE_MODE_USE_NONE 0 Display the document with neither outline nor thumbnail. + HPDF_PAGE_MODE_USE_OUTLINE 1 Display the document with outline pane. + HPDF_PAGE_MODE_USE_THUMBS 2 Display the document with thumbnail pane. + HPDF_PAGE_MODE_FULL_SCREEN 3 Display the document with full screen mode. + HPDF_PAGE_MODE_EOF 4 +*/ HB_FUNC( HPDF_SETPAGEMODE ) { hb_retnl( (long) HPDF_SetPageMode( HPDF_Doc_par( 1 ), (HPDF_PageMode) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetPageMode( hDoc ) -> nPageMode -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetPageMode( hDoc ) -> nPageMode +*/ HB_FUNC( HPDF_GETPAGEMODE ) { hb_retni( (int) HPDF_GetPageMode( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetOpenAction( hDoc, hDestn ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetOpenAction( hDoc, hDestn ) -> hStatus +*/ HB_FUNC( HPDF_SETOPENACTION ) { hb_retnl( (long) HPDF_SetOpenAction( HPDF_Doc_par( 1 ), (HPDF_Destination) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetCurrentPage( hDoc ) -> hPage -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetCurrentPage( hDoc ) -> hPage +*/ HB_FUNC( HPDF_GETCURRENTPAGE ) { hb_retptr( ( void * ) HPDF_GetCurrentPage( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_AddPage( hDoc ) -> hPage -// +/*----------------------------------------------------------------------*/ +/* HPdf_AddPage( hDoc ) -> hPage +*/ HB_FUNC( HPDF_ADDPAGE ) { hb_retptr( ( void * ) HPDF_AddPage( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_InsertPage( hDoc, hPage ) -> hPageInserted : Just before hPage -// +/*----------------------------------------------------------------------*/ +/* HPdf_InsertPage( hDoc, hPage ) -> hPageInserted : Just before hPage +*/ HB_FUNC( HPDF_INSERTPAGE ) { hb_retptr( ( void * ) HPDF_InsertPage( HPDF_Doc_par( 1 ), (HPDF_Page) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetFont( hDoc, cFontName, cEncoding ) -> hFont -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetFont( hDoc, cFontName, cEncoding ) -> hFont +*/ HB_FUNC( HPDF_GETFONT ) { hb_retptr( ( void * ) HPDF_GetFont( HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parc( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadTypeIFontFromFile( hDoc, cAFMFileName, cPFA_PFBFileName ) -> cFontName -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadTypeIFontFromFile( hDoc, cAFMFileName, cPFA_PFBFileName ) -> cFontName +*/ HB_FUNC( HPDF_LOADTYPE1FONTFROMFILE ) { BOOL fFree1; @@ -328,9 +321,9 @@ HB_FUNC( HPDF_LOADTYPE1FONTFROMFILE ) if( fFree2 ) hb_xfree( pszFileName2 ); } -//----------------------------------------------------------------------// -// HPdf_LoadTTFontFromFile( hDoc, cTTFontFileName, lEmbed ) -> cFontName -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadTTFontFromFile( hDoc, cTTFontFileName, lEmbed ) -> cFontName +*/ HB_FUNC( HPDF_LOADTTFONTFROMFILE ) { BOOL fFree; @@ -341,9 +334,9 @@ HB_FUNC( HPDF_LOADTTFONTFROMFILE ) if( fFree ) hb_xfree( ( void * ) pszFileName ); } -//----------------------------------------------------------------------// -// HPdf_LoadTTFontFromFile2( hDoc, cTTFontFileName, nIndexInFile, lEmbed ) -> cFontName -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadTTFontFromFile2( hDoc, cTTFontFileName, nIndexInFile, lEmbed ) -> cFontName +*/ HB_FUNC( HPDF_LOADTTFONTFROMFILE2 ) { BOOL fFree; @@ -354,175 +347,175 @@ HB_FUNC( HPDF_LOADTTFONTFROMFILE2 ) if( fFree ) hb_xfree( ( void * ) pszFileName ); } -//----------------------------------------------------------------------// -// HPdf_AddPageLabel( hDoc, nPageNum, nPgNoStyle, nFirstPageInRange, cPrefixToLabel ) -> hStatus -// nPgNoStyle -// HPDF_PAGE_NUM_STYLE_DECIMAL 1 Page label is displayed by Arabic numerals. -// HPDF_PAGE_NUM_STYLE_UPPER_ROMAN 2 Page label is displayed by Uppercase roman numerals. -// HPDF_PAGE_NUM_STYLE_LOWER_ROMAN 3 Page label is displayed by Lowercase roman numerals. -// HPDF_PAGE_NUM_STYLE_UPPER_LETTERS 4 Page label is displayed by Uppercase letters (using A to Z). -// HPDF_PAGE_NUM_STYLE_LOWER_LETTERS 5 Page label is displayed by Lowercase letters (using a to z). -// +/*----------------------------------------------------------------------*/ +/* HPdf_AddPageLabel( hDoc, nPageNum, nPgNoStyle, nFirstPageInRange, cPrefixToLabel ) -> hStatus + nPgNoStyle + HPDF_PAGE_NUM_STYLE_DECIMAL 1 Page label is displayed by Arabic numerals. + HPDF_PAGE_NUM_STYLE_UPPER_ROMAN 2 Page label is displayed by Uppercase roman numerals. + HPDF_PAGE_NUM_STYLE_LOWER_ROMAN 3 Page label is displayed by Lowercase roman numerals. + HPDF_PAGE_NUM_STYLE_UPPER_LETTERS 4 Page label is displayed by Uppercase letters (using A to Z). + HPDF_PAGE_NUM_STYLE_LOWER_LETTERS 5 Page label is displayed by Lowercase letters (using a to z). +*/ HB_FUNC( HPDF_ADDPAGELABEL ) { hb_retnl( (long) HPDF_AddPageLabel( (HPDF_Doc) hb_parni( 1 ), hb_parni( 2 ), (HPDF_PageNumStyle) hb_parni( 3 ), hb_parni( 4 ), hb_parc( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseJPFonts( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseJPFonts( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USEJPFONTS ) { hb_retnl( (long) HPDF_UseJPFonts( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseKRFonts( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseKRFonts( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USEKRFONTS ) { hb_retnl( (long) HPDF_UseKRFonts( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseCNSFonts( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseCNSFonts( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USECNSFONTS ) { hb_retnl( (long) HPDF_UseCNSFonts( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseCNTFonts( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseCNTFonts( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USECNTFONTS ) { hb_retnl( (long) HPDF_UseCNTFonts( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_CreateExtGState( hDoc ) -> hExtGState -// +/*----------------------------------------------------------------------*/ +/* HPdf_CreateExtGState( hDoc ) -> hExtGState +*/ HB_FUNC( HPDF_CREATEEXTGSTATE ) { hb_retptr( ( void * ) HPDF_CreateExtGState( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_CreateOutline( hDoc, hParentOutline, cTitle, hEncoder ) -> hOutline -// +/*----------------------------------------------------------------------*/ +/* HPdf_CreateOutline( hDoc, hParentOutline, cTitle, hEncoder ) -> hOutline +*/ HB_FUNC( HPDF_CREATEOUTLINE ) { hb_retptr( ( void * ) HPDF_CreateOutline( HPDF_Doc_par( 1 ), (HPDF_Outline) hb_parptr( 2 ), hb_parc( 3 ), (HPDF_Encoder) hb_parptr( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetEncoder( hDoc, cEncoding ) -> hEncoder -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetEncoder( hDoc, cEncoding ) -> hEncoder +*/ HB_FUNC( HPDF_GETENCODER ) { hb_retptr( ( void * ) HPDF_GetEncoder( HPDF_Doc_par( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetCurrentEncoder( hDoc ) -> hEncoder -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetCurrentEncoder( hDoc ) -> hEncoder +*/ HB_FUNC( HPDF_GETCURRENTENCODER ) { hb_retptr( ( void * ) HPDF_GetCurrentEncoder( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetCurrentEncoder( hDoc, hEncoder ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetCurrentEncoder( hDoc, hEncoder ) -> hStatus +*/ HB_FUNC( HPDF_SETCURRENTENCODER ) { hb_retnl( (long) HPDF_SetCurrentEncoder( HPDF_Doc_par( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseJPEncodings( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseJPEncodings( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USEJPENCODINGS ) { hb_retnl( (long) HPDF_UseJPEncodings( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseKREncodings( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseKREncodings( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USEKRENCODINGS ) { hb_retnl( (long) HPDF_UseKREncodings( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseCNSEncodings( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseCNSEncodings( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USECNSENCODINGS ) { hb_retnl( (long) HPDF_UseCNSEncodings( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_UseCNTEncodings( hDoc ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_UseCNTEncodings( hDoc ) -> hStatus +*/ HB_FUNC( HPDF_USECNTENCODINGS ) { hb_retnl( (long) HPDF_UseCNTEncodings( HPDF_Doc_par( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadPngImageFromFile( hDoc, cPNGFileName ) -> hImage -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadPngImageFromFile( hDoc, cPNGFileName ) -> hImage +*/ HB_FUNC( HPDF_LOADPNGIMAGEFROMFILE ) { hb_retptr( ( void * ) HPDF_LoadPngImageFromFile( HPDF_Doc_par( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadPngImageFromFile2( hDoc, cPNGFileName ) -> hImage -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadPngImageFromFile2( hDoc, cPNGFileName ) -> hImage +*/ HB_FUNC( HPDF_LOADPNGIMAGEFROMFILE2 ) { hb_retptr( ( void * ) HPDF_LoadPngImageFromFile2( HPDF_Doc_par( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadRawImageFromFile( hDoc, cImageFileName, nWidth, nHeight, nColorSpace ) -> hImage -// nColorSpace -// HPDF_CS_DEVICE_GRAY -// HPDF_CS_DEVICE_RGB -// HPDF_CS_DEVICE_CMYK -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadRawImageFromFile( hDoc, cImageFileName, nWidth, nHeight, nColorSpace ) -> hImage + nColorSpace + HPDF_CS_DEVICE_GRAY + HPDF_CS_DEVICE_RGB + HPDF_CS_DEVICE_CMYK +*/ HB_FUNC( HPDF_LOADRAWIMAGEFROMFILE ) { hb_retptr( ( void * ) HPDF_LoadRawImageFromFile( HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parni( 3 ), hb_parni( 4 ), (HPDF_ColorSpace) hb_parni( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadRawImageFromMem( hDoc, cBuffer, nWidth, nHeight, nColorSpace, nBitsPerComponents ) -> hImage -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadRawImageFromMem( hDoc, cBuffer, nWidth, nHeight, nColorSpace, nBitsPerComponents ) -> hImage +*/ HB_FUNC( HPDF_LOADRAWIMAGEFROMMEM ) { hb_retptr( ( void * ) HPDF_LoadRawImageFromMem( HPDF_Doc_par( 1 ), (HPDF_BYTE*) hb_parc( 2 ), hb_parni( 3 ), hb_parni( 4 ), (HPDF_ColorSpace) hb_parni( 5 ), hb_parni( 6 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_LoadJPEGImageFromFile( hDoc, cHPEGFileName ) -> hImage -// +/*----------------------------------------------------------------------*/ +/* HPdf_LoadJPEGImageFromFile( hDoc, cHPEGFileName ) -> hImage +*/ HB_FUNC( HPDF_LOADJPEGIMAGEFROMFILE ) { hb_retptr( ( void * ) HPDF_LoadJpegImageFromFile( HPDF_Doc_par( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetInfoAttr( hDoc, nInfoType, cInfo ) -> hStatus -// nInfoType == -// HPDF_INFO_AUTHOR -// HPDF_INFO_CREATOR -// HPDF_INFO_TITLE -// HPDF_INFO_SUBJECT -// HPDF_INFO_KEYWORDS -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetInfoAttr( hDoc, nInfoType, cInfo ) -> hStatus + nInfoType == + HPDF_INFO_AUTHOR + HPDF_INFO_CREATOR + HPDF_INFO_TITLE + HPDF_INFO_SUBJECT + HPDF_INFO_KEYWORDS +*/ HB_FUNC( HPDF_SETINFOATTR ) { hb_retnl( (long) HPDF_SetInfoAttr( HPDF_Doc_par( 1 ), (HPDF_InfoType) hb_parni( 2 ), hb_parc( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_GetInfoAttr( hDoc, nInfoType ) -> cInfo -// +/*----------------------------------------------------------------------*/ +/* HPdf_GetInfoAttr( hDoc, nInfoType ) -> cInfo +*/ HB_FUNC( HPDF_GETINFOATTR ) { hb_retc( HPDF_GetInfoAttr( HPDF_Doc_par( 1 ), (HPDF_InfoType) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetInfoDateAttr( hDoc, nInfoType, aDateValues ) -> hStatus -// nInfoType == -// HPDF_INFO_CREATION_DATE -// HPDF_INFO_MOD_DATE -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetInfoDateAttr( hDoc, nInfoType, aDateValues ) -> hStatus + nInfoType == + HPDF_INFO_CREATION_DATE + HPDF_INFO_MOD_DATE +*/ HB_FUNC( HPDF_SETINFODATEATTR ) { HPDF_Date date; @@ -536,122 +529,122 @@ HB_FUNC( HPDF_SETINFODATEATTR ) hb_retnl( (long) HPDF_SetInfoDateAttr( HPDF_Doc_par( 1 ), (HPDF_InfoType) hb_parni( 2 ), date ) ); } -//----------------------------------------------------------------------// -// HPdf_SetPassword( hDoc, cOwnerPassword = NO NIL, cUserPassword = CANBE NIL ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetPassword( hDoc, cOwnerPassword = NO NIL, cUserPassword = CANBE NIL ) -> hStatus +*/ HB_FUNC( HPDF_SETPASSWORD ) { hb_retnl( (long) HPDF_SetPassword( HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parc( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetPermission( hDoc, nPermission ) -> hStatus -// nPermission == -// HPDF_ENABLE_READ 1 user can read the document. -// HPDF_ENABLE_PRINT 2 user can print the document. -// HPDF_ENABLE_EDIT_ALL 3 user can edit the contents of the document other than annotations, form fields. -// HPDF_ENABLE_COPY 4 user can copy the text and the graphics of the document. -// HPDF_ENABLE_EDIT 5 user can add or modify the annotations and form fields of the document. -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetPermission( hDoc, nPermission ) -> hStatus + nPermission == + HPDF_ENABLE_READ 1 user can read the document. + HPDF_ENABLE_PRINT 2 user can print the document. + HPDF_ENABLE_EDIT_ALL 3 user can edit the contents of the document other than annotations, form fields. + HPDF_ENABLE_COPY 4 user can copy the text and the graphics of the document. + HPDF_ENABLE_EDIT 5 user can add or modify the annotations and form fields of the document. +*/ HB_FUNC( HPDF_SETPERMISSION ) { hb_retnl( (long) HPDF_SetPermission( HPDF_Doc_par( 1 ), hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetEncryptionMode( hDoc, nEncMode, nKeyLen ) -> hStatus -// nEncMode == -// HPDF_ENCRYPT_R2 1 Use "Revision 2" algorithm. -// The length of key is automatically set to 5(40bit). -// HPDF_ENCRYPT_R3 2 Use "Revision 3" algorithm. -// Between 5(40bit) and 16(128bit) can be specified for length of the key -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetEncryptionMode( hDoc, nEncMode, nKeyLen ) -> hStatus + nEncMode == + HPDF_ENCRYPT_R2 1 Use "Revision 2" algorithm. + The length of key is automatically set to 5(40bit). + HPDF_ENCRYPT_R3 2 Use "Revision 3" algorithm. + Between 5(40bit) and 16(128bit) can be specified for length of the key +*/ HB_FUNC( HPDF_SETENCRYPTIONMODE ) { hb_retnl( (long) HPDF_SetEncryptionMode( HPDF_Doc_par( 1 ), (HPDF_EncryptMode) hb_parni( 2 ), hb_parni( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_SetCompressionMode( hDoc, nCompMode ) -> hStatus -// nCompMode == -// HPDF_COMP_NONE 1 All contents are not compressed. -// HPDF_COMP_TEXT 2 Compress the contents stream of the page. -// HPDF_COMP_IMAGE 3 Compress the streams of the image objects. -// HPDF_COMP_METADATA 4 Other stream datas (fonts, cmaps and so on) are compressed. -// HPDF_COMP_ALL 5 All stream datas are compressed. (The same as "HPDF_COMP_TEXT | HPDF_COMP_IMAGE | HPDF_COMP_METADATA") -// +/*----------------------------------------------------------------------*/ +/* HPdf_SetCompressionMode( hDoc, nCompMode ) -> hStatus + nCompMode == + HPDF_COMP_NONE 1 All contents are not compressed. + HPDF_COMP_TEXT 2 Compress the contents stream of the page. + HPDF_COMP_IMAGE 3 Compress the streams of the image objects. + HPDF_COMP_METADATA 4 Other stream datas (fonts, cmaps and so on) are compressed. + HPDF_COMP_ALL 5 All stream datas are compressed. (The same as "HPDF_COMP_TEXT | HPDF_COMP_IMAGE | HPDF_COMP_METADATA") +*/ HB_FUNC( HPDF_SETCOMPRESSIONMODE ) { hb_retnl( (long) HPDF_SetCompressionMode( HPDF_Doc_par( 1 ), hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// Page Handling -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPdf_Page_SetWidth( hPage, nWidth ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* Page Handling */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPdf_Page_SetWidth( hPage, nWidth ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETWIDTH ) { hb_retnl( (long) HPDF_Page_SetWidth( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_SetHeight( hPage, nHeight ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_SetHeight( hPage, nHeight ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETHEIGHT ) { hb_retnl( (long) HPDF_Page_SetHeight( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_SetSize( hPage, nSize, nOrientation = 1 Portrait, 2 Landscape ) -> hStatus -// nSize == -// HPDF_PAGE_SIZE_LETTER 1 8½ x 11 (Inches) 612 x 792 -// HPDF_PAGE_SIZE_LEGAL 2 8½ x 14 (Inches) 612 x 1008 -// HPDF_PAGE_SIZE_A3 3 297 × 420 (mm) 841.89 x 1199.551 -// HPDF_PAGE_SIZE_A4 4 210 × 297 (mm) 595.276 x 841.89 -// HPDF_PAGE_SIZE_A5 5 148 × 210 (mm) 419.528 x 595.276 -// HPDF_PAGE_SIZE_B4 6 250 × 353 (mm) 708.661 x 1000.63 -// HPDF_PAGE_SIZE_B5 7 176 × 250 (mm) 498.898 x 708.661 -// HPDF_PAGE_SIZE_EXECUTIVE 8 7½ x 10½ (Inches) 522 x 756 -// HPDF_PAGE_SIZE_US4x6 9 4 x 6 (Inches) 288 x 432 -// HPDF_PAGE_SIZE_US4x8 10 4 x 8 (Inches) 288 x 576 -// HPDF_PAGE_SIZE_US5x7 11 5 x 7 (Inches) 360 x 504 -// HPDF_PAGE_SIZE_COMM10 12 4.125 x 9.5 (Inches) 297x 684 -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_SetSize( hPage, nSize, nOrientation = 1 Portrait, 2 Landscape ) -> hStatus + nSize == + HPDF_PAGE_SIZE_LETTER 1 8½ x 11 (Inches) 612 x 792 + HPDF_PAGE_SIZE_LEGAL 2 8½ x 14 (Inches) 612 x 1008 + HPDF_PAGE_SIZE_A3 3 297 × 420 (mm) 841.89 x 1199.551 + HPDF_PAGE_SIZE_A4 4 210 × 297 (mm) 595.276 x 841.89 + HPDF_PAGE_SIZE_A5 5 148 × 210 (mm) 419.528 x 595.276 + HPDF_PAGE_SIZE_B4 6 250 × 353 (mm) 708.661 x 1000.63 + HPDF_PAGE_SIZE_B5 7 176 × 250 (mm) 498.898 x 708.661 + HPDF_PAGE_SIZE_EXECUTIVE 8 7½ x 10½ (Inches) 522 x 756 + HPDF_PAGE_SIZE_US4x6 9 4 x 6 (Inches) 288 x 432 + HPDF_PAGE_SIZE_US4x8 10 4 x 8 (Inches) 288 x 576 + HPDF_PAGE_SIZE_US5x7 11 5 x 7 (Inches) 360 x 504 + HPDF_PAGE_SIZE_COMM10 12 4.125 x 9.5 (Inches) 297x 684 +*/ HB_FUNC( HPDF_PAGE_SETSIZE ) { hb_retnl( (long) HPDF_Page_SetSize( (HPDF_Page) hb_parptr( 1 ), (HPDF_PageSizes) hb_parni( 2 ), (HPDF_PageDirection) hb_parni( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_SetRotate( hPage, nAngle = 0-360 ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_SetRotate( hPage, nAngle = 0-360 ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETROTATE ) { hb_retnl( (long) HPDF_Page_SetRotate( (HPDF_Page) hb_parptr( 1 ), hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetWidth( hPage ) -> nWidth -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetWidth( hPage ) -> nWidth +*/ HB_FUNC( HPDF_PAGE_GETWIDTH ) { hb_retnd( (double) HPDF_Page_GetWidth( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetHeight( hPage ) -> nHeight -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetHeight( hPage ) -> nHeight +*/ HB_FUNC( HPDF_PAGE_GETHEIGHT ) { hb_retnd( (double) HPDF_Page_GetHeight( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_CreateDestination( hPage ) -> hDestn -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_CreateDestination( hPage ) -> hDestn +*/ HB_FUNC( HPDF_PAGE_CREATEDESTINATION ) { hb_retptr( ( void * ) HPDF_Page_CreateDestination( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_CreateAnnot( hPage, aRect[nLeft,nTop,nRight,nBottom], cText, cEncoder ) -> nHandle -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_CreateAnnot( hPage, aRect[nLeft,nTop,nRight,nBottom], cText, cEncoder ) -> nHandle +*/ HB_FUNC( HPDF_PAGE_CREATETEXTANNOT ) { HPDF_Rect rc; @@ -663,9 +656,9 @@ HB_FUNC( HPDF_PAGE_CREATETEXTANNOT ) hb_retptr( HPDF_Page_CreateTextAnnot( (HPDF_Page) hb_parptr( 1 ), rc, hb_parc( 3 ), (HPDF_Encoder) hb_parptr( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_CreateLinkAnnot( hPage, aRect, hDestn ) -> nHandle -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_CreateLinkAnnot( hPage, aRect, hDestn ) -> nHandle +*/ HB_FUNC( HPDF_PAGE_CREATELINKANNOT ) { HPDF_Rect rc; @@ -677,9 +670,9 @@ HB_FUNC( HPDF_PAGE_CREATELINKANNOT ) hb_retptr( HPDF_Page_CreateLinkAnnot( (HPDF_Page) hb_parptr( 1 ), rc, (HPDF_Destination) hb_parptr( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_CreateURILinkAnnot( hPage, aRect, cURI ) -> nHandle -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_CreateURILinkAnnot( hPage, aRect, cURI ) -> nHandle +*/ HB_FUNC( HPDF_PAGE_CREATEURILINKANNOT ) { HPDF_Rect rc; @@ -691,30 +684,30 @@ HB_FUNC( HPDF_PAGE_CREATEURILINKANNOT ) hb_retptr( HPDF_Page_CreateURILinkAnnot( (HPDF_Page) hb_parptr( 1 ), rc, hb_parc( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_TextWidth( hPage, cText ) -> nTextWidth -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_TextWidth( hPage, cText ) -> nTextWidth +*/ HB_FUNC( HPDF_PAGE_TEXTWIDTH ) { hb_retnl( (long) HPDF_Page_TextWidth( (HPDF_Page) hb_parptr( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_MeasureText( hPage, cText, nWidth, lWordWrap ) -> nByteLenOfTextToFitWidth -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_MeasureText( hPage, cText, nWidth, lWordWrap ) -> nByteLenOfTextToFitWidth +*/ HB_FUNC( HPDF_PAGE_MEASURETEXT ) { hb_retnl( (long) HPDF_Page_MeasureText( (HPDF_Page) hb_parptr( 1 ), hb_parc( 2 ), (HPDF_REAL) hb_parnd( 3 ), hb_parl( 4 ), NULL ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetMode( hPage ) -> nGraphicMode -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetMode( hPage ) -> nGraphicMode +*/ HB_FUNC( HPDF_PAGE_GETGMODE ) { hb_retnl( (long) HPDF_Page_GetGMode( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCurrentPos( hPage ) -> aCurPos[ nX, nY ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCurrentPos( hPage ) -> aCurPos[ nX, nY ] +*/ HB_FUNC( HPDF_PAGE_GETCURRENTPOS ) { HPDF_Point pt; @@ -727,9 +720,9 @@ HB_FUNC( HPDF_PAGE_GETCURRENTPOS ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCurrentTextPos( hPage ) -> aCurTextPos[ nX, nY ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCurrentTextPos( hPage ) -> aCurTextPos[ nX, nY ] +*/ HB_FUNC( HPDF_PAGE_GETCURRENTTEXTPOS ) { HPDF_Point pt; @@ -742,23 +735,23 @@ HB_FUNC( HPDF_PAGE_GETCURRENTTEXTPOS ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCurrentFont( hPage ) -> hFont -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCurrentFont( hPage ) -> hFont +*/ HB_FUNC( HPDF_PAGE_GETCURRENTFONT ) { hb_retptr( ( void * ) HPDF_Page_GetCurrentFont( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCurrentFontSize( hPage ) -> nFontSize -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCurrentFontSize( hPage ) -> nFontSize +*/ HB_FUNC( HPDF_PAGE_GETCURRENTFONTSIZE ) { hb_retnd( (double) HPDF_Page_GetCurrentFontSize( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetTransMatrix( hPage ) -> aMatrix[ ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetTransMatrix( hPage ) -> aMatrix[ ] +*/ HB_FUNC( HPDF_PAGE_GETTRANSMATRIX ) { HPDF_TransMatrix matrix; @@ -775,37 +768,37 @@ HB_FUNC( HPDF_PAGE_GETTRANSMATRIX ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetLineWidth( hPage ) -> nLineWidth -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetLineWidth( hPage ) -> nLineWidth +*/ HB_FUNC( HPDF_PAGE_GETLINEWIDTH ) { hb_retnd( (double) HPDF_Page_GetLineWidth( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetLineCap( hPage ) -> nLineCapStyle -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetLineCap( hPage ) -> nLineCapStyle +*/ HB_FUNC( HPDF_PAGE_GETLINECAP ) { hb_retnl( (long) HPDF_Page_GetLineCap( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetLineJoin( hPage ) -> nLineJoinStyle -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetLineJoin( hPage ) -> nLineJoinStyle +*/ HB_FUNC( HPDF_PAGE_GETLINEJOIN ) { hb_retnl( (long) HPDF_Page_GetLineJoin( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetMiterLimit( hPage ) -> nMiterLimit -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetMiterLimit( hPage ) -> nMiterLimit +*/ HB_FUNC( HPDF_PAGE_GETMITERLIMIT ) { hb_retnl( (long) HPDF_Page_GetMiterLimit( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetDash( hPage ) -> aDash -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetDash( hPage ) -> aDash +*/ HB_FUNC( HPDF_PAGE_GETDASH ) { HPDF_DashMode dash; @@ -826,58 +819,58 @@ HB_FUNC( HPDF_PAGE_GETDASH ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetFlat( hPage ) -> nCurFlatness -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetFlat( hPage ) -> nCurFlatness +*/ HB_FUNC( HPDF_PAGE_GETFLAT ) { hb_retnd( (double) HPDF_Page_GetFlat( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCharSpace( hPage ) -> nCurCharSpace -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCharSpace( hPage ) -> nCurCharSpace +*/ HB_FUNC( HPDF_PAGE_GETCHARSPACE ) { hb_retnd( (double) HPDF_Page_GetCharSpace( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetWordSpace( hPage ) -> nCurWordSpace -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetWordSpace( hPage ) -> nCurWordSpace +*/ HB_FUNC( HPDF_PAGE_GETWORDSPACE ) { hb_retnd( (double) HPDF_Page_GetWordSpace( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetHorizontalScalling( hPage ) -> nHorzScaling -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetHorizontalScalling( hPage ) -> nHorzScaling +*/ HB_FUNC( HPDF_PAGE_GETHORIZONTALSCALLING ) { hb_retnd( (double) HPDF_Page_GetHorizontalScalling( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetTextLeading( hPage ) -> nTextLeading -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetTextLeading( hPage ) -> nTextLeading +*/ HB_FUNC( HPDF_PAGE_GETTEXTLEADING ) { hb_retnd( (double) HPDF_Page_GetTextLeading( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetTextRenderingMode( hPage ) -> nTextRenderingMode -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetTextRenderingMode( hPage ) -> nTextRenderingMode +*/ HB_FUNC( HPDF_PAGE_GETTEXTRENDERINGMODE ) { hb_retnd( (double) HPDF_Page_GetTextRenderingMode( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetTextRise( hPage ) -> nTextRise -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetTextRise( hPage ) -> nTextRise +*/ HB_FUNC( HPDF_PAGE_GETTEXTRISE ) { hb_retnd( (double) HPDF_Page_GetTextRise( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetRGBFill( hPage ) -> aRGBFill[ nRed, nGreen, nBlue ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetRGBFill( hPage ) -> aRGBFill[ nRed, nGreen, nBlue ] +*/ HB_FUNC( HPDF_PAGE_GETRGBFILL ) { HPDF_RGBColor rgb; @@ -891,9 +884,9 @@ HB_FUNC( HPDF_PAGE_GETRGBFILL ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetRGBStroke( hPage ) -> aRGBStroke[ nRed, nGreen, nBlue ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetRGBStroke( hPage ) -> aRGBStroke[ nRed, nGreen, nBlue ] +*/ HB_FUNC( HPDF_PAGE_GETRGBSTROKE ) { HPDF_RGBColor rgb; @@ -907,9 +900,9 @@ HB_FUNC( HPDF_PAGE_GETRGBSTROKE ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCMYKFill( hPage ) -> aCMYKFill[ nC, nM, nY, nK ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCMYKFill( hPage ) -> aCMYKFill[ nC, nM, nY, nK ] +*/ HB_FUNC( HPDF_PAGE_GETCMYKFILL ) { HPDF_CMYKColor cmyk; @@ -924,9 +917,9 @@ HB_FUNC( HPDF_PAGE_GETCMYKFILL ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetCMYKStroke( hPage ) -> aCMYKStroke[ nC, nM, nY, nK ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetCMYKStroke( hPage ) -> aCMYKStroke[ nC, nM, nY, nK ] +*/ HB_FUNC( HPDF_PAGE_GETCMYKSTROKE ) { HPDF_CMYKColor cmyk; @@ -941,37 +934,37 @@ HB_FUNC( HPDF_PAGE_GETCMYKSTROKE ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetGrayFill( hPage ) -> nGrayFillValue -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetGrayFill( hPage ) -> nGrayFillValue +*/ HB_FUNC( HPDF_PAGE_GETGRAYFILL ) { hb_retnd( (double) HPDF_Page_GetGrayFill( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetGrayStroke( hPage ) -> nGrayStrokeValue -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetGrayStroke( hPage ) -> nGrayStrokeValue +*/ HB_FUNC( HPDF_PAGE_GETGRAYSTROKE ) { hb_retnd( (double) HPDF_Page_GetGrayStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetStrokingColorSpace( hPage ) -> nStrokingSpace -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetStrokingColorSpace( hPage ) -> nStrokingSpace +*/ HB_FUNC( HPDF_PAGE_GETSTROKINGCOLORSPACE ) { hb_retnd( (double) HPDF_Page_GetStrokingColorSpace( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetFillingColorSpace( hPage ) -> nFillingColorSpace -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetFillingColorSpace( hPage ) -> nFillingColorSpace +*/ HB_FUNC( HPDF_PAGE_GETFILLINGCOLORSPACE ) { hb_retnd( (double) HPDF_Page_GetFillingColorSpace( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetTextMatrix( hPage ) -> aMatrix[ ] -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetTextMatrix( hPage ) -> aMatrix[ ] +*/ HB_FUNC( HPDF_PAGE_GETTEXTMATRIX ) { HPDF_TransMatrix matrix; @@ -988,75 +981,75 @@ HB_FUNC( HPDF_PAGE_GETTEXTMATRIX ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPdf_Page_GetGStateDepth( hPage ) -> nGStateDepth -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_GetGStateDepth( hPage ) -> nGStateDepth +*/ HB_FUNC( HPDF_PAGE_GETGSTATEDEPTH ) { hb_retni( (int) HPDF_Page_GetGStateDepth( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPdf_Page_SetSlideShow( hPage, nType, nDurationPerFrame, nTranstnTime = 1 Second ) -> hStatus -// nType == -// HPDF_TS_WIPE_RIGHT -// HPDF_TS_WIPE_UP -// HPDF_TS_WIPE_LEFT -// HPDF_TS_WIPE_DOWN -// HPDF_TS_BARN_DOORS_HORIZONTAL_OUT -// HPDF_TS_BARN_DOORS_HORIZONTAL_IN -// HPDF_TS_BARN_DOORS_VERTICAL_OUT -// HPDF_TS_BARN_DOORS_VERTICAL_IN -// HPDF_TS_BOX_OUT -// HPDF_TS_BOX_IN -// HPDF_TS_BLINDS_HORIZONTAL -// HPDF_TS_BLINDS_VERTICAL -// HPDF_TS_DISSOLVE -// HPDF_TS_GLITTER_RIGHT -// HPDF_TS_GLITTER_DOWN -// HPDF_TS_GLITTER_TOP_LEFT_TO_BOTTOM_RIGHT -// HPDF_TS_REPLACE -// +/*----------------------------------------------------------------------*/ +/* HPdf_Page_SetSlideShow( hPage, nType, nDurationPerFrame, nTranstnTime = 1 Second ) -> hStatus + nType == + HPDF_TS_WIPE_RIGHT + HPDF_TS_WIPE_UP + HPDF_TS_WIPE_LEFT + HPDF_TS_WIPE_DOWN + HPDF_TS_BARN_DOORS_HORIZONTAL_OUT + HPDF_TS_BARN_DOORS_HORIZONTAL_IN + HPDF_TS_BARN_DOORS_VERTICAL_OUT + HPDF_TS_BARN_DOORS_VERTICAL_IN + HPDF_TS_BOX_OUT + HPDF_TS_BOX_IN + HPDF_TS_BLINDS_HORIZONTAL + HPDF_TS_BLINDS_VERTICAL + HPDF_TS_DISSOLVE + HPDF_TS_GLITTER_RIGHT + HPDF_TS_GLITTER_DOWN + HPDF_TS_GLITTER_TOP_LEFT_TO_BOTTOM_RIGHT + HPDF_TS_REPLACE +*/ HB_FUNC( HPDF_PAGE_SETSLIDESHOW ) { hb_retnl( (long) HPDF_Page_SetSlideShow( (HPDF_Page) hb_parptr( 1 ), (HPDF_TransitionStyle) hb_parni( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// GRAPHICS -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Page_SetLineWidth( hPage, nLineWidth ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* GRAPHICS */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetLineWidth( hPage, nLineWidth ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETLINEWIDTH ) { hb_retnl( (long) HPDF_Page_SetLineWidth( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetLineCap( hPage, nLineCap ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetLineCap( hPage, nLineCap ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETLINECAP ) { hb_retnl( (long) HPDF_Page_SetLineCap( (HPDF_Page) hb_parptr( 1 ), (HPDF_LineCap) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetLineJoin( hPage, nLineJoin ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetLineJoin( hPage, nLineJoin ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETLINEJOIN ) { hb_retnl( (long) HPDF_Page_SetLineJoin( (HPDF_Page) hb_parptr( 1 ), (HPDF_LineJoin) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetMiterLimit( hPage, nMiterLimit ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetMiterLimit( hPage, nMiterLimit ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETMITERLIMIT ) { hb_retnl( (long) HPDF_Page_SetMiterLimit( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetDash( hPage, aDash, nNumPoints, nStartFrom ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetDash( hPage, aDash, nNumPoints, nStartFrom ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETDASH ) { HPDF_DashMode dash; @@ -1070,30 +1063,30 @@ HB_FUNC( HPDF_PAGE_SETDASH ) hb_retnl( (long) HPDF_Page_SetDash( (HPDF_Page) hb_parptr( 1 ), dash.ptn, nPtns, hb_parni( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetExtGState( hPage, hGState ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetExtGState( hPage, hGState ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETEXTGSTATE ) { hb_retnl( (long) HPDF_Page_SetExtGState( (HPDF_Page) hb_parptr( 1 ), (HPDF_ExtGState) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_GSave( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_GSave( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_GSAVE ) { hb_retnl( (long) HPDF_Page_GSave( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_GRestore( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_GRestore( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_GRESTORE ) { hb_retnl( (long) HPDF_Page_GRestore( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Concat( hPage, nA, nB, nC, nD, nX, nY ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Concat( hPage, nA, nB, nC, nD, nX, nY ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CONCAT ) { hb_retnl( (long) HPDF_Page_Concat( (HPDF_Page) hb_parptr( 1 ), @@ -1105,23 +1098,23 @@ HB_FUNC( HPDF_PAGE_CONCAT ) (HPDF_REAL) hb_parnd( 7 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_MoveTo( hPage, nX, nY ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_MoveTo( hPage, nX, nY ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_MOVETO ) { hb_retnl( (long) HPDF_Page_MoveTo( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_LineTo( hPage, nX, nY ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_LineTo( hPage, nX, nY ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_LINETO ) { hb_retnl( (long) HPDF_Page_LineTo( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_CurveTo( hPage, nX1, nY1, nX2, nY2, nX3, nY3 ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_CurveTo( hPage, nX1, nY1, nX2, nY2, nX3, nY3 ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CURVETO ) { hb_retnl( (long) HPDF_Page_CurveTo( (HPDF_Page) hb_parptr( 1 ), @@ -1133,9 +1126,9 @@ HB_FUNC( HPDF_PAGE_CURVETO ) (HPDF_REAL) hb_parnd( 7 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_CurveTo2( hPage, nX2, nY2, nX3, nY3 ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_CurveTo2( hPage, nX2, nY2, nX3, nY3 ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CURVETO2 ) { hb_retnl( (long) HPDF_Page_CurveTo2( (HPDF_Page) hb_parptr( 1 ), @@ -1145,9 +1138,9 @@ HB_FUNC( HPDF_PAGE_CURVETO2 ) (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_CurveTo3( hPage, nX1, nY1, nX3, nY3 ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_CurveTo3( hPage, nX1, nY1, nX3, nY3 ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CURVETO3 ) { hb_retnl( (long) HPDF_Page_CurveTo3( (HPDF_Page) hb_parptr( 1 ), @@ -1157,330 +1150,330 @@ HB_FUNC( HPDF_PAGE_CURVETO3 ) (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ClosePath( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ClosePath( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CLOSEPATH ) { hb_retnl( (long) HPDF_Page_ClosePath( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Rectangle( hPage, nX, nY, nWidth, nHeight ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Rectangle( hPage, nX, nY, nWidth, nHeight ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_RECTANGLE ) { hb_retnl( (long) HPDF_Page_Rectangle( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Stroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Stroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_STROKE ) { hb_retnl( (long) HPDF_Page_Stroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ClosePathStroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ClosePathStroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CLOSEPATHSTROKE ) { hb_retnl( (long) HPDF_Page_ClosePathStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetFontAndSize( hPage, hFont, nSize ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetFontAndSize( hPage, hFont, nSize ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETFONTANDSIZE ) { hb_retnl( (long) HPDF_Page_SetFontAndSize( (HPDF_Page) hb_parptr( 1 ), (HPDF_Font) hb_parptr( 2 ), (HPDF_REAL) hb_parnd( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_BeginText( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_BeginText( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_BEGINTEXT ) { hb_retnl( (long) HPDF_Page_BeginText( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_EndText( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_EndText( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_ENDTEXT ) { hb_retnl( (long) HPDF_Page_EndText( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_TextOut( hPage, nX, nY, cText ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_TextOut( hPage, nX, nY, cText ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_TEXTOUT ) { hb_retnl( (long) HPDF_Page_TextOut( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), hb_parc( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_MoveTextPos( hPage, nX, nY ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_MoveTextPos( hPage, nX, nY ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_MOVETEXTPOS ) { hb_retnl( (long) HPDF_Page_MoveTextPos( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ShowText( hPage, cText ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ShowText( hPage, cText ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SHOWTEXT ) { hb_retnl( (long) HPDF_Page_ShowText( (HPDF_Page) hb_parptr( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Fill( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Fill( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_FILL ) { hb_retnl( (long) HPDF_Page_Fill( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Eofill( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Eofill( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_EOFILL ) { hb_retnl( (long) HPDF_Page_Eofill( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_FillStroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_FillStroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_FILLSTROKE ) { hb_retnl( (long) HPDF_Page_FillStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_EofillStroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_EofillStroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_EOFILLSTROKE ) { hb_retnl( (long) HPDF_Page_EofillStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ClosePathFillStroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ClosePathFillStroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CLOSEPATHFILLSTROKE ) { hb_retnl( (long) HPDF_Page_ClosePathFillStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ClosePathEofillStroke( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ClosePathEofillStroke( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CLOSEPATHEOFILLSTROKE ) { hb_retnl( (long) HPDF_Page_ClosePathEofillStroke( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_EndPath( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_EndPath( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_ENDPATH ) { hb_retnl( (long) HPDF_Page_EndPath( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Clip( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Clip( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CLIP ) { hb_retnl( (long) HPDF_Page_Clip( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Eoclip( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Eoclip( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_EOCLIP ) { hb_retnl( (long) HPDF_Page_Eoclip( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetCharSpace( hPage, nSpaceWidth ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetCharSpace( hPage, nSpaceWidth ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETCHARSPACE ) { hb_retnl( (long) HPDF_Page_SetCharSpace( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetWordSpace( hPage, nSpaceWidth ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetWordSpace( hPage, nSpaceWidth ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETWORDSPACE ) { hb_retnl( (long) HPDF_Page_SetWordSpace( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetHorizontalScalling( hPage, nHorzScale ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetHorizontalScalling( hPage, nHorzScale ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETHORIZONTALSCALLING ) { hb_retnl( (long) HPDF_Page_SetHorizontalScalling( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetTextLeading( hPage, nTextLeading ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetTextLeading( hPage, nTextLeading ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETTEXTLEADING ) { hb_retnl( (long) HPDF_Page_SetTextLeading( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetTextRenderingMode( hPage, nTextRenderingMode ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetTextRenderingMode( hPage, nTextRenderingMode ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETTEXTRENDERINGMODE ) { hb_retnl( (long) HPDF_Page_SetTextRenderingMode( (HPDF_Page) hb_parptr( 1 ), (HPDF_TextRenderingMode) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetTextRise( hPage, nTextRise ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetTextRise( hPage, nTextRise ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETTEXTRISE ) { hb_retnl( (long) HPDF_Page_SetTextRise( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_MoveTextPos2( hPage, nX, nY ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_MoveTextPos2( hPage, nX, nY ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_MOVETEXTPOS2 ) { hb_retnl( (long) HPDF_Page_MoveTextPos2( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetTextMatrix( hPage ) -> hStatus --------tobedone--------- -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetTextMatrix( hPage ) -> hStatus --------tobedone--------- +*/ HB_FUNC( HPDF_PAGE_SETTEXTMATRIX ) { hb_retnl( (long) HPDF_Page_SetTextMatrix( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ), (HPDF_REAL) hb_parnd( 6 ), (HPDF_REAL) hb_parnd( 7 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_MoveToNextLine( hPage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_MoveToNextLine( hPage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_MOVETONEXTLINE ) { hb_retnl( (long) HPDF_Page_MoveToNextLine( (HPDF_Page) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ShowTextNextLine( hPage, cText ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ShowTextNextLine( hPage, cText ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SHOWTEXTNEXTLINE ) { hb_retnl( (long) HPDF_Page_ShowTextNextLine( (HPDF_Page) hb_parptr( 1 ), hb_parc( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ShowTextNextLineEx( hPage, nWordSpace, nCharSpace, cText ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ShowTextNextLineEx( hPage, nWordSpace, nCharSpace, cText ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SHOWTEXTNEXTLINEEX ) { hb_retnl( (long) HPDF_Page_ShowTextNextLineEx( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), hb_parc( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetGrayFill( hPage, nGrayFill ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetGrayFill( hPage, nGrayFill ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETGRAYFILL ) { hb_retnl( (long) HPDF_Page_SetGrayFill( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetGrayStroke( hPage, nGrayStroke ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetGrayStroke( hPage, nGrayStroke ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETGRAYSTROKE ) { hb_retnl( (long) HPDF_Page_SetGrayStroke( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetRGBFill( hPage, nRGBRed, nRGBGreen, nRGBBlue ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetRGBFill( hPage, nRGBRed, nRGBGreen, nRGBBlue ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETRGBFILL ) { hb_retnl( (long) HPDF_Page_SetRGBFill( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetRGBStroke( hPage, nRGBRed, nRGBGreen, nRGBBlue ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetRGBStroke( hPage, nRGBRed, nRGBGreen, nRGBBlue ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETRGBSTROKE ) { hb_retnl( (long) HPDF_Page_SetRGBStroke( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetCMYKFill( hPage, nC, nM, nY, nK ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetCMYKFill( hPage, nC, nM, nY, nK ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETCMYKFILL ) { hb_retnl( (long) HPDF_Page_SetCMYKFill( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_SetCMYKStroke( hPage, nC, nM, nY, nK ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_SetCMYKStroke( hPage, nC, nM, nY, nK ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_SETCMYKSTROKE ) { hb_retnl( (long) HPDF_Page_SetCMYKStroke( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_ExecuteXObject( hPage, hImage ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_ExecuteXObject( hPage, hImage ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_EXECUTEXOBJECT ) { hb_retnl( (long) HPDF_Page_ExecuteXObject( (HPDF_Page) hb_parptr( 1 ), (HPDF_Image) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_DrawImage( hPage, hImage, nX, nY, nWidth, nHeight ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_DrawImage( hPage, hImage, nX, nY, nWidth, nHeight ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_DRAWIMAGE ) { hb_retnl( (long) HPDF_Page_DrawImage( (HPDF_Page) hb_parptr( 1 ), (HPDF_Image) hb_parptr( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ), (HPDF_REAL) hb_parnd( 6 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Circle( hPage, nX, nY, nRay ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Circle( hPage, nX, nY, nRay ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_CIRCLE ) { hb_retnl( (long) HPDF_Page_Circle( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Arc( hPage, nX, nY, nRay, nAngle1, nAngle2 ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Arc( hPage, nX, nY, nRay, nAngle1, nAngle2 ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_ARC ) { hb_retnl( (long) HPDF_Page_Arc( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ), (HPDF_REAL) hb_parnd( 6 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_Ellipse( hPage, nX, nY, nxRay, nyRay ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_Ellipse( hPage, nX, nY, nxRay, nyRay ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_ELLIPSE ) { hb_retnl( (long) HPDF_Page_Ellipse( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Page_TextRect( hPage, nLeft, nTop, nRight, nBottom, cText, nAlign ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Page_TextRect( hPage, nLeft, nTop, nRight, nBottom, cText, nAlign ) -> hStatus +*/ HB_FUNC( HPDF_PAGE_TEXTRECT ) { hb_retnl( (long) HPDF_Page_TextRect( (HPDF_Page) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ), hb_parc( 6 ), (HPDF_TextAlignment) hb_parni( 7 ), NULL ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// FONTS -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Font_GetFontName( hFont ) -> cFontName -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* FONTS */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetFontName( hFont ) -> cFontName +*/ HB_FUNC( HPDF_FONT_GETFONTNAME ) { hb_retc( HPDF_Font_GetFontName( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetEncodingName( hFont ) -> cEncoding -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetEncodingName( hFont ) -> cEncoding +*/ HB_FUNC( HPDF_FONT_GETENCODINGNAME ) { hb_retc( HPDF_Font_GetEncodingName( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetUnicodeWidth( hFont, hUnicode ) -> nCharWidth -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetUnicodeWidth( hFont, hUnicode ) -> nCharWidth +*/ HB_FUNC( HPDF_FONT_GETUNICODEWIDTH ) { hb_retnl( (long) HPDF_Font_GetUnicodeWidth( (HPDF_Font) hb_parptr( 1 ), (HPDF_UNICODE) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetBBox( hFont ) -> aRect -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetBBox( hFont ) -> aRect +*/ HB_FUNC( HPDF_FONT_GETBBOX ) { HPDF_Box rc; @@ -1495,37 +1488,37 @@ HB_FUNC( HPDF_FONT_GETBBOX ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetAscent( hFont ) -> nAscent -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetAscent( hFont ) -> nAscent +*/ HB_FUNC( HPDF_FONT_GETASCENT ) { hb_retni( (int) HPDF_Font_GetAscent( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetDescent( hFont ) -> nDescent -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetDescent( hFont ) -> nDescent +*/ HB_FUNC( HPDF_FONT_GETDESCENT ) { hb_retni( (int) HPDF_Font_GetDescent( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetXHeight( hFont ) -> nXHeight -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetXHeight( hFont ) -> nXHeight +*/ HB_FUNC( HPDF_FONT_GETXHEIGHT ) { hb_retnl( (long) HPDF_Font_GetXHeight( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_GetCapHeight( hFont ) -> nCapsHeight -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_GetCapHeight( hFont ) -> nCapsHeight +*/ HB_FUNC( HPDF_FONT_GETCAPHEIGHT ) { hb_retnl( (long) HPDF_Font_GetCapHeight( (HPDF_Font) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Font_TextWidth( hFont, cText, nWidth ) -> aTextWidth[ nNumChars, nNumWords, nWidth, nNumSpace ] -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_TextWidth( hFont, cText, nWidth ) -> aTextWidth[ nNumChars, nNumWords, nWidth, nNumSpace ] +*/ HB_FUNC( HPDF_FONT_TEXTWIDTH ) { HPDF_TextWidth tw; @@ -1540,9 +1533,9 @@ HB_FUNC( HPDF_FONT_TEXTWIDTH ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPDF_Font_MeasureText( hFont, cText, nTextLen, nWidth, nFontSize, nCharSpace, nWordSpace, lWordWrap ) -> nByteLengthTobeIncludedInWidth -// +/*----------------------------------------------------------------------*/ +/* HPDF_Font_MeasureText( hFont, cText, nTextLen, nWidth, nFontSize, nCharSpace, nWordSpace, lWordWrap ) -> nByteLengthTobeIncludedInWidth +*/ HB_FUNC( HPDF_FONT_MEASURETEXT ) { hb_retni( HPDF_Font_MeasureText( (HPDF_Font) hb_parptr( 1 ), @@ -1555,191 +1548,191 @@ HB_FUNC( HPDF_FONT_MEASURETEXT ) hb_parl( 8 ), NULL ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// ENCODING -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Encoder_GetType( hEncoder ) -> nEncoderType -// nEncoderType == -// HPDF_ENCODER_TYPE_SINGLE_BYTE 1 This encoder is an encoder for single byte characters. -// HPDF_ENCODER_TYPE_DOUBLE_BYTE 2 This encoder is an encoder for multi byte characters. -// HPDF_ENCODER_TYPE_UNINITIALIZED 3 This encoder is uninitialized. (May be it is an encoder for multi byte characters.) -// HPDF_ENCODER_UNKNOWN 4 Invalid encoder. -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* ENCODING */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Encoder_GetType( hEncoder ) -> nEncoderType + nEncoderType == + HPDF_ENCODER_TYPE_SINGLE_BYTE 1 This encoder is an encoder for single byte characters. + HPDF_ENCODER_TYPE_DOUBLE_BYTE 2 This encoder is an encoder for multi byte characters. + HPDF_ENCODER_TYPE_UNINITIALIZED 3 This encoder is uninitialized. (May be it is an encoder for multi byte characters.) + HPDF_ENCODER_UNKNOWN 4 Invalid encoder. +*/ HB_FUNC( HPDF_ENCODER_GETTYPE ) { hb_retni( (int) HPDF_Encoder_GetType( (HPDF_Encoder) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Encoder_GetByteType( hEncoder, cText, nIndex ) -> nByteType -// nByteType -// HPDF_BYTE_TYPE_SINGLE 1 Single byte character. -// HPDF_BYTE_TYPE_LEAD 2 Lead byte of a double-byte character. -// HPDF_BYTE_TYPE_TRIAL 3 Trailing byte of a double-byte character. -// HPDF_BYTE_TYPE_UNKNOWN 4 Invalid encoder or cannot judge the byte type. -// +/*----------------------------------------------------------------------*/ +/* HPDF_Encoder_GetByteType( hEncoder, cText, nIndex ) -> nByteType + nByteType + HPDF_BYTE_TYPE_SINGLE 1 Single byte character. + HPDF_BYTE_TYPE_LEAD 2 Lead byte of a double-byte character. + HPDF_BYTE_TYPE_TRIAL 3 Trailing byte of a double-byte character. + HPDF_BYTE_TYPE_UNKNOWN 4 Invalid encoder or cannot judge the byte type. +*/ HB_FUNC( HPDF_ENCODER_GETBYTETYPE ) { hb_retni( (int) HPDF_Encoder_GetByteType( (HPDF_Encoder) hb_parptr( 1 ), hb_parc( 2 ), hb_parni( 3 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Encoder_GetUnicode( hEncoder, nCode ) -> nUnicode -// +/*----------------------------------------------------------------------*/ +/* HPDF_Encoder_GetUnicode( hEncoder, nCode ) -> nUnicode +*/ HB_FUNC( HPDF_ENCODER_GETUNICODE ) { hb_retni( (int) HPDF_Encoder_GetUnicode( (HPDF_Encoder) hb_parptr( 1 ), hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Encoder_GetWritingMode( hEncoder ) -> nWriteMode -// nWriteMode == -// HPDF_WMODE_HORIZONTAL 1 horizontal writing mode. -// HPDF_WMODE_VERTICAL 2 vertical writing mode; -// +/*----------------------------------------------------------------------*/ +/* HPDF_Encoder_GetWritingMode( hEncoder ) -> nWriteMode + nWriteMode == + HPDF_WMODE_HORIZONTAL 1 horizontal writing mode. + HPDF_WMODE_VERTICAL 2 vertical writing mode; +*/ HB_FUNC( HPDF_ENCODER_GETWRITINGMODE ) { hb_retni( (int) HPDF_Encoder_GetWritingMode( (HPDF_Encoder) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// ANNOTATION -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_LinkAnnot_SetHighlightMode( hAnnot, nHilightMode ) -> hStatus -// nHilightMode == -// HPDF_ANNOT_NO_HIGHTLIGHT 1 No highlighting. -// HPDF_ANNOT_INVERT_BOX 2 Invert the contents of the area of annotation. -// HPDF_ANNOT_INVERT_BORDER 3 Invert the annotation’s border. -// HPDF_ANNOT_DOWN_APPEARANCE 4 Dent the annotation. -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* ANNOTATION */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_LinkAnnot_SetHighlightMode( hAnnot, nHilightMode ) -> hStatus + nHilightMode == + HPDF_ANNOT_NO_HIGHTLIGHT 1 No highlighting. + HPDF_ANNOT_INVERT_BOX 2 Invert the contents of the area of annotation. + HPDF_ANNOT_INVERT_BORDER 3 Invert the annotation’s border. + HPDF_ANNOT_DOWN_APPEARANCE 4 Dent the annotation. +*/ HB_FUNC( HPDF_LINKANNOT_SETHIGHLIGHTMODE ) { hb_retnl( (long) HPDF_LinkAnnot_SetHighlightMode( (HPDF_Annotation) hb_parptr( 1 ), (HPDF_AnnotHighlightMode) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_LinkAnnot_SetBorderStyle( hAnnot, nWidth, nDashOn, nDashOff ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_LinkAnnot_SetBorderStyle( hAnnot, nWidth, nDashOn, nDashOff ) -> hStatus +*/ HB_FUNC( HPDF_LINKANNOT_SETBORDERSTYLE ) { hb_retnl( (long) HPDF_LinkAnnot_SetBorderStyle( (HPDF_Annotation) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_TextAnnot_SetIcon( hAnnot, nIconID ) -> hStatus -// nIconID -// HPDF_ANNOT_ICON_COMMENT -// HPDF_ANNOT_ICON_KEY -// HPDF_ANNOT_ICON_NOTE -// HPDF_ANNOT_ICON_HELP -// HPDF_ANNOT_ICON_NEW_PARAGRAPH -// HPDF_ANNOT_ICON_PARAGRAPH -// HPDF_ANNOT_ICON_INSERT -// +/*----------------------------------------------------------------------*/ +/* HPDF_TextAnnot_SetIcon( hAnnot, nIconID ) -> hStatus + nIconID + HPDF_ANNOT_ICON_COMMENT + HPDF_ANNOT_ICON_KEY + HPDF_ANNOT_ICON_NOTE + HPDF_ANNOT_ICON_HELP + HPDF_ANNOT_ICON_NEW_PARAGRAPH + HPDF_ANNOT_ICON_PARAGRAPH + HPDF_ANNOT_ICON_INSERT +*/ HB_FUNC( HPDF_TEXTANNOT_SETICON ) { hb_retnl( (long) HPDF_TextAnnot_SetIcon( (HPDF_Annotation) hb_parptr( 1 ), (HPDF_AnnotIcon) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_TextAnnot_SetOpened( hAnnot, lOpened ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_TextAnnot_SetOpened( hAnnot, lOpened ) -> hStatus +*/ HB_FUNC( HPDF_TEXTANNOT_SETOPENED ) { hb_retnl( (long) HPDF_TextAnnot_SetOpened( (HPDF_Annotation) hb_parptr( 1 ), hb_parl( 2 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// OUTLINE -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Outline_SetOpened( hOutline, lShowOpened ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* OUTLINE */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Outline_SetOpened( hOutline, lShowOpened ) -> hStatus +*/ HB_FUNC( HPDF_OUTLINE_SETOPENED ) { hb_retnl( (long) HPDF_Outline_SetOpened( (HPDF_Outline) hb_parptr( 1 ), hb_parl( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Outline_SetDestination( hOutline, hDestn ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Outline_SetDestination( hOutline, hDestn ) -> hStatus +*/ HB_FUNC( HPDF_OUTLINE_SETDESTINATION ) { hb_retnl( (long) HPDF_Outline_SetDestination( (HPDF_Outline) hb_parptr( 1 ), (HPDF_Destination) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// DESTINATION -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Destination_SetXYZ( hDestn, nLeft, nTop, nZoom ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* DESTINATION */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetXYZ( hDestn, nLeft, nTop, nZoom ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETXYZ ) { hb_retnl( (long) HPDF_Destination_SetXYZ( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFit( hDestn ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFit( hDestn ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFIT ) { hb_retnl( (long) HPDF_Destination_SetFit( (HPDF_Destination) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitH( hDestn, nTop ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitH( hDestn, nTop ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITH ) { hb_retnl( (long) HPDF_Destination_SetFitH( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitV( hDestn, nLeft ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitV( hDestn, nLeft ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITV ) { hb_retnl( (long) HPDF_Destination_SetFitV( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitR( hDestn, nLeft, nBottom, nRight, nTop ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitR( hDestn, nLeft, nBottom, nRight, nTop ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITR ) { hb_retnl( (long) HPDF_Destination_SetFitR( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ), (HPDF_REAL) hb_parnd( 3 ), (HPDF_REAL) hb_parnd( 4 ), (HPDF_REAL) hb_parnd( 5 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitB( hDestn ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitB( hDestn ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITB ) { hb_retnl( (long) HPDF_Destination_SetFitB( (HPDF_Destination) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitBH( hDestn, nTop ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitBH( hDestn, nTop ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITBH ) { hb_retnl( (long) HPDF_Destination_SetFitBH( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Destination_SetFitBV( hDestn, nTop ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Destination_SetFitBV( hDestn, nTop ) -> hStatus +*/ HB_FUNC( HPDF_DESTINATION_SETFITBV ) { hb_retnl( (long) HPDF_Destination_SetFitBV( (HPDF_Destination) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// IMAGE -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_Image_GetSize( hImage ) -> aSize[ nW, nH ] -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* IMAGE */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_Image_GetSize( hImage ) -> aSize[ nW, nH ] +*/ HB_FUNC( HPDF_IMAGE_GETSIZE ) { HPDF_Point pt; @@ -1752,37 +1745,37 @@ HB_FUNC( HPDF_IMAGE_GETSIZE ) hb_itemReturnRelease( info ); } -//----------------------------------------------------------------------// -// HPDF_Image_GetWidth( hImage ) -> nWidth -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_GetWidth( hImage ) -> nWidth +*/ HB_FUNC( HPDF_IMAGE_GETWIDTH ) { hb_retni( HPDF_Image_GetWidth( (HPDF_Image) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Image_GetHeight( hImage ) -> nHeight -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_GetHeight( hImage ) -> nHeight +*/ HB_FUNC( HPDF_IMAGE_GETHEIGHT ) { hb_retni( HPDF_Image_GetHeight( (HPDF_Image) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Image_GetBitsPerComponent( hImage ) -> nBitsPerComponent -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_GetBitsPerComponent( hImage ) -> nBitsPerComponent +*/ HB_FUNC( HPDF_IMAGE_GETBITSPERCOMPONENT ) { hb_retni( HPDF_Image_GetBitsPerComponent( (HPDF_Image) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Image_GetColorSpace( hImage ) -> nColorSpace -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_GetColorSpace( hImage ) -> nColorSpace +*/ HB_FUNC( HPDF_IMAGE_GETCOLORSPACE ) { hb_retc( HPDF_Image_GetColorSpace( (HPDF_Image) hb_parptr( 1 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Image_SetColorMask( hImage, nRGB_R_Min, nRGB_R_Max, nRGB_G_Min, nRGB_G_Max, nRGB_B_Min, nRGB_B_Max ) -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_SetColorMask( hImage, nRGB_R_Min, nRGB_R_Max, nRGB_G_Min, nRGB_G_Max, nRGB_B_Min, nRGB_B_Max ) +*/ HB_FUNC( HPDF_IMAGE_SETCOLORMASK ) { hb_retnl( (long) HPDF_Image_SetColorMask( (HPDF_Image) hb_parptr( 1 ), @@ -1794,51 +1787,51 @@ HB_FUNC( HPDF_IMAGE_SETCOLORMASK ) hb_parni( 7 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_Image_SetMaskImage( hImage, hImageMask ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_Image_SetMaskImage( hImage, hImageMask ) -> hStatus +*/ HB_FUNC( HPDF_IMAGE_SETMASKIMAGE ) { hb_retnl( (long) HPDF_Image_SetMaskImage( (HPDF_Image) hb_parptr( 1 ), (HPDF_Image) hb_parptr( 2 ) ) ); } -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// ExtGState -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// HPDF_ExtGState_SetAlphaStroke( hGState, nValue ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* ExtGState */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* HPDF_ExtGState_SetAlphaStroke( hGState, nValue ) -> hStatus +*/ HB_FUNC( HPDF_EXTGSTATE_SETALPHASTROKE ) { hb_retnl( (long) HPDF_ExtGState_SetAlphaStroke( (HPDF_ExtGState) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_ExtGState_SetAlphaFill( hGState, nValue ) -> hStatus -// +/*----------------------------------------------------------------------*/ +/* HPDF_ExtGState_SetAlphaFill( hGState, nValue ) -> hStatus +*/ HB_FUNC( HPDF_EXTGSTATE_SETALPHAFILL ) { hb_retnl( (long) HPDF_ExtGState_SetAlphaFill( (HPDF_ExtGState) hb_parptr( 1 ), (HPDF_REAL) hb_parnd( 2 ) ) ); } -//----------------------------------------------------------------------// -// HPDF_ExtGState_SetBlendMode( hGState, nBlendMode ) -> hStatus -// nBlendMode == -// HPDF_BM_NORMAL -// HPDF_BM_MULTIPLY -// HPDF_BM_SCREEN -// HPDF_BM_OVERLAY -// HPDF_BM_DARKEN -// HPDF_BM_LIGHTEN -// HPDF_BM_COLOR_DODGE -// HPDF_BM_COLOR_BUM -// HPDF_BM_HARD_LIGHT -// HPDF_BM_SOFT_LIGHT -// HPDF_BM_DIFFERENCE -// HPDF_BM_EXCLUSHON -// +/*----------------------------------------------------------------------*/ +/* HPDF_ExtGState_SetBlendMode( hGState, nBlendMode ) -> hStatus + nBlendMode == + HPDF_BM_NORMAL + HPDF_BM_MULTIPLY + HPDF_BM_SCREEN + HPDF_BM_OVERLAY + HPDF_BM_DARKEN + HPDF_BM_LIGHTEN + HPDF_BM_COLOR_DODGE + HPDF_BM_COLOR_BUM + HPDF_BM_HARD_LIGHT + HPDF_BM_SOFT_LIGHT + HPDF_BM_DIFFERENCE + HPDF_BM_EXCLUSHON +*/ HB_FUNC( HPDF_EXTGSTATE_SETBLENDMODE ) { hb_retnl( (long) HPDF_ExtGState_SetBlendMode( (HPDF_ExtGState) hb_parptr( 1 ), (HPDF_BlendMode) hb_parni( 2 ) ) ); } -//----------------------------------------------------------------------// +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbw32/tprinter.c b/harbour/contrib/hbw32/tprinter.c index 3f2065bdc3..02ba92c02e 100644 --- a/harbour/contrib/hbw32/tprinter.c +++ b/harbour/contrib/hbw32/tprinter.c @@ -94,9 +94,9 @@ BOOL hb_PrinterExists( LPSTR pPrinterName ) if( !strchr( pPrinterName, HB_OS_PATH_LIST_SEP_CHR ) && !hb_isLegacyDevice( pPrinterName ) ) - { // Don't bother with test if '\' in string + { /* Don't bother with test if '\' in string */ if( hb_iswinnt() ) - { // Use EnumPrinter() here because much faster than OpenPrinter() + { /* Use EnumPrinter() here because much faster than OpenPrinter() */ EnumPrinters( Flags, NULL, 4, ( LPBYTE ) NULL, 0, &needed, &returned ); if( needed > 0 ) { @@ -151,7 +151,7 @@ BOOL hb_GetDefaultPrinter( char * pPrinterName, LPDWORD pdwBufferSize ) if( osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5 ) /* Windows 2000 or later */ { - typedef BOOL( WINAPI * DEFPRINTER ) ( LPSTR, LPDWORD ); // stops warnings + typedef BOOL( WINAPI * DEFPRINTER ) ( LPSTR, LPDWORD ); /* stops warnings */ DEFPRINTER fnGetDefaultPrinter; HMODULE hWinSpool = LoadLibrary( TEXT( "winspool.drv" ) ); @@ -349,7 +349,7 @@ LONG hb_PrintFileRaw( UCHAR * cPrinterName, UCHAR * cFileName, UCHAR * cDocName { if( printBuffer[nRead - 1] == 26 ) { - nRead--; // Skip the EOF() character + nRead--; /* Skip the EOF() character */ } WritePrinter( hPrinter, printBuffer, nRead, &nWritten ); } @@ -554,7 +554,7 @@ HB_FUNC( GETPRINTERS ) } else { - // Tony (ABC) 11/1/2005 1:40PM. + /* Tony (ABC) 11/1/2005 1:40PM. */ for( a = 0; a < returned; a++, pPrinterEnum++ ) { if( !bLocalPrintersOnly @@ -618,31 +618,33 @@ HB_FUNC( GETPRINTERS ) CloseHandle( hPrinter ); } } - // Tony (ABC) 11/1/2005 1:40PM. Old Code... Justo in case. -// hb_arrayNew( SubItems, 0 ); -// hb_itemPutC( File, pPrinterEnum->pPrinterName ); -// hb_itemPutC( Port, pPrinterEnum->pPortName ); + /* Tony (ABC) 11/1/2005 1:40PM. Old Code... Justo in case. */ +#if 0 + hb_arrayNew( SubItems, 0 ); + hb_itemPutC( File, pPrinterEnum->pPrinterName ); + hb_itemPutC( Port, pPrinterEnum->pPortName ); + + if ( pPrinterEnum->Attributes & PRINTER_ATTRIBUTE_LOCAL) + { + hb_itemPutC( Net,"LOCAL" ); + } + else + { + if ( pPrinterEnum->Attributes & PRINTER_ATTRIBUTE_NETWORK) + { + hb_itemPutC( Net,"NETWORK" ); + } + else + { + hb_itemPutC( Net, "ERROR" ); + } + } -// if ( pPrinterEnum->Attributes & PRINTER_ATTRIBUTE_LOCAL) -// { -// hb_itemPutC( Net,"LOCAL" ); -// } -// else -// { -// if ( pPrinterEnum->Attributes & PRINTER_ATTRIBUTE_NETWORK) -// { -// hb_itemPutC( Net,"NETWORK" ); -// } -// else -// { -// hb_itemPutC( Net, "ERROR" ); -// } -// } - -// hb_arrayAddForward( SubItems , File ) ; -// hb_arrayAddForward( SubItems , Port ) ; -// hb_arrayAddForward( SubItems, Net ) ; -// hb_arrayAddForward( ArrayPrinter , SubItems ); + hb_arrayAddForward( SubItems , File ) ; + hb_arrayAddForward( SubItems , Port ) ; + hb_arrayAddForward( SubItems, Net ) ; + hb_arrayAddForward( ArrayPrinter , SubItems ); +#endif } } } diff --git a/harbour/contrib/hbw32/w32_ole.c b/harbour/contrib/hbw32/w32_ole.c index 50abc3ec9a..f0b0ab938b 100644 --- a/harbour/contrib/hbw32/w32_ole.c +++ b/harbour/contrib/hbw32/w32_ole.c @@ -59,7 +59,7 @@ #include -#include "hbvmopt.h" // TOFIX +#include "hbvmopt.h" /* TOFIX */ #include "hbapi.h" #include "hbstack.h" #include "hbapierr.h" @@ -76,14 +76,14 @@ #include #ifndef __MINGW32__ - // Missing in Mingw V 2. - //#include + /* Missing in Mingw V 2. */ + /* #include */ #endif #include #ifdef __MINGW32__ - // Missing in oleauto.h + /* Missing in oleauto.h */ WINOLEAUTAPI VarR8FromDec(DECIMAL *pdecIn, DOUBLE *pdblOut); #endif @@ -119,7 +119,7 @@ static VARIANTARG s_OleVal; static BOOL s_bInit = FALSE; -// ----------------------------------------------------------------------- +/* ----------------------------------------------------------------------- */ #define EG_OLEEXECPTION 1001 #define HB_STRING_ALLOC( p, l ) hb_itemReSizeString( p, l ) @@ -131,10 +131,10 @@ static void hb_itemPushForward( PHB_ITEM pItem ) static void hb_vmRequestReset( void ) { - hb_stackSetActionRequest( 0 ); // TOFIX + hb_stackSetActionRequest( 0 ); /* TOFIX */ } -// ----------------------------------------------------------------------- +/* ----------------------------------------------------------------------- */ static EXCEPINFO excep; static DISPID lPropPut = DISPID_PROPERTYPUT; @@ -143,7 +143,7 @@ static UINT uArgErr; HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ); static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndices, VARTYPE vt ); -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_EXPORT BSTR hb_oleAnsiToSysString( const char * cString ) { int nConvertedLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, cString, -1, NULL, 0 ); @@ -161,7 +161,7 @@ HB_EXPORT BSTR hb_oleAnsiToSysString( const char * cString ) return NULL; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_EXPORT LPWSTR hb_oleAnsiToWide( LPSTR cString ) { int nConvertedLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, cString, -1, NULL, 0 ); @@ -199,7 +199,7 @@ static HB_GARBAGE_FUNC( hb_oleRelease ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( __HB_OLE_INIT ) { @@ -232,9 +232,9 @@ HB_FUNC( __HB_OLE_INIT ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ -HB_FUNC( ANSITOWIDE ) // ( cAnsiStr ) -> cWideStr +HB_FUNC( ANSITOWIDE ) /* ( cAnsiStr ) -> cWideStr */ { char *cString = hb_parc( 1 ); @@ -247,7 +247,7 @@ HB_FUNC( ANSITOWIDE ) // ( cAnsiStr ) -> cWideStr } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_EXPORT LPSTR hb_oleWideToAnsi( BSTR wString ) { int nConvertedLen = WideCharToMultiByte( CP_ACP, 0, wString, -1, NULL, 0, NULL, NULL ); @@ -262,14 +262,16 @@ HB_EXPORT LPSTR hb_oleWideToAnsi( BSTR wString ) hb_xfree( cString ); } - //wprintf( L"\nWide: '%s'\n", wString ); - //printf( "\nAnsi: '%s'\n", cString ); +#if 0 + wprintf( L"\nWide: '%s'\n", wString ); + printf( "\nAnsi: '%s'\n", cString ); +#endif return NULL; } -//---------------------------------------------------------------------------// -HB_FUNC( WIDETOANSI ) // ( cWideStr, nLen ) -> cAnsiStr +/* ----------------------------------------------------------------------- */ +HB_FUNC( WIDETOANSI ) /* ( cWideStr, nLen ) -> cAnsiStr */ { BSTR wString = ( BSTR ) hb_parc( 1 ); @@ -282,14 +284,14 @@ HB_FUNC( WIDETOANSI ) // ( cWideStr, nLen ) -> cAnsiStr } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) { BOOL bByRef; VARIANT mVariant; VARTYPE vt; SAFEARRAYBOUND rgsabound; - void *pSource;// = NULL; + void *pSource;/* = NULL;*/ unsigned long i; char *sString; @@ -306,7 +308,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) switch( hb_itemType( pItem ) ) { case HB_IT_NIL: - //pVariant->n1.n2.vt = VT_EMPTY; + /*pVariant->n1.n2.vt = VT_EMPTY;*/ break; case HB_IT_STRING: @@ -316,8 +318,8 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) sString = hb_itemGetCPtr( pItem ); - // Check for hidden signature of SafeArrayToArray(). - if( ( int ) ( pItem->item.asString.allocated - ulLen ) >= 5 && // TOFIX + /* Check for hidden signature of SafeArrayToArray(). */ + if( ( int ) ( pItem->item.asString.allocated - ulLen ) >= 5 && /* TOFIX */ sString[ ulLen ] == 0x7A && sString[ ulLen + 1 ] == 0x7B && sString[ ulLen + 2 ] == 0x7C && sString[ ulLen + 3 ] == 0x7D ) { vt = (VARTYPE) sString[ ulLen + 4 ]; @@ -329,14 +331,14 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) hb_itemPutCLConst( pItem, ( char * ) hb_oleAnsiToSysString( sString ), ulLen * 2 + 1 ); pVariant->n1.n2.vt = VT_BYREF | VT_BSTR; - pVariant->n1.n2.n3.pbstrVal = ( BSTR * ) &( pItem->item.asString.value ); // TOFIX - //wprintf( L"*** BYREF >%s<\n", *pVariant->n1.n2.n3.bstrVal ); + pVariant->n1.n2.n3.pbstrVal = ( BSTR * ) &( pItem->item.asString.value ); /* TOFIX */ + /*wprintf( L"*** BYREF >%s<\n", *pVariant->n1.n2.n3.bstrVal );*/ } else { pVariant->n1.n2.vt = VT_BSTR; pVariant->n1.n2.n3.bstrVal = hb_oleAnsiToSysString( sString ); - //wprintf( L"*** >%s<\n", pVariant->n1.n2.n3.bstrVal ); + /*wprintf( L"*** >%s<\n", pVariant->n1.n2.n3.bstrVal );*/ } break; } @@ -345,9 +347,9 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_BOOL; - pVariant->n1.n2.n3.pboolVal = ( short * ) &( pItem->item.asLogical.value ) ; // TOFIX + pVariant->n1.n2.n3.pboolVal = ( short * ) &( pItem->item.asLogical.value ) ; /* TOFIX */ *pVariant->n1.n2.n3.pboolVal = hb_itemGetL( pItem ) ? VARIANT_TRUE : VARIANT_FALSE; - //pItem->type = HB_IT_LONG; + /*pItem->type = HB_IT_LONG;*/ } else { @@ -361,7 +363,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_I2; - pVariant->n1.n2.n3.piVal = &( pItem->item.asInteger.value ) ; // TOFIX + pVariant->n1.n2.n3.piVal = &( pItem->item.asInteger.value ) ; /* TOFIX */ } else { @@ -373,7 +375,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_I4; - pVariant->n1.n2.n3.plVal = ( long * ) &( pItem->item.asInteger.value ) ; // TOFIX + pVariant->n1.n2.n3.plVal = ( long * ) &( pItem->item.asInteger.value ) ; /* TOFIX */ } else { @@ -387,7 +389,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_I4; - pVariant->n1.n2.n3.plVal = ( long * ) &( pItem->item.asLong.value ) ; // TOFIX + pVariant->n1.n2.n3.plVal = ( long * ) &( pItem->item.asLong.value ) ; /* TOFIX */ } else { @@ -398,7 +400,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_I8; - pVariant->n1.n2.n3.pllVal = &( pItem->item.asLong.value ) ; // TOFIX + pVariant->n1.n2.n3.pllVal = &( pItem->item.asLong.value ) ; /* TOFIX */ } else { @@ -412,7 +414,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) if( bByRef ) { pVariant->n1.n2.vt = VT_BYREF | VT_R8; - pVariant->n1.n2.n3.pdblVal = &( pItem->item.asDouble.value ) ; // TOFIX + pVariant->n1.n2.n3.pdblVal = &( pItem->item.asDouble.value ) ; /* TOFIX */ pItem->type = HB_IT_DOUBLE; } else @@ -454,7 +456,7 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) { if( hb_clsIsParent( hb_objGetClass( pItem ), "TOLEAUTO" ) ) { - IDispatch *pDisp;// = NULL; + IDispatch *pDisp;/* = NULL;*/ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_hObj ) ); hb_vmPush( pItem ); @@ -463,12 +465,12 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) pDisp = ( IDispatch * ) hb_parnl( -1 ); pDisp->lpVtbl->AddRef( pDisp ); - //HB_TRACE(HB_TR_INFO, ("Dispatch: in: %s(%i)%ld\n", pDisp, __FILE__, __LINE__)); + /*HB_TRACE(HB_TR_INFO, ("Dispatch: in: %s(%i)%ld\n", pDisp, __FILE__, __LINE__));*/ if( bByRef ) { pVariant->n1.n2.vt = ( VT_DISPATCH | VT_BYREF ); - // Hack!!! Using high 4 bytes of the union (llVal) + /* Hack!!! Using high 4 bytes of the union (llVal) */ *( ( IDispatch ** ) ( &pVariant->n1.n2.n3.lVal ) + 1 ) = pDisp; pVariant->n1.n2.n3.ppdispVal = ( IDispatch ** ) ( &pVariant->n1.n2.n3.lVal ) + 1; } @@ -478,22 +480,22 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) pVariant->n1.n2.n3.pdispVal = pDisp; } } - // MUST be before "VTWRAPPER" + /* MUST be before "VTWRAPPER" */ else if( hb_clsIsParent( hb_objGetClass( pItem ), "VTARRAYWRAPPER" ) ) { - // vt := oVTArray:vt + /* vt := oVTArray:vt */ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_vt ) ); hb_vmPush( pItem ); hb_vmSend( 0 ); vt = (VARTYPE) hb_parnl(-1); - // aArray := oVTArray:Value + /* aArray := oVTArray:Value */ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_Value ) ); hb_vmPush( pItem ); hb_vmSend( 0 ); - // Intentionally not using hb_itemCopy() or hb_itemForwardValue() + /* Intentionally not using hb_itemCopy() or hb_itemForwardValue() */ pItem = hb_stackReturnItem(); if( ( vt == VT_I1 || vt == VT_UI1 ) && HB_IS_STRING( pItem ) ) @@ -512,7 +514,7 @@ ItemToVariant_StringArray: if( bByRef ) { pVariant->n1.n2.vt = ( VT_ARRAY | VT_BYREF | vt ); - // Hack!!! Using high 4 bytes of the union (llVal) + /* Hack!!! Using high 4 bytes of the union (llVal) */ *( ( SAFEARRAY ** ) ( &pVariant->n1.n2.n3.lVal ) + 1 ) = parray; pVariant->n1.n2.n3.pparray = ( SAFEARRAY ** ) ( &pVariant->n1.n2.n3.lVal ) + 1; } @@ -535,14 +537,14 @@ ItemToVariant_StringArray: } else if( hb_clsIsParent( hb_objGetClass( pItem ), "VTWRAPPER" ) ) { - // vt := oVT:vt + /* vt := oVT:vt */ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_vt ) ); hb_vmPush( pItem ); hb_vmSend( 0 ); pVariant->n1.n2.vt = (VARTYPE) hb_parnl(-1); - //value := oVT:value + /* value := oVT:value */ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_Value ) ); hb_vmPush( pItem ); hb_vmSend( 0 ); @@ -554,7 +556,7 @@ ItemToVariant_StringArray: break; case ( VT_UNKNOWN | VT_BYREF ): - // Hack!!! Using high 4 bytes of the union (llVal) + /* Hack!!! Using high 4 bytes of the union (llVal) */ *( ( IUnknown ** ) ( &pVariant->n1.n2.n3.lVal ) + 1 ) = ( IUnknown * ) hb_parptr( -1 ); pVariant->n1.n2.n3.ppunkVal = ( IUnknown ** ) ( &pVariant->n1.n2.n3.lVal ) + 1; break; @@ -584,14 +586,14 @@ ItemToVariant_ProcessArray: rgsabound.cElements = hb_arrayLen( pItem ); rgsabound.lLbound = 0; - //HB_TRACE(HB_TR_INFO, ("ItemToVariant() Array len: %i type: %i ByRef: %i in: %s(%i) \n", rgsabound.cElements, vt, bByRef, __FILE__, __LINE__)); + /*HB_TRACE(HB_TR_INFO, ("ItemToVariant() Array len: %i type: %i ByRef: %i in: %s(%i) \n", rgsabound.cElements, vt, bByRef, __FILE__, __LINE__));*/ parray = SafeArrayCreate( vt, 1, &rgsabound ); if( bByRef ) { pVariant->n1.n2.vt = ( VT_ARRAY | VT_BYREF | vt ); - // Hack!!! Using high 4 bytes of the union (llVal) + /* Hack!!! Using high 4 bytes of the union (llVal) */ *( ( SAFEARRAY ** ) ( &pVariant->n1.n2.n3.lVal ) + 1 ) = parray; pVariant->n1.n2.n3.pparray = ( SAFEARRAY ** ) ( &pVariant->n1.n2.n3.lVal ) + 1; } @@ -613,17 +615,17 @@ ItemToVariant_ProcessArray: default: { - //HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", hb_itemType( pItem ), __FILE__, __LINE__)); + /*HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", hb_itemType( pItem ), __FILE__, __LINE__));*/ } } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static PHB_ITEM * GetParams( DISPPARAMS *pDispParams, int nOffset ) { VARIANTARG * pArgs = NULL; int n, nArgs, nArg; - //BOOL bByRef; + /*BOOL bByRef;*/ PHB_ITEM *aPrgParams = NULL; nArgs = hb_pcount() - nOffset; @@ -633,17 +635,17 @@ static PHB_ITEM * GetParams( DISPPARAMS *pDispParams, int nOffset ) pArgs = ( VARIANTARG * ) hb_xgrab( sizeof( VARIANTARG ) * nArgs ); aPrgParams = ( PHB_ITEM * ) hb_xgrab( sizeof( PHB_ITEM ) * nArgs ); - //printf( "Args: %i\n", nArgs ); + /*printf( "Args: %i\n", nArgs );*/ for( n = 0; n < nArgs; n++ ) { - // Parameters are processed in reversed order. + /* Parameters are processed in reversed order. */ nArg = nArgs - n; VariantInit( &( pArgs[ n ] ) ); aPrgParams[ n ] = hb_stackItemFromBase( nArg + nOffset ); - //HB_TRACE(HB_TR_INFO, ("N: %i Arg: %i Type: %i %i ByRef: %i\n", n, nArg, hb_itemType( pParam ), hb_itemType( aPrgParams[ n ] ), bByRef)); + /*HB_TRACE(HB_TR_INFO, ("N: %i Arg: %i Type: %i %i ByRef: %i\n", n, nArg, hb_itemType( pParam ), hb_itemType( aPrgParams[ n ] ), bByRef));*/ hb_oleItemToVariant( &( pArgs[ n ] ), aPrgParams[ n ] ); } @@ -657,13 +659,13 @@ static PHB_ITEM * GetParams( DISPPARAMS *pDispParams, int nOffset ) return aPrgParams; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) { if( pDispParams->cArgs > 0 ) { IDispatch *pDisp = NULL; - int n; //, nParam; + int n; /*, nParam;*/ char *sString; VARIANT *pVariant; PHB_ITEM pItem; @@ -682,9 +684,9 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) else bByRef = FALSE; - //nParam = pDispParams->cArgs - n; + /*nParam = pDispParams->cArgs - n;*/ - //HB_TRACE(HB_TR_INFO, ("*** N: %i, Param: %i Type: %i\n", n, nParam, pVariant->n1.n2.vt)); + /*HB_TRACE(HB_TR_INFO, ("*** N: %i, Param: %i Type: %i\n", n, nParam, pVariant->n1.n2.vt));*/ if( bByRef ) { @@ -702,7 +704,7 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) break; case VT_BYREF | VT_BOOL: - //( pItem )->type = HB_IT_LOGICAL; + /*( pItem )->type = HB_IT_LOGICAL;*/ hb_itemPutL( pItem, *pVariant->n1.n2.n3.pboolVal == VARIANT_FALSE ? FALSE : TRUE ); break; @@ -720,7 +722,7 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) { pDisp = *pVariant->n1.n2.n3.ppdispVal; } - // Intentionally fall through. + /* Intentionally fall through. */ case VT_DISPATCH: if( pVariant->n1.n2.vt == VT_DISPATCH ) @@ -750,10 +752,10 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) if( s_pSym_New && hb_itemType( s_pOleAuto ) ) { - // Implemented in :New() - //pDisp->lpVtbl->AddRef( pDisp ); + /* Implemented in :New() */ + /*pDisp->lpVtbl->AddRef( pDisp );*/ - //TOleAuto():New( nDispatch ) + /*TOleAuto():New( nDispatch )*/ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_New ) ); hb_itemPushForward( s_pOleAuto ); hb_vmPushLong( ( LONG ) pDisp ); @@ -857,7 +859,7 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndices, VARTYPE vt ) { long iFrom, iTo, iLen, i; @@ -884,7 +886,7 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice { rgIndices[ iDim - 1 ] = i; - //printf( " Sub: %i\n", i ); + /*printf( " Sub: %i\n", i );*/ pSubArray = SafeArrayToArray( parray, iDim - 1, rgIndices, vt ); hb_arraySetForward( pArray, i - iFrom + 1, pSubArray ); @@ -909,10 +911,10 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice { if( vt == VT_I1 || vt == VT_UI1 ) { - // Ugly hack, but needed to allocate our signature as hidden bytes! + /* Ugly hack, but needed to allocate our signature as hidden bytes! */ hb_itemPutC( pArray, NULL ); HB_STRING_ALLOC( pArray, ( ULONG )( iLen + 5 ) ); - pArray->item.asString.length = iLen; // TOFIX + pArray->item.asString.length = iLen; /* TOFIX */ sArray = hb_itemGetCPtr( pArray ); @@ -938,7 +940,7 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice if( vt != VT_VARIANT ) { - // Get cleared on VariantClear() - don't place out of loop! + /* Get cleared on VariantClear() - don't place out of loop! */ mElem.n1.n2.vt = vt; if( vt == VT_I1 || vt == VT_UI1 ) @@ -951,7 +953,7 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice if( SUCCEEDED( SafeArrayGetElement( parray, rgIndices, pTarget ) ) ) { - //HB_TRACE(HB_TR_INFO, ("Type: %p in: %s(%i)\n", mElem.n1.n2.vt, __FILE__, __LINE__)); + /*HB_TRACE(HB_TR_INFO, ("Type: %p in: %s(%i)\n", mElem.n1.n2.vt, __FILE__, __LINE__));*/ hb_oleVariantToItem( hb_arrayGetItemPtr( pArray, i - iFrom + 1 ), &mElem ); @@ -960,9 +962,9 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice } } - //HB_TRACE(HB_TR_INFO, ("Return len: %i\n", hb_arrayLen( pArray ))); + /*HB_TRACE(HB_TR_INFO, ("Return len: %i\n", hb_arrayLen( pArray )));*/ - // Wrap our array with VTArrayWrapper() class ( aArray := VTArrayWrapper( vt, aArray) ) + /* Wrap our array with VTArrayWrapper() class ( aArray := VTArrayWrapper( vt, aArray) ) */ if( HB_IS_ARRAY( pArray ) && vt != VT_VARIANT ) { PHB_ITEM pVT = hb_itemPutNL( hb_itemNew( NULL ), ( LONG ) vt ); @@ -981,17 +983,17 @@ static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndice return pArray; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) { PHB_ITEM pOleAuto; IUnknown *pUnk = NULL; IDispatch *pDisp = NULL; - SAFEARRAY *parray;// = NULL; + SAFEARRAY *parray;/* = NULL;*/ hb_itemClear( pItem ); - // Don't "optimize" (VT_ARRAY | VT_VARIANT) must not match! + /* Don't "optimize" (VT_ARRAY | VT_VARIANT) must not match! */ while( pVariant->n1.n2.vt == ( VT_BYREF | VT_VARIANT ) || pVariant->n1.n2.vt == VT_VARIANT || pVariant->n1.n2.vt == VT_BYREF ) pVariant = pVariant->n1.n2.n3.pvarVal; @@ -1025,7 +1027,7 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) case ( VT_UNKNOWN | VT_BYREF ): pUnk = *pVariant->n1.n2.n3.ppunkVal; - // Intentionally fall through + /* Intentionally fall through */ case VT_UNKNOWN: if( pVariant->n1.n2.vt == VT_UNKNOWN ) @@ -1036,12 +1038,12 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) IDispatch ** pDispPtr = &pDisp; pUnk->lpVtbl->QueryInterface( pUnk, HB_ID_REF( REFIID, IID_IDispatch ), ( void ** ) pDispPtr ); } - // Intentionally fall through + /* Intentionally fall through */ case ( VT_DISPATCH | VT_BYREF ): if( pVariant->n1.n2.vt == ( VT_DISPATCH | VT_BYREF ) ) pDisp = *pVariant->n1.n2.n3.ppdispVal; - // Intentionally fall through + /* Intentionally fall through */ case VT_DISPATCH: if( pVariant->n1.n2.vt == VT_DISPATCH ) @@ -1076,26 +1078,26 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) hb_vmPushNil(); hb_vmDo( 0 ); - // Safety! + /* Safety! */ hb_vmRequestReset(); hb_itemForwardValue( pOleAuto, hb_stackReturnItem() ); if( hb_itemType( pOleAuto ) ) { - //TOleAuto():New( nDispatch ) + /*TOleAuto():New( nDispatch )*/ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_New ) ); hb_itemPushForward( pOleAuto ); hb_vmPushLong( ( LONG ) pDisp ); hb_vmSend( 1 ); - // If retrieved from IUnknown than doubly added! + /* If retrieved from IUnknown than doubly added! */ if( pVariant->n1.n2.vt == VT_UNKNOWN || pVariant->n1.n2.vt == ( VT_UNKNOWN | VT_BYREF ) ) pDisp->lpVtbl->Release( pDisp ); hb_itemRelease( pOleAuto ); - // Safety! + /* Safety! */ hb_vmRequestReset(); if( pItem != hb_stackReturnItem() ) @@ -1103,58 +1105,58 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) } break; - case VT_I1 | VT_BYREF: // Byte + case VT_I1 | VT_BYREF: /* Byte */ case VT_UI1 | VT_BYREF: hb_itemPutNI( pItem, ( short ) *pVariant->n1.n2.n3.pbVal ); break; - case VT_I1: // Byte + case VT_I1: /* Byte */ case VT_UI1: hb_itemPutNI( pItem, ( short ) pVariant->n1.n2.n3.bVal ); break; - case VT_I2 | VT_BYREF: // Short (2 bytes) + case VT_I2 | VT_BYREF: /* Short (2 bytes) */ case VT_UI2 | VT_BYREF: hb_itemPutNI( pItem, ( short ) *pVariant->n1.n2.n3.piVal ); break; - case VT_I2: // Short (2 bytes) + case VT_I2: /* Short (2 bytes) */ case VT_UI2: hb_itemPutNI( pItem, ( short ) pVariant->n1.n2.n3.iVal ); break; - case VT_I4 | VT_BYREF: // Long (4 bytes) + case VT_I4 | VT_BYREF: /* Long (4 bytes) */ case VT_UI4 | VT_BYREF: case VT_INT | VT_BYREF: case VT_UINT | VT_BYREF: hb_itemPutNL( pItem, ( LONG ) *pVariant->n1.n2.n3.plVal ); break; - case VT_I4: // Long (4 bytes) + case VT_I4: /* Long (4 bytes) */ case VT_UI4: case VT_INT: case VT_UINT: hb_itemPutNL( pItem, ( LONG ) pVariant->n1.n2.n3.lVal ); break; - case VT_R4 | VT_BYREF: // Single + case VT_R4 | VT_BYREF: /* Single */ hb_itemPutND( pItem, *pVariant->n1.n2.n3.pfltVal ); break; - case VT_R4: // Single + case VT_R4: /* Single */ hb_itemPutND( pItem, pVariant->n1.n2.n3.fltVal ); break; - case VT_R8 | VT_BYREF: // Double + case VT_R8 | VT_BYREF: /* Double */ hb_itemPutND( pItem, *pVariant->n1.n2.n3.pdblVal ); break; - case VT_R8: // Double + case VT_R8: /* Double */ hb_itemPutND( pItem, pVariant->n1.n2.n3.dblVal ); break; - case VT_CY | VT_BYREF: // Currency - case VT_CY: // Currency + case VT_CY | VT_BYREF: /* Currency */ + case VT_CY: /* Currency */ { double tmp = 0; @@ -1167,8 +1169,8 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) break; } - case VT_DECIMAL | VT_BYREF: // Decimal - case VT_DECIMAL: // Decimal + case VT_DECIMAL | VT_BYREF: /* Decimal */ + case VT_DECIMAL: /* Decimal */ { double tmp = 0; @@ -1227,7 +1229,7 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) vt &= ~VT_ARRAY; vt &= ~VT_BYREF; - //HB_TRACE(HB_TR_INFO, ("Type: %p in: %s(%i)\n", vt, __FILE__, __LINE__)); + /*HB_TRACE(HB_TR_INFO, ("Type: %p in: %s(%i)\n", vt, __FILE__, __LINE__));*/ pArray = SafeArrayToArray( parray, iDims, rgIndices, vt ); @@ -1246,12 +1248,12 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) } } - //VariantClear( pVariant ); + /*VariantClear( pVariant );*/ return S_OK; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static void RetValue( void ) { hb_oleVariantToItem( hb_stackReturnItem(), &s_RetVal ); @@ -1282,7 +1284,7 @@ HB_FUNC( __OLEENUMSTOP ) pEnumVariant->lpVtbl->Release( pEnumVariant ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLESHOWEXCEPTION ) { if( ( LONG ) s_nOleError == DISP_E_EXCEPTION ) @@ -1303,27 +1305,27 @@ HB_FUNC( OLESHOWEXCEPTION ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLEEXCEPTIONSOURCE ) { if( ( LONG ) s_nOleError == DISP_E_EXCEPTION ) hb_retc_buffer( hb_oleWideToAnsi( excep.bstrSource ) ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLEEXCEPTIONDESCRIPTION ) { if( ( LONG ) s_nOleError == DISP_E_EXCEPTION ) hb_retc_buffer( hb_oleWideToAnsi( excep.bstrDescription ) ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLEERROR ) { hb_retnl( ( long ) s_nOleError ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static char * Ole2TxtError( void ) { switch( ( LONG ) s_nOleError ) @@ -1359,13 +1361,13 @@ static char * Ole2TxtError( void ) return "Unknown error"; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLE2TXTERROR ) { hb_retc( Ole2TxtError() ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( MESSAGEBOX ) { LPTSTR lpStr1 = HB_TCHAR_CONVTO( hb_parcx( 2 ) ); @@ -1377,13 +1379,13 @@ HB_FUNC( MESSAGEBOX ) HB_TCHAR_FREE( lpStr2 ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( CREATEOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] ) */ { BSTR bstrClassID; IID ClassID, iid; LPIID riid = ( LPIID ) &IID_IDispatch; - void *pDisp = NULL; // IDispatch + void *pDisp = NULL; /* IDispatch */ /* void * * used intentionally to inform compiler that there is no * strict-aliasing @@ -1397,7 +1399,7 @@ HB_FUNC( CREATEOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] ) */ SysFreeString( bstrClassID ); - //HB_TRACE(HB_TR_INFO, ("Result: %p\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("Result: %p\n", s_nOleError));*/ if( hb_pcount() == 2 ) { @@ -1415,22 +1417,22 @@ HB_FUNC( CREATEOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] ) */ if( SUCCEEDED( s_nOleError ) ) { - //HB_TRACE(HB_TR_INFO, ("Class: %i\n", ClassID)); + /*HB_TRACE(HB_TR_INFO, ("Class: %i\n", ClassID));*/ s_nOleError = CoCreateInstance( HB_ID_REF( REFCLSID, ClassID ), NULL, CLSCTX_SERVER, (REFIID) riid, &pDisp ); - //HB_TRACE(HB_TR_INFO, ("Result: %p\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("Result: %p\n", s_nOleError));*/ } hb_retnl( ( LONG ) pDisp ); } -//---------------------------------------------------------------------------// -HB_FUNC( GETOLEOBJECT ) // ( cOleName | cCLSID [, cIID ] ) +/* ----------------------------------------------------------------------- */ +HB_FUNC( GETOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] ) */ { BSTR bstrClassID; IID ClassID, iid; LPIID riid = ( LPIID ) &IID_IDispatch; IUnknown *pUnk = NULL; - void *pDisp = NULL; // IDispatch + void *pDisp = NULL; /* IDispatch */ /* void * * used intentionally to inform compiler that there is no * strict-aliasing @@ -1443,8 +1445,8 @@ HB_FUNC( GETOLEOBJECT ) // ( cOleName | cCLSID [, cIID ] ) else s_nOleError = CLSIDFromProgID( bstrClassID, ( LPCLSID ) &ClassID ); - //s_nOleError = ProgIDFromCLSID( &ClassID, &pOleStr ); - //wprintf( L"Result %i ProgID: '%s'\n", s_nOleError, pOleStr ); + /*s_nOleError = ProgIDFromCLSID( &ClassID, &pOleStr );*/ + /*wprintf( L"Result %i ProgID: '%s'\n", s_nOleError, pOleStr );*/ SysFreeString( bstrClassID ); @@ -1478,37 +1480,37 @@ HB_FUNC( GETOLEOBJECT ) // ( cOleName | cCLSID [, cIID ] ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLEADDREF ) /* ( hOleObject, szMethodName, uParams... ) */ { IDispatch *pDisp = ( IDispatch * ) hb_parnl( 1 ); - //HB_TRACE(HB_TR_INFO, ("OleAddRef( %p )\n", pDisp)); + /*HB_TRACE(HB_TR_INFO, ("OleAddRef( %p )\n", pDisp));*/ s_nOleError = pDisp->lpVtbl->AddRef( pDisp ); hb_retnl( s_nOleError ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( OLERELEASEOBJECT ) /* ( hOleObject, szMethodName, uParams... ) */ { IDispatch *pDisp = ( IDispatch * ) hb_parnl( 1 ); - //HB_TRACE(HB_TR_INFO, ("OleReleaseObject( %p )\n", pDisp)); + /*HB_TRACE(HB_TR_INFO, ("OleReleaseObject( %p )\n", pDisp));*/ s_nOleError = pDisp->lpVtbl->Release( pDisp ); hb_retnl( s_nOleError ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static HRESULT OleSetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDispParams ) { pDispParams->rgdispidNamedArgs = &lPropPut; pDispParams->cNamedArgs = 1; - // 1 Based!!! + /* 1 Based!!! */ if( ( ISBYREF( 1 ) ) || ISARRAY( 1 ) ) { memset( ( LPBYTE ) &excep, 0, sizeof( excep ) ); @@ -1519,7 +1521,7 @@ static HRESULT OleSetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDis LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUTREF, pDispParams, - NULL, // No return value + NULL, /* No return value */ &excep, &uArgErr ); @@ -1535,7 +1537,7 @@ static HRESULT OleSetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDis LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, pDispParams, - NULL, // No return value + NULL, /* No return value */ &excep, &uArgErr ); @@ -1545,7 +1547,7 @@ static HRESULT OleSetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDis return s_nOleError; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static HRESULT OleInvoke( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDispParams ) { memset( ( LPBYTE ) &excep, 0, sizeof( excep ) ); @@ -1563,7 +1565,7 @@ static HRESULT OleInvoke( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDispPara return s_nOleError; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static HRESULT OleGetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDispParams ) { memset( ( LPBYTE ) &excep, 0, sizeof( excep ) ); @@ -1578,17 +1580,17 @@ static HRESULT OleGetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDis &excep, &uArgErr ); - //HB_TRACE(HB_TR_INFO, ("OleGetValue: %p\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("OleGetValue: %p\n", s_nOleError));*/ return s_nOleError; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static HRESULT OleGetValue( IDispatch *pDisp ) { VariantClear( &s_RetVal ); - // Try to apply the requested message to the DEFAULT Property of the object if any. + /* Try to apply the requested message to the DEFAULT Property of the object if any. */ if( SUCCEEDED( OleGetProperty( pDisp, DISPID_VALUE, &s_EmptyDispParams ) ) && ( s_RetVal.n1.n2.vt == VT_DISPATCH || s_RetVal.n1.n2.vt == ( VT_DISPATCH | VT_BYREF ) ) ) { VariantCopy( &s_OleVal, &s_RetVal ); @@ -1600,7 +1602,7 @@ static HRESULT OleGetValue( IDispatch *pDisp ) return E_FAIL; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static void OleThrowError( void ) { PHB_ITEM pReturn; @@ -1619,7 +1621,7 @@ static void OleThrowError( void ) else sDescription = Ole2TxtError(); - //HB_TRACE(HB_TR_INFO, ("Desc: '%s'\n", sDescription)); + /*HB_TRACE(HB_TR_INFO, ("Desc: '%s'\n", sDescription));*/ pReturn = hb_errRT_SubstParams( hb_parcx( -1 ), EG_OLEEXECPTION, (ULONG) s_nOleError, sDescription, hb_itemGetSymbol( hb_stackBaseItem() )->szName ); @@ -1632,7 +1634,7 @@ static void OleThrowError( void ) hb_itemReturnRelease( pReturn ); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_OLEVALUE ) { if( hb_pcount() == 0 ) @@ -1648,7 +1650,7 @@ HB_FUNC( TOLEAUTO_OLEVALUE ) VariantClear( &s_RetVal ); OleGetProperty( pDisp, DISPID_VALUE, &s_EmptyDispParams ); - //HB_TRACE(HB_TR_INFO, ("GetDefault: %p\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("GetDefault: %p\n", s_nOleError));*/ if( SUCCEEDED( s_nOleError ) ) RetValue(); @@ -1657,7 +1659,7 @@ HB_FUNC( TOLEAUTO_OLEVALUE ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO__OLEVALUE ) { if( hb_pcount() >= 1 ) @@ -1677,7 +1679,7 @@ HB_FUNC( TOLEAUTO__OLEVALUE ) aPrgParams = GetParams( &DispParams, 0 ); OleSetProperty( pDisp, DISPID_VALUE, &DispParams ); - //HB_TRACE(HB_TR_INFO, ("SetDefault: %p\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("SetDefault: %p\n", s_nOleError));*/ FreeParams( &DispParams, aPrgParams ); @@ -1688,7 +1690,7 @@ HB_FUNC( TOLEAUTO__OLEVALUE ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_OLENEWENUMERATOR ) /* ( hOleObject, szMethodName, uParams... ) */ { @@ -1727,7 +1729,7 @@ HB_FUNC( TOLEAUTO_OLENEWENUMERATOR ) /* ( hOleObject, szMethodName, uParams... ) OleThrowError(); } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ static HRESULT OleGetID( IDispatch *pDisp, const char *szName, DISPID *pDispID, BOOL *pbSetFirst ) { BSTR bstrMessage; @@ -1746,7 +1748,7 @@ static HRESULT OleGetID( IDispatch *pDisp, const char *szName, DISPID *pDispID, bstrMessage = hb_oleAnsiToSysString( szName + 1 ); s_nOleError = pDisp->lpVtbl->GetIDsOfNames( pDisp, HB_ID_REF( REFIID, IID_NULL ), ( wchar_t ** ) &bstrMessage, 1, LOCALE_SYSTEM_DEFAULT, pDispID ); SysFreeString( bstrMessage ); - //HB_TRACE(HB_TR_INFO, ("1. ID of: '%s' -> %i Result: %p\n", hb_itemGetSymbol( hb_stackBaseItem() )->szName + 1, DispID, s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("1. ID of: '%s' -> %i Result: %p\n", hb_itemGetSymbol( hb_stackBaseItem() )->szName + 1, DispID, s_nOleError));*/ if( SUCCEEDED( s_nOleError ) ) { @@ -1759,17 +1761,17 @@ static HRESULT OleGetID( IDispatch *pDisp, const char *szName, DISPID *pDispID, if( FAILED( s_nOleError ) ) { - // Try again without removing the assign prefix (_). + /* Try again without removing the assign prefix (_). */ bstrMessage = hb_oleAnsiToSysString( szName ); s_nOleError = pDisp->lpVtbl->GetIDsOfNames( pDisp, HB_ID_REF( REFIID, IID_NULL ), ( wchar_t ** ) &bstrMessage, 1, 0, pDispID ); SysFreeString( bstrMessage ); - //HB_TRACE(HB_TR_INFO, ("2. ID of: '%s' -> %i Result: %p\n", szName, *pDispID, s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("2. ID of: '%s' -> %i Result: %p\n", szName, *pDispID, s_nOleError));*/ } return s_nOleError; } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_INVOKE ) { IDispatch *pDisp; @@ -1794,7 +1796,7 @@ HB_FUNC( TOLEAUTO_INVOKE ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_SET ) { IDispatch *pDisp; @@ -1818,7 +1820,7 @@ HB_FUNC( TOLEAUTO_SET ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_GET ) { IDispatch *pDisp; @@ -1842,7 +1844,7 @@ HB_FUNC( TOLEAUTO_GET ) } } -//---------------------------------------------------------------------------// +/* ----------------------------------------------------------------------- */ HB_FUNC( TOLEAUTO_ONERROR ) { IDispatch *pDisp; @@ -1851,7 +1853,7 @@ HB_FUNC( TOLEAUTO_ONERROR ) BOOL bSetFirst = FALSE, bTryDefault = TRUE; PHB_ITEM *aPrgParams = GetParams( &DispParams, 0 ); - //HB_TRACE(HB_TR_INFO, ("Class: '%s' Message: '%s', Params: %i Arg1: %i\n", hb_objGetClsName( hb_stackSelfItem() ), hb_itemGetSymbol( hb_stackBaseItem() )->szName, hb_pcount(), hb_parinfo(1))); + /*HB_TRACE(HB_TR_INFO, ("Class: '%s' Message: '%s', Params: %i Arg1: %i\n", hb_objGetClsName( hb_stackSelfItem() ), hb_itemGetSymbol( hb_stackBaseItem() )->szName, hb_pcount(), hb_parinfo(1)));*/ hb_vmPushSymbol( hb_dynsymSymbol( s_pSym_hObj ) ); hb_vmPush( hb_stackSelfItem() ); @@ -1869,7 +1871,7 @@ OleGetID: if( SUCCEEDED( OleSetProperty( pDisp, DispID, &DispParams ) ) ) hb_itemReturn( hb_stackItemFromBase( 1 ) ); - //HB_TRACE(HB_TR_INFO, ("FIRST OleSetProperty %i\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("FIRST OleSetProperty %i\n", s_nOleError));*/ } else s_nOleError = E_PENDING; @@ -1879,7 +1881,7 @@ OleGetID: if( SUCCEEDED( OleInvoke( pDisp, DispID, &DispParams ) ) ) RetValue(); - //HB_TRACE(HB_TR_INFO, ("OleInvoke %i\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("OleInvoke %i\n", s_nOleError));*/ } if( FAILED( s_nOleError ) ) @@ -1887,7 +1889,7 @@ OleGetID: if( SUCCEEDED( OleGetProperty( pDisp, DispID, &DispParams ) ) ) RetValue(); - //HB_TRACE(HB_TR_INFO, ("OleGetProperty(%i) %i\n", DispParams.cArgs, s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("OleGetProperty(%i) %i\n", DispParams.cArgs, s_nOleError));*/ } if( FAILED( s_nOleError ) && bSetFirst == FALSE && hb_pcount() >= 1 ) @@ -1895,13 +1897,13 @@ OleGetID: if( SUCCEEDED( OleSetProperty( pDisp, DispID, &DispParams ) ) ) hb_itemReturn( hb_stackItemFromBase( 1 ) ); - //HB_TRACE(HB_TR_INFO, ("OleSetProperty %i\n", s_nOleError)); + /*HB_TRACE(HB_TR_INFO, ("OleSetProperty %i\n", s_nOleError));*/ } } if( SUCCEEDED( s_nOleError ) ) { - //HB_TRACE(HB_TR_INFO, ("Invoke Succeeded!\n")); + /*HB_TRACE(HB_TR_INFO, ("Invoke Succeeded!\n"));*/ if( HB_IS_OBJECT( hb_stackReturnItem() ) && hb_clsIsParent( hb_objGetClass( hb_stackReturnItem() ), "TOLEAUTO" ) ) { PHB_ITEM pReturn = hb_itemNew( NULL ); @@ -1924,7 +1926,7 @@ OleGetID: sOleClassName[ iClassNameLen ] = ':'; hb_strncpy( sOleClassName + iClassNameLen + 1, hb_itemGetSymbol( hb_stackBaseItem() )->szName, iMsgNameLen ); - //HB_TRACE(HB_TR_INFO, ("Class: '%s'\n", sOleClassName)); + /*HB_TRACE(HB_TR_INFO, ("Class: '%s'\n", sOleClassName));*/ hb_itemPutCLPtr( pOleClassName, sOleClassName, iClassNameLen + 1 + iMsgNameLen ); @@ -1941,26 +1943,26 @@ OleGetID: } else { - // Try to apply the requested message to the DEFAULT Method of the object if any. + /* Try to apply the requested message to the DEFAULT Method of the object if any. */ if( bTryDefault ) { if( SUCCEEDED( ( /* s_nOleError = */ OleGetValue( pDisp ) ) ) ) { bTryDefault = FALSE; - //HB_TRACE(HB_TR_INFO, ("Try using DISPID_VALUE\n")); + /*HB_TRACE(HB_TR_INFO, ("Try using DISPID_VALUE\n"));*/ pDisp = s_OleVal.n1.n2.n3.pdispVal; goto OleGetID; } } - //HB_TRACE(HB_TR_INFO, ("Invoke Failed!\n")); + /*HB_TRACE(HB_TR_INFO, ("Invoke Failed!\n"));*/ OleThrowError(); } FreeParams( &DispParams, aPrgParams ); - // We are responsible to release the Default Interface which we retrieved + /* We are responsible to release the Default Interface which we retrieved */ if( bTryDefault == FALSE && pDisp ) pDisp->lpVtbl->Release( pDisp ); } diff --git a/harbour/contrib/hbw32/w32_prn.c b/harbour/contrib/hbw32/w32_prn.c index 146bd105a7..e35a99a2a3 100644 --- a/harbour/contrib/hbw32/w32_prn.c +++ b/harbour/contrib/hbw32/w32_prn.c @@ -201,7 +201,7 @@ HB_FUNC( WIN32_DELETEDC ) * phDC = NULL; } - hb_retni( 0 ); // Return zero as a new handle even if fails + hb_retni( 0 ); /* Return zero as a new handle even if fails */ } HB_FUNC( WIN32_STARTPAGE ) @@ -263,8 +263,8 @@ HB_FUNC( WIN32_TEXTOUT ) } else if( TextOut( hDC, iRow, iCol, lpData, iLen ) ) { - GetTextExtentPoint32( hDC, lpData, iLen, &sSize ); // Get the length of the text in device size - Result = ( LONG ) sSize.cx; // return the width so we can update the current pen position (::PosY) + GetTextExtentPoint32( hDC, lpData, iLen, &sSize ); /* Get the length of the text in device size */ + Result = ( LONG ) sSize.cx; /* return the width so we can update the current pen position (::PosY) */ } HB_TCHAR_FREE( lpData ); @@ -291,12 +291,12 @@ HB_FUNC( WIN32_GETTEXTSIZE ) lpData = HB_TCHAR_CONVNTO( hb_parc( 2 ), iLen ); - GetTextExtentPoint32( hDC, lpData, iLen, &sSize ); // Get the length of the text in device size + GetTextExtentPoint32( hDC, lpData, iLen, &sSize ); /* Get the length of the text in device size */ if( ISLOG( 4 ) && !hb_parl( 4 ) ) - Result = ( LONG ) sSize.cy; // return the height + Result = ( LONG ) sSize.cy; /* return the height */ else - Result = ( LONG ) sSize.cx; // return the width + Result = ( LONG ) sSize.cx; /* return the width */ HB_TCHAR_FREE( lpData ); } @@ -364,7 +364,7 @@ HB_FUNC( WIN32_CREATEFONT ) if( iDiv ) iWidth = MulDiv( abs( iMul ), GetDeviceCaps( hDC, LOGPIXELSX ), abs( iDiv ) ); else - iWidth = 0; // Use the default font width + iWidth = 0; /* Use the default font width */ hFont = CreateFont( iHeight, iWidth, 0, 0, iWeight, dwItalic, dwUnderLine, 0, dwCharSet, OUT_DEVICE_PRECIS, CLIP_DEFAULT_PRECIS, DRAFT_QUALITY, @@ -431,7 +431,7 @@ HB_FUNC( WIN32_SETDOCUMENTPROPERTIES ) { DocumentProperties( 0, hPrinter, lpPrinterName, pDevMode, pDevMode, DM_OUT_BUFFER ); - if( ISNUM( 3 ) && hb_parnl( 3 ) ) // 22/02/2007 don't change if 0 + if( ISNUM( 3 ) && hb_parnl( 3 ) ) /* 22/02/2007 don't change if 0 */ pDevMode->dmPaperSize = ( short ) hb_parnl( 3 ); if( ISLOG( 4 ) ) @@ -440,13 +440,13 @@ HB_FUNC( WIN32_SETDOCUMENTPROPERTIES ) if( ISNUM( 5 ) && hb_parnl( 5 ) > 0 ) pDevMode->dmCopies = ( short ) hb_parnl( 5 ); - if( ISNUM( 6 ) && hb_parnl( 6 ) ) // 22/02/2007 don't change if 0 + if( ISNUM( 6 ) && hb_parnl( 6 ) ) /* 22/02/2007 don't change if 0 */ pDevMode->dmDefaultSource = ( short ) hb_parnl( 6 ); - if( ISNUM( 7 ) && hb_parnl( 7 ) ) // 22/02/2007 don't change if 0 + if( ISNUM( 7 ) && hb_parnl( 7 ) ) /* 22/02/2007 don't change if 0 */ pDevMode->dmDuplex = ( short ) hb_parnl( 7 ); - if( ISNUM( 8 ) && hb_parnl( 8 ) ) // 22/02/2007 don't change if 0 + if( ISNUM( 8 ) && hb_parnl( 8 ) ) /* 22/02/2007 don't change if 0 */ pDevMode->dmPrintQuality = ( short ) hb_parnl( 8 ); Result = ( ResetDC( hDC, pDevMode ) != NULL ); @@ -465,7 +465,7 @@ HB_FUNC( WIN32_SETDOCUMENTPROPERTIES ) hb_retl( Result ); } -// Functions for Loading & Printing bitmaps +/* Functions for Loading & Printing bitmaps */ HB_FUNC( WIN32_LOADBITMAPFILE ) { @@ -482,14 +482,14 @@ HB_FUNC( WIN32_LOADBITMAPFILE ) { dwFileSize = GetFileSize( hFile, &dwHighSize ); - if( ( dwFileSize != INVALID_FILE_SIZE ) && !dwHighSize ) // Do not continue if File size error or TOO big for memory + if( ( dwFileSize != INVALID_FILE_SIZE ) && !dwHighSize ) /* Do not continue if File size error or TOO big for memory */ { pbmfh = ( BITMAPFILEHEADER * ) hb_xgrab( dwFileSize ); if( pbmfh ) { bSuccess = ReadFile( hFile, pbmfh, dwFileSize, &dwBytesRead, NULL ); - bSuccess = bSuccess && ( dwBytesRead == dwFileSize ) && ( pbmfh->bfType == *( WORD * ) "BM" ); //&& (pbmfh->bfSize == dwFileSize) ; + bSuccess = bSuccess && ( dwBytesRead == dwFileSize ) && ( pbmfh->bfType == *( WORD * ) "BM" ); /*&& (pbmfh->bfSize == dwFileSize) ;*/ } } @@ -498,7 +498,7 @@ HB_FUNC( WIN32_LOADBITMAPFILE ) if( bSuccess ) { - hb_retclen( ( char * ) pbmfh, dwFileSize ); // hb_retclenAdoptRaw + hb_retclen( ( char * ) pbmfh, dwFileSize ); /* hb_retclenAdoptRaw */ if( pbmfh ) hb_xfree( pbmfh ); @@ -524,7 +524,7 @@ HB_FUNC( WIN32_DRAWBITMAP ) pBits = ( BYTE * ) pbmfh + pbmfh->bfOffBits; if( pbmi->bmiHeader.biSize == sizeof( BITMAPCOREHEADER ) ) - { // Remember there are 2 types of BitMap File + { /* Remember there are 2 types of BitMap File */ cxDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcWidth; cyDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcHeight; } @@ -604,9 +604,9 @@ HB_FUNC( WIN32_SETPEN ) void ** phPEN = ( void ** ) hb_gcAlloc( sizeof( HPEN * ), win32_HPEN_release ); - * phPEN = ( void * ) CreatePen( hb_parni( 2 ), // pen style - hb_parni( 3 ), // pen width - ( COLORREF ) hb_parnl( 4 ) // pen color + * phPEN = ( void * ) CreatePen( hb_parni( 2 ), /* pen style */ + hb_parni( 3 ), /* pen width */ + ( COLORREF ) hb_parnl( 4 ) /* pen color */ ); hOldPen = ( HPEN ) SelectObject( hDC, ( HPEN ) * phPEN ); diff --git a/harbour/contrib/hbziparch/hbziparc.c b/harbour/contrib/hbziparch/hbziparc.c index 91f92d8a5d..dae38206d4 100644 --- a/harbour/contrib/hbziparch/hbziparc.c +++ b/harbour/contrib/hbziparch/hbziparc.c @@ -1105,7 +1105,7 @@ HB_FUNC( HB_UNZIPFILE ) } else { -//s.r. change "*.*" to "*" because file without extension were ignored + /* s.r. change "*.*" to "*" because file without extension were ignored */ UnzipCreateArray( (char*) "*", 1 ); } diff --git a/harbour/contrib/hbziparch/hbzipnew.cpp b/harbour/contrib/hbziparch/hbzipnew.cpp index 5a16f7773a..3616c92d4b 100644 --- a/harbour/contrib/hbziparch/hbzipnew.cpp +++ b/harbour/contrib/hbziparch/hbzipnew.cpp @@ -142,8 +142,8 @@ static int hb_CheckSpanMode( char * szFile ) try { -// s.r. to avoid GPF when ZIP file is read only ! -// szZip.Open( szFile, CZipArchive::zipOpen, 0 ); +/* s.r. to avoid GPF when ZIP file is read only ! */ +/* szZip.Open( szFile, CZipArchive::zipOpen, 0 ); */ szZip.Open( szFile, hbza_pZipI.iReadOnly ? CZipArchive::zipOpenReadOnly : CZipArchive::zipOpen, 0 ); } catch( CZipException &e ) @@ -637,7 +637,7 @@ int hb_DeleteSel( char *szFile, PHB_ITEM pArray, BOOL bCase ) case -1: case -2: -// default: +/* default: */ iReturn = false; } } @@ -766,12 +766,12 @@ int hb_UnzipSel( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPassWord /* TODO: They're both the same.... */ if( !HB_IS_BLOCK( pProgress ) ) { -// szZip.SetPassword( szPassWord ); +/* szZip.SetPassword( szPassWord ); */ szZip.ExtractFile( ( WORD ) ulCount, ( LPCTSTR ) szPath, bWithPath, NULL, 65536 ); } else { -// szZip.SetPassword( szPassWord ); +/* szZip.SetPassword( szPassWord ); */ szZip.ExtractFile( ( WORD )ulCount, ( LPCTSTR )szPath, bWithPath, NULL, 65536 ); } } @@ -953,12 +953,12 @@ int hb_UnzipSelIndex( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPas /* TODO: They're both the same.... */ if( !HB_IS_BLOCK( pProgress ) ) { -// szZip.SetPassword( szPassWord ); +/* szZip.SetPassword( szPassWord ); */ szZip.ExtractFile( ( WORD )ulCount, ( LPCTSTR )szPath, bWithPath, NULL, 65536 ); } else { -// szZip.SetPassword( szPassWord ); +/* szZip.SetPassword( szPassWord ); */ szZip.ExtractFile( ( WORD )ulCount, ( LPCTSTR )szPath, bWithPath, NULL, 65536 ); } } @@ -997,7 +997,7 @@ BOOL hb_TransferFilesFromzip( char *szSource, char *szDest, PHB_ITEM pArray ) case -1: case -2: -// default: +/* default: */ bReturn = FALSE; } } @@ -1014,7 +1014,7 @@ BOOL hb_TransferFilesFromzip( char *szSource, char *szDest, PHB_ITEM pArray ) case -1: case -2: -// default: +/* default: */ bReturn1 = FALSE; } } @@ -1046,7 +1046,7 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch { bool iReturn = true; uLong uiCount = 0; -// int iCause = 0; +/* int iCause = 0; */ int iMode; CZipArchive szZip; BOOL bChange = FALSE; @@ -1094,7 +1094,7 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch catch( CZipException &e ) { HB_SYMBOL_UNUSED( e ); - // iCause = e.m_iCause; + /* iCause = e.m_iCause; */ } if( iReturn ) @@ -1159,13 +1159,13 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch { szZip.CloseFile( NULL, true ); HB_SYMBOL_UNUSED( e ); - // iCause = e.m_iCause; + /* iCause = e.m_iCause; */ } if( bChange ) { bChange = FALSE; -// szPath = NULL; +/* szPath = NULL; */ } } } @@ -1323,7 +1323,7 @@ int hb_CmpTdSpan( char *szFile, PHB_ITEM pArray, int iCompLevel, PHB_ITEM pBlock catch( ... ) {} - //if( ! bReturn ) + /*if( ! bReturn )*/ { if( szPassWord != NULL ) szZip.SetPassword( szPassWord ); diff --git a/harbour/contrib/xhb/hbcrypt.c b/harbour/contrib/xhb/hbcrypt.c index cf3b89bbf5..60ac70050e 100644 --- a/harbour/contrib/xhb/hbcrypt.c +++ b/harbour/contrib/xhb/hbcrypt.c @@ -90,9 +90,9 @@ void nxs_crypt( keylen = NXS_MAX_KEYLEN; } - // debug - //memcpy( cipher, source, srclen ); - // end debug +#ifdef DEBUG_0 + memcpy( cipher, source, srclen ); +#endif /* pass one: scramble the source using the key */ nxs_scramble( source, srclen, key, keylen, cipher ); @@ -157,9 +157,6 @@ void nxs_scramble( len = (srclen / keylen) * keylen; nxs_partial_scramble( source, cipher, scramble, len, keylen ); - // last pos was not done. - //memcpy( cipher +len , source + len , srclen - len ); - keylen = srclen - len; nxs_make_scramble( scramble, key, keylen ); nxs_partial_scramble( source + len, cipher + len, scramble, keylen, keylen ); @@ -288,7 +285,7 @@ void nxs_xordecode( USHORT keypos = 0; BYTE c_bitrest, c_bitleft; - // A very short block? + /* A very short block? */ if ( keylen > cipherlen - pos ) { keylen = ( USHORT ) ( cipherlen - pos); @@ -310,7 +307,7 @@ void nxs_xordecode( if (keypos == (USHORT) keylen ) { keypos = 0; - // last block + /* last block */ if ( keylen > cipherlen - pos ) { keylen = ( USHORT ) (cipherlen - pos); diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 1bd6eafa8a..c95bfcea59 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -2531,19 +2531,19 @@ HB_EXPORT HB_FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, HB_TRACE(HB_TR_DEBUG, ("hb_fsExtOpen(%s, %s, %hu, %p, %p)", pFilename, pDefExt, uiExFlags, pPaths, pError)); -/* - #define FXO_TRUNCATE 0x0100 // Create (truncate if exists) - #define FXO_APPEND 0x0200 // Create (append if exists) - #define FXO_UNIQUE 0x0400 // Create unique file FO_EXCL ??? - #define FXO_FORCEEXT 0x0800 // Force default extension - #define FXO_DEFAULTS 0x1000 // Use SET command defaults - #define FXO_DEVICERAW 0x2000 // Open devices in raw mode - // xHarbour extension - #define FXO_SHARELOCK 0x4000 // emulate DOS SH_DENY* mode in POSIX OS - #define FXO_COPYNAME 0x8000 // copy final szPath into pFilename +#if 0 + #define FXO_TRUNCATE 0x0100 /* Create (truncate if exists) */ + #define FXO_APPEND 0x0200 /* Create (append if exists) */ + #define FXO_UNIQUE 0x0400 /* Create unique file FO_EXCL ??? */ + #define FXO_FORCEEXT 0x0800 /* Force default extension */ + #define FXO_DEFAULTS 0x1000 /* Use SET command defaults */ + #define FXO_DEVICERAW 0x2000 /* Open devices in raw mode */ + /* xHarbour extension */ + #define FXO_SHARELOCK 0x4000 /* emulate DOS SH_DENY* mode in POSIX OS */ + #define FXO_COPYNAME 0x8000 /* copy final szPath into pFilename */ hb_errGetFileName( pError ); -*/ +#endif szPath = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 ); diff --git a/harbour/utils/hbtest/rt_miscc.c b/harbour/utils/hbtest/rt_miscc.c index 029616be40..7aa7255046 100644 --- a/harbour/utils/hbtest/rt_miscc.c +++ b/harbour/utils/hbtest/rt_miscc.c @@ -67,7 +67,7 @@ RT_FUNDEF( R_PASSENLC ) CLIPPER HB_STOD( void ) { - // The length check is a fix to avoid buggy behaviour of _retds() + /* The length check is a fix to avoid buggy behaviour of _retds() */ _retds( ( ISCHAR( 1 ) && _parclen( 1 ) == 8 ) ? _parc( 1 ) : " " ); }