From 2e33010e8a112b5e40100592689f00b911a545c4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Mar 2009 10:49:21 +0000 Subject: [PATCH] 2009-03-25 11:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * tests/testhtml.prg * Update by Vailton Renato applied. * INSTALL * Minor formatting. * bin/postinst.bat + Minor cleanup to creation of hbrun/hbtest dll versions. (now it's more difficult to mislead it by already existing foreign .dlls) * contrib/hbqt/Makefile * contrib/hbapollo/Makefile - Disabled for mingw64. * contrib/rddads/rddads.h + Added workaround to compile under mingw64. * contrib/gtwvg/gtwvg.h * contrib/gtwvg/wvggui.h ! Fixed to _not_ override _WIN32_IE. Overriding these version numbers is generally a very bad idea. Instead the code should adapt to whatever values are defined by system headers. This fixes most mingw64 errors. Please test other compilers. * contrib/xhb/hbxml.c * contrib/hbfimage/fi_winfu.c * contrib/hbwin/wapi_commctrl.c ! Pointer/handle to integer conversion. * contrib/gtwvg/wvgcuig.c * contrib/gtwvg/wvgwin.c ! Fixed NULL used instead of 0. ! Fixed ISNIL() usage. GTWVG code is full of ISNIL() macros, which makes the code prone to GPFs and other unexpected behaviour when wrong type is passed. The solution is to change all these to type specific IS*() macros. ; TOFIX: (core and all contribs) C:/DOCUME~1/vszakats/LOCALS~1/Temp/ccVcE53g.s: Assembler messages: C:/DOCUME~1/vszakats/LOCALS~1/Temp/ccVcE53g.s:20: Error: `0x0e10(%rax,%ecx,4)' is not a valid base/index expression In these files: x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hvm.c -ohvm.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../arrays.c -oarrays.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../asort.c -oasort.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../classes.c -oclasses.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../cmdarg.c -ocmdarg.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../debug.c -odebug.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../dynlibhb.c -odynlibhb.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../dynsym.c -odynsym.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../codebloc.c -ocodebloc.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../estack.c -oestack.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../eval.c -oeval.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../evalhb.c -oevalhb.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../extend.c -oextend.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../fm.c -ofm.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../garbage.c -ogarbage.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hashes.c -ohashes.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hashfunc.c -ohashfunc.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../itemapi.c -oitemapi.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../macro.c -omacro.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../memvars.c -omemvars.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../pcount.c -opcount.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../proc.c -oproc.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../pvalue.c -opvalue.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../runner.c -orunner.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../set.c -oset.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../thread.c -othread.o x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_FM_STATISTICS -DHB_MT_VM -c ../../../fm.c -ofm.o ../../dbfntx1.c: In function 'hb_ntxTagHeaderCheck': ../../dbfntx1.c:1054: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfntx1.c:1054: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c: In function 'hb_nsxTagHeaderCheck': ../../dbfnsx1.c:1282: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1284: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c: In function 'hb_nsxPageFree': ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c: In function 'hb_nsxPageNew': ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules ../../hb_btree.c: In function 'StackSkip': ../../hb_btree.c:643: warning: cast from pointer to integer of different size ../../hb_btree.c: In function 'Grow': ../../hb_btree.c:739: warning: cast from pointer to integer of different size ../../getenvrn.c: In function 'HB_FUN_FT_GETE': ../../getenvrn.c:178: warning: implicit declaration of function 'GetEnvironmentStrings' ../../getenvrn.c:178: warning: initialization makes pointer from integer without a cast ../../win_dll.c: In function 'DllExec': ../../win_dll.c:509: warning: cast from pointer to integer of different size ../../win_dll.c:603: warning: cast to pointer from integer of different size ../../win_dll.c:672: warning: cast to pointer from integer of different size ../../win_dll.c:689: warning: cast to pointer from integer of different size ../../hbserv.c: In function 's_serviceSetHBSig': ../../hbserv.c:638: warning: passing argument 1 of 'SetUnhandledExceptionFilter' from incompatible pointer type ../../firebird.c: In function 'HB_FUN_FBCREATEDB': ../../firebird.c:87: warning: initialization makes integer from pointer without a cast ../../firebird.c:88: warning: initialization makes integer from pointer without a cast ../../firebird.c: In function 'HB_FUN_FBCONNECT': ../../firebird.c:115: warning: initialization makes integer from pointer without a cast ../../firebird.c:143: warning: cast to pointer from integer of different size ../../firebird.c: In function 'HB_FUN_FBCLOSE': ../../firebird.c:149: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBSTARTTRANSACTION': ../../firebird.c:172: warning: cast from pointer to integer of different size ../../firebird.c:173: warning: initialization makes integer from pointer without a cast ../../firebird.c:179: warning: cast to pointer from integer of different size ../../firebird.c: In function 'HB_FUN_FBCOMMIT': ../../firebird.c:184: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBROLLBACK': ../../firebird.c:195: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBEXECUTE': ../../firebird.c:206: warning: cast from pointer to integer of different size ../../firebird.c:207: warning: initialization makes integer from pointer without a cast ../../firebird.c:215: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBQUERY': ../../firebird.c:249: warning: cast from pointer to integer of different size ../../firebird.c:250: warning: initialization makes integer from pointer without a cast ../../firebird.c:253: warning: initialization makes integer from pointer without a cast ../../firebird.c:270: warning: cast from pointer to integer of different size ../../firebird.c:375: warning: cast to pointer from integer of different size ../../firebird.c:379: warning: cast to pointer from integer of different size ../../firebird.c: In function 'HB_FUN_FBFETCH': ../../firebird.c:395: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBFREE': ../../firebird.c:419: warning: cast from pointer to integer of different size ../../firebird.c:421: warning: cast from pointer to integer of different size ../../firebird.c: In function 'HB_FUN_FBGETBLOB': ../../firebird.c:613: warning: cast from pointer to integer of different size ../../firebird.c:614: warning: initialization makes integer from pointer without a cast ../../firebird.c:615: warning: initialization makes integer from pointer without a cast ../../firebird.c:624: warning: cast from pointer to integer of different size ../../fbirddd.c: In function 'fbConnect': ../../fbirddd.c:164: warning: initialization makes integer from pointer without a cast ../../fbirddd.c:192: warning: cast to pointer from integer of different size ../../fbirddd.c: In function 'fbOpen': ../../fbirddd.c:217: warning: initialization makes integer from pointer without a cast ../../fbirddd.c:218: warning: initialization makes integer from pointer without a cast ../../fbirddd.c:409: warning: assignment makes pointer from integer without a cast ../../fbirddd.c:410: warning: assignment makes pointer from integer without a cast ../../fbirddd.c: In function 'fbClose': ../../fbirddd.c:446: warning: passing argument 2 of 'isc_dsql_free_statement' from incompatible pointer type c:/devl/Firebird-2.1.1/include/ibase.h:629: note: expected 'isc_stmt_handle *' but argument is of type 'void **' ../../fbirddd.c:451: warning: passing argument 2 of 'isc_rollback_transaction' from incompatible pointer type c:/devl/Firebird-2.1.1/include/ibase.h:780: note: expected 'isc_tr_handle *' but argument is of type 'void **' ../../fbirddd.c: In function 'fbGoTo': ../../fbirddd.c:469: warning: passing argument 2 of 'isc_dsql_fetch' from incompatible pointer type c:/devl/Firebird-2.1.1/include/ibase.h:622: note: expected 'isc_stmt_handle *' but argument is of type 'void **' ../../fbirddd.c:531: warning: passing argument 2 of 'isc_dsql_free_statement' from incompatible pointer type c:/devl/Firebird-2.1.1/include/ibase.h:629: note: expected 'isc_stmt_handle *' but argument is of type 'void **' ../../fbirddd.c:538: warning: passing argument 2 of 'isc_commit_transaction' from incompatible pointer type c:/devl/Firebird-2.1.1/include/ibase.h:524: note: expected 'isc_tr_handle *' but argument is of type 'void **' --- harbour/ChangeLog | 243 +++++++++++++++++++------- harbour/INSTALL | 5 +- harbour/bin/postinst.bat | 22 ++- harbour/contrib/gtwvg/gtwvg.h | 8 +- harbour/contrib/gtwvg/wvgcuig.c | 17 +- harbour/contrib/gtwvg/wvggui.h | 8 +- harbour/contrib/gtwvg/wvgwin.c | 4 +- harbour/contrib/hbapollo/Makefile | 4 + harbour/contrib/hbfimage/fi_winfu.c | 2 +- harbour/contrib/hbqt/Makefile | 4 + harbour/contrib/hbwin/wapi_commctrl.c | 6 +- harbour/contrib/rddads/rddads.h | 4 +- harbour/contrib/xhb/hbxml.c | 2 +- harbour/tests/testhtml.prg | 24 +-- 14 files changed, 236 insertions(+), 117 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1636abb493..94fc5ae42c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,181 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-25 11:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * tests/testhtml.prg + * Update by Vailton Renato applied. + + * INSTALL + * Minor formatting. + + * bin/postinst.bat + + Minor cleanup to creation of hbrun/hbtest dll versions. + (now it's more difficult to mislead it by already existing + foreign .dlls) + + * contrib/hbqt/Makefile + * contrib/hbapollo/Makefile + - Disabled for mingw64. + + * contrib/rddads/rddads.h + + Added workaround to compile under mingw64. + + * contrib/gtwvg/gtwvg.h + * contrib/gtwvg/wvggui.h + ! Fixed to _not_ override _WIN32_IE. Overriding these version + numbers is generally a very bad idea. Instead the code should + adapt to whatever values are defined by system headers. + This fixes most mingw64 errors. Please test other compilers. + + * contrib/xhb/hbxml.c + * contrib/hbfimage/fi_winfu.c + * contrib/hbwin/wapi_commctrl.c + ! Pointer/handle to integer conversion. + + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvgwin.c + ! Fixed NULL used instead of 0. + ! Fixed ISNIL() usage. GTWVG code is full of ISNIL() macros, + which makes the code prone to GPFs and other unexpected + behaviour when wrong type is passed. The solution is to + change all these to type specific IS*() macros. + + ; TOFIX: (core and all contribs) + + C:/DOCUME~1/vszakats/LOCALS~1/Temp/ccVcE53g.s: Assembler messages: + C:/DOCUME~1/vszakats/LOCALS~1/Temp/ccVcE53g.s:20: Error: `0x0e10(%rax,%ecx,4)' is not a valid base/index expression + + In these files: + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hvm.c -ohvm.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../arrays.c -oarrays.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../asort.c -oasort.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../classes.c -oclasses.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../cmdarg.c -ocmdarg.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../debug.c -odebug.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../dynlibhb.c -odynlibhb.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../dynsym.c -odynsym.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../codebloc.c -ocodebloc.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../estack.c -oestack.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../eval.c -oeval.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../evalhb.c -oevalhb.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../extend.c -oextend.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../fm.c -ofm.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../garbage.c -ogarbage.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hashes.c -ohashes.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../hashfunc.c -ohashfunc.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../itemapi.c -oitemapi.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../macro.c -omacro.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../memvars.c -omemvars.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../pcount.c -opcount.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../proc.c -oproc.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../pvalue.c -opvalue.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../runner.c -orunner.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../set.c -oset.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_MT_VM -c ../../../thread.c -othread.o + x86_64-pc-mingw32-gcc -I. -I../../../../../include -Wall -W -O3 -fomit-frame-pointer -DHB_FM_STATISTICS -DHB_MT_VM -c ../../../fm.c -ofm.o + + ../../dbfntx1.c: In function 'hb_ntxTagHeaderCheck': + ../../dbfntx1.c:1054: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfntx1.c:1054: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfntx1.c:1055: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c: In function 'hb_nsxTagHeaderCheck': + ../../dbfnsx1.c:1282: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1284: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1285: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c: In function 'hb_nsxPageFree': + ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1573: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c: In function 'hb_nsxPageNew': + ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules + ../../dbfnsx1.c:1622: warning: dereferencing type-punned pointer will break strict-aliasing rules + + ../../hb_btree.c: In function 'StackSkip': + ../../hb_btree.c:643: warning: cast from pointer to integer of different size + ../../hb_btree.c: In function 'Grow': + ../../hb_btree.c:739: warning: cast from pointer to integer of different size + + ../../getenvrn.c: In function 'HB_FUN_FT_GETE': + ../../getenvrn.c:178: warning: implicit declaration of function 'GetEnvironmentStrings' + ../../getenvrn.c:178: warning: initialization makes pointer from integer without a cast + + ../../win_dll.c: In function 'DllExec': + ../../win_dll.c:509: warning: cast from pointer to integer of different size + ../../win_dll.c:603: warning: cast to pointer from integer of different size + ../../win_dll.c:672: warning: cast to pointer from integer of different size + ../../win_dll.c:689: warning: cast to pointer from integer of different size + + ../../hbserv.c: In function 's_serviceSetHBSig': + ../../hbserv.c:638: warning: passing argument 1 of 'SetUnhandledExceptionFilter' from incompatible pointer type + + ../../firebird.c: In function 'HB_FUN_FBCREATEDB': + ../../firebird.c:87: warning: initialization makes integer from pointer without a cast + ../../firebird.c:88: warning: initialization makes integer from pointer without a cast + ../../firebird.c: In function 'HB_FUN_FBCONNECT': + ../../firebird.c:115: warning: initialization makes integer from pointer without a cast + ../../firebird.c:143: warning: cast to pointer from integer of different size + ../../firebird.c: In function 'HB_FUN_FBCLOSE': + ../../firebird.c:149: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBSTARTTRANSACTION': + ../../firebird.c:172: warning: cast from pointer to integer of different size + ../../firebird.c:173: warning: initialization makes integer from pointer without a cast + ../../firebird.c:179: warning: cast to pointer from integer of different size + ../../firebird.c: In function 'HB_FUN_FBCOMMIT': + ../../firebird.c:184: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBROLLBACK': + ../../firebird.c:195: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBEXECUTE': + ../../firebird.c:206: warning: cast from pointer to integer of different size + ../../firebird.c:207: warning: initialization makes integer from pointer without a cast + ../../firebird.c:215: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBQUERY': + ../../firebird.c:249: warning: cast from pointer to integer of different size + ../../firebird.c:250: warning: initialization makes integer from pointer without a cast + ../../firebird.c:253: warning: initialization makes integer from pointer without a cast + ../../firebird.c:270: warning: cast from pointer to integer of different size + ../../firebird.c:375: warning: cast to pointer from integer of different size + ../../firebird.c:379: warning: cast to pointer from integer of different size + ../../firebird.c: In function 'HB_FUN_FBFETCH': + ../../firebird.c:395: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBFREE': + ../../firebird.c:419: warning: cast from pointer to integer of different size + ../../firebird.c:421: warning: cast from pointer to integer of different size + ../../firebird.c: In function 'HB_FUN_FBGETBLOB': + ../../firebird.c:613: warning: cast from pointer to integer of different size + ../../firebird.c:614: warning: initialization makes integer from pointer without a cast + ../../firebird.c:615: warning: initialization makes integer from pointer without a cast + ../../firebird.c:624: warning: cast from pointer to integer of different size + + ../../fbirddd.c: In function 'fbConnect': + ../../fbirddd.c:164: warning: initialization makes integer from pointer without a cast + ../../fbirddd.c:192: warning: cast to pointer from integer of different size + ../../fbirddd.c: In function 'fbOpen': + ../../fbirddd.c:217: warning: initialization makes integer from pointer without a cast + ../../fbirddd.c:218: warning: initialization makes integer from pointer without a cast + ../../fbirddd.c:409: warning: assignment makes pointer from integer without a cast + ../../fbirddd.c:410: warning: assignment makes pointer from integer without a cast + ../../fbirddd.c: In function 'fbClose': + ../../fbirddd.c:446: warning: passing argument 2 of 'isc_dsql_free_statement' from incompatible pointer type + c:/devl/Firebird-2.1.1/include/ibase.h:629: note: expected 'isc_stmt_handle *' but argument is of type 'void **' + ../../fbirddd.c:451: warning: passing argument 2 of 'isc_rollback_transaction' from incompatible pointer type + c:/devl/Firebird-2.1.1/include/ibase.h:780: note: expected 'isc_tr_handle *' but argument is of type 'void **' + ../../fbirddd.c: In function 'fbGoTo': + ../../fbirddd.c:469: warning: passing argument 2 of 'isc_dsql_fetch' from incompatible pointer type + c:/devl/Firebird-2.1.1/include/ibase.h:622: note: expected 'isc_stmt_handle *' but argument is of type 'void **' + ../../fbirddd.c:531: warning: passing argument 2 of 'isc_dsql_free_statement' from incompatible pointer type + c:/devl/Firebird-2.1.1/include/ibase.h:629: note: expected 'isc_stmt_handle *' but argument is of type 'void **' + ../../fbirddd.c:538: warning: passing argument 2 of 'isc_commit_transaction' from incompatible pointer type + c:/devl/Firebird-2.1.1/include/ibase.h:524: note: expected 'isc_tr_handle *' but argument is of type 'void **' + 2009-03-25 02:49 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/tests/speedtst.prg * simplified xHarbour MT test - use mutexes as internal thread IDs @@ -697,74 +872,6 @@ ! Fixed mingw64 warning. ; TODO: Check for possible regression. - ; TOFIX: (3rd party dependent contribs not yet included) - Errors/Core: - Temp/ccVJXjZS.s: Assembler messages: - Temp/ccVJXjZS.s:19: Error: Incorrect register `%rax' used with `l' suffix - Temp/ccVJXjZS.s:20: Error: `0x0e10(%rax,%ecx,4)' is not a valid base/index expression - Temp/ccVJXjZS.s:36: Error: Incorrect register `%rax' used with `l' suffix - Temp/ccVJXjZS.s:37: Error: `0x0e10(%rax,%ecx,4)' is not a valid base/index expression - + GTWVG (also lots of warning) - - Warnings/Core: - ../../hbprintf.c: In function 'hb_snprintf': - ../../hbprintf.c:1067: warning: implicit declaration of function 'finite' - ../../hbprintf.c:1148: warning: cast from pointer to integer of different size - ../../itemapi.c: In function 'hb_itemStrBuf': - ../../itemapi.c:2159: warning: implicit declaration of function 'finite' - ../../dbfntx1.c: In function 'hb_ntxTagHeaderCheck': - ../../dbfntx1.c:1016: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfntx1.c:1016: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfntx1.c:1017: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfntx1.c:1017: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfntx1.c:1017: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfntx1.c:1017: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c: In function 'hb_nsxTagHeaderCheck': - ../../dbfnsx1.c:1233: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1235: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1236: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1236: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1236: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1236: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c: In function 'hb_nsxPageFree': - ../../dbfnsx1.c:1525: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1525: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1525: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1525: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c: In function 'hb_nsxPageNew': - ../../dbfnsx1.c:1574: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1574: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1574: warning: dereferencing type-punned pointer will break strict-aliasing rules - ../../dbfnsx1.c:1574: warning: dereferencing type-punned pointer will break strict-aliasing rules - - Warnings/Contrib: - ../../files.c: In function 'HB_FUN_SETFDATI': - ../../files.c:247: warning: cast to pointer from integer of different size - ../../files.c:268: warning: cast from pointer to integer of different size - ../../getenvrn.c: In function 'HB_FUN_FT_GETE': - ../../getenvrn.c:178: warning: implicit declaration of function 'GetEnvironmentStrings' - ../../getenvrn.c:178: warning: initialization makes pointer from integer without a cast - ../../win_dll.c: In function 'DllExec': - ../../win_dll.c:509: warning: cast from pointer to integer of different size - ../../win_dll.c:603: warning: cast to pointer from integer of different size - ../../win_dll.c:672: warning: cast to pointer from integer of different size - ../../win_dll.c:689: warning: cast to pointer from integer of different size - ../../wapi_commctrl.c: In function 'HB_FUN_WAPI_TABCTRL_GETITEMRECT': - ../../wapi_commctrl.c:521: warning: value computed is not used - ../../wapi_commctrl.c: In function 'HB_FUN_WAPI_TABCTRL_GETIMAGELIST': - ../../wapi_commctrl.c:553: warning: cast from pointer to integer of different size - ../../wapi_commctrl.c: In function 'HB_FUN_WAPI_TABCTRL_ADJUSTRECT': - ../../wapi_commctrl.c:632: warning: value computed is not used - ../../wapi_commctrl.c: In function 'HB_FUN_WAPI_TABCTRL_CREATE': - ../../wapi_commctrl.c:782: warning: cast to pointer from integer of different size - ../../wapi_commctrl.c:786: warning: cast from pointer to integer of different size - ../../wapi_winbase.c: In function 'HB_FUN_WAPI_GETMODULEHANDLE': - ../../wapi_winbase.c:83: warning: cast to pointer from integer of different size - ../../hbserv.c: In function 's_serviceSetHBSig': - ../../hbserv.c:638: warning: passing argument 1 of 'SetUnhandledExceptionFilter' from incompatible pointer type - ../../hbxml.c: In function 'HB_FUN_HBXML_DATAREAD': - ../../hbxml.c:2321: warning: cast to pointer from integer of different size - 2009-03-21 14:23 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL * utils/hbmk2/hbmk2.prg diff --git a/harbour/INSTALL b/harbour/INSTALL index fd2fedd828..83f8941318 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -238,9 +238,8 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR - HB_BUILD_DEBUG=yes Create a debug build. - HB_BUILD_OPTIM=no Disable C compiler optimizations. - HB_CONTRIBLIBS=no Don't build any contrib libraries. - - HB_CONTRIBLIBS=[] Build space separated of - contrib libraries. Build all if - left empty. + - HB_CONTRIBLIBS=[] Build space separated of contrib + libraries. Build all if left empty. - HB_CONTRIB_ADDONS= Build additional libraries stored in the contrib directory. - HB_VISUALC_VER_PRE80=yes Set this if you're using a pre-8.0 diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index dec500bca5..20739ac451 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -27,16 +27,20 @@ goto inst_%HB_ARCHITECTURE% rem Windows post install part if not "%OS%" == "Windows_NT" goto end -if "%HB_DYNLIB%" == "yes" call %~dp0hb-mkdyn.bat +if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN -set _HB_BIN_INSTALL=%HB_BIN_INSTALL% -if not "%HB_BIN_COMPILE%" == "" set HB_BIN_INSTALL=%HB_BIN_COMPILE% -if exist "%HB_BIN_INSTALL%\*.dll" ( - %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbrun-dll %~dp0..\utils\hbrun\hbrun.hbm -lhbcplr -lhbpp -lhbcommon - %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbm -) -set HB_BIN_INSTALL=%_HB_BIN_INSTALL% -set _HB_BIN_INSTALL= + call %~dp0hb-mkdyn.bat + + setlocal + set _HB_BIN_INSTALL=%HB_BIN_INSTALL% + if not "%HB_BIN_COMPILE%" == "" set HB_BIN_INSTALL=%HB_BIN_COMPILE% + if exist "%HB_BIN_INSTALL%\*.dll" ( + %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbrun-dll %~dp0..\utils\hbrun\hbrun.hbm -lhbcplr -lhbpp -lhbcommon + %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbm + ) + endlocal + +:_SKIP_DLL_BIN if "%HB_BUILD_IMPLIB%" == "yes" ( diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index 57853d1584..fce101fcf0 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -58,10 +58,6 @@ //-------------------------------------------------------------------// -#ifndef _WIN32_IE - #define _WIN32_IE 0x0400 -#endif - #ifndef CINTERFACE #define CINTERFACE 1 #endif @@ -97,6 +93,10 @@ #include "hbgtwvg.ch" +#ifndef _WIN32_IE + #define _WIN32_IE 0x0400 +#endif + HB_EXTERN_BEGIN //----------------------------------------------------------------------// diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c index ac49c56a2e..0f4e6d5390 100644 --- a/harbour/contrib/gtwvg/wvgcuig.c +++ b/harbour/contrib/gtwvg/wvgcuig.c @@ -280,7 +280,7 @@ HB_FUNC( WVG_SETGOBJDATA ) bSuccess = FALSE; break; case GOBJ_OBJDATA_COLORBK: - gObj->crRGBBk = ISNIL( 3 ) ? ( COLORREF ) NULL : ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 ); + gObj->crRGBBk = ISNUM( 3 ) ? ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 ) : ( COLORREF ) 0; break; default: bSuccess = FALSE; @@ -612,9 +612,9 @@ HB_FUNC( WVG_LABEL ) HB_TCHAR_CPTO( gObj->lpText, hb_parc( 4 ), strlen( hb_parc( 4 ) ) ); #endif - gObj->iAlign = ISNIL( 5 ) ? TA_LEFT : hb_parni( 5 ); + gObj->iAlign = ISNUM( 5 ) ? hb_parni( 5 ) : TA_LEFT; gObj->crRGBText = ( COLORREF ) hb_parnint( 7 ); - gObj->crRGBBk = ISNIL( 8 ) ? ( COLORREF ) NULL : ( COLORREF ) hb_parnint( 8 ); + gObj->crRGBBk = ISNUM( 8 ) ? ( COLORREF ) hb_parnint( 8 ) : ( COLORREF ) 0; gObj->hFont = hFont; gObj->bDestroyFont = TRUE; @@ -649,9 +649,9 @@ HB_FUNC( WVG_LABELEX ) HB_TCHAR_CPTO( gObj->lpText, hb_parc( 4 ), strlen( hb_parc( 4 ) ) ); #endif - gObj->iAlign = ISNIL( 5 ) ? TA_LEFT : hb_parni( 5 ); + gObj->iAlign = ISNUM( 5 ) ? hb_parni( 5 ) : TA_LEFT; gObj->crRGBText = ( COLORREF ) hb_parnint( 6 ); - gObj->crRGBBk = ISNIL( 7 ) ? ( COLORREF ) NULL : ( COLORREF ) hb_parnint( 7 ); + gObj->crRGBBk = ISNUM( 7 ) ? ( COLORREF ) hb_parnint( 7 ) : ( COLORREF ) 0; gObj->hFont = pWVT->pGUI->hUserFonts[ hb_parni( 8 ) - 1 ]; gObj->bDestroyFont = FALSE; @@ -664,7 +664,7 @@ static void hb_wvg_Label( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop ) { HFONT hOldFont; - if( gObj->crRGBBk != ( COLORREF ) NULL ) + if( gObj->crRGBBk != ( COLORREF ) 0 ) { SetBkColor( pWVT->hdc, gObj->crRGBBk ); SetBkMode( pWVT->hdc, OPAQUE ); @@ -1215,7 +1215,7 @@ HB_FUNC( WVG_TEXTBOX ) gObj->iAlign = iAlignH; gObj->crRGBText = ( COLORREF ) hb_parnint( 9 ); - gObj->crRGBBk = ISNIL( 10 ) ? ( COLORREF ) NULL : ( COLORREF ) hb_parnint( 10 ); + gObj->crRGBBk = ISNUM( 10 ) ? ( COLORREF ) hb_parnint( 10 ) : ( COLORREF ) 0; gObj->hFont = ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 11 ); gObj->bDestroyFont = FALSE; @@ -1233,7 +1233,7 @@ static void hb_wvg_TextBox( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, SetTextAlign( hdc, TA_TOP | TA_LEFT | TA_NOUPDATECP ); SetTextColor( hdc, gObj->crRGBText ); - if( gObj->crRGBBk == ( COLORREF ) NULL ) + if( gObj->crRGBBk == ( COLORREF ) 0 ) SetBkMode( hdc, TRANSPARENT ); else { @@ -1575,4 +1575,3 @@ void hb_gt_wvt_PaintGObjects( PHB_GTWVT pWVT, RECT *uRect ) } } /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/gtwvg/wvggui.h b/harbour/contrib/gtwvg/wvggui.h index bd9c45604d..9ca6ed3c5c 100644 --- a/harbour/contrib/gtwvg/wvggui.h +++ b/harbour/contrib/gtwvg/wvggui.h @@ -58,10 +58,6 @@ //-------------------------------------------------------------------// -#ifndef _WIN32_IE - #define _WIN32_IE 0x0400 -#endif - #ifndef CINTERFACE #define CINTERFACE 1 #endif @@ -95,6 +91,10 @@ #include "hbgtwvg.ch" +#ifndef _WIN32_IE + #define _WIN32_IE 0x0400 +#endif + HB_EXTERN_BEGIN //----------------------------------------------------------------------// diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index 0031d30164..ba38f20df8 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -2134,7 +2134,7 @@ HB_FUNC( WVG_ADDTOOLBARBUTTON ) // tbab.hInst = NULL; #if (_WIN32_IE >= 0x0500) - tbab.nID = wapi_par_HBITMAP( 2 ); + tbab.nID = ( UINT_PTR ) wapi_par_HBITMAP( 2 ); #else tbab.nID = ( UINT ) wapi_par_HBITMAP( 2 ); #endif @@ -2203,7 +2203,7 @@ HB_FUNC( WIN_SENDTOOLBARMESSAGE ) tbab.hInst = NULL; #if (_WIN32_IE >= 0x0500) - tbab.nID = wapi_par_HBITMAP( 3 ); + tbab.nID = ( UINT_PTR ) wapi_par_HBITMAP( 3 ); #else tbab.nID = ( UINT ) wapi_par_HBITMAP( 3 ); #endif diff --git a/harbour/contrib/hbapollo/Makefile b/harbour/contrib/hbapollo/Makefile index d236e47888..55090288a1 100644 --- a/harbour/contrib/hbapollo/Makefile +++ b/harbour/contrib/hbapollo/Makefile @@ -7,6 +7,7 @@ ROOT = ../../ LIBNAME=hbapollo ifneq ($(HB_ARCHITECTURE),dos) +ifneq ($(HB_COMPILER),mingw64) HB_INC_APOLLO_OK += $(foreach d, $(HB_INC_APOLLO), $(if $(wildcard $(d)/Sde61.h),$(d),)) @@ -36,3 +37,6 @@ endif else include $(TOP)$(ROOT)config/none.cf endif +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c index ab95514757..b55391a51b 100644 --- a/harbour/contrib/hbfimage/fi_winfu.c +++ b/harbour/contrib/hbfimage/fi_winfu.c @@ -178,7 +178,7 @@ HB_FUNC( FI_WINDRAW ) /* Retrieve parameters */ dib = ( FIBITMAP * ) hb_parptr( 1 ); - hDC = ( HDC ) hb_parnl( 2 ); + hDC = ( HDC ) hb_parnint( 2 ); rcDest.top = hb_parni( 3 ); rcDest.left = hb_parni( 4 ); rcDest.bottom = hb_parni( 5 ); diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index 45a7dfe30b..b4ccee64fc 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -8,6 +8,7 @@ LIBNAME=hbqt ifneq ($(HB_ARCHITECTURE),dos) ifneq ($(HB_ARCHITECTURE),os2) +ifneq ($(HB_COMPILER),mingw64) ifeq ($(HB_INC_QT),) ifeq ($(HB_XBUILD),) @@ -122,3 +123,6 @@ endif else include $(TOP)$(ROOT)config/none.cf endif +else +include $(TOP)$(ROOT)config/none.cf +endif diff --git a/harbour/contrib/hbwin/wapi_commctrl.c b/harbour/contrib/hbwin/wapi_commctrl.c index 3833ec6308..9c310ecb40 100644 --- a/harbour/contrib/hbwin/wapi_commctrl.c +++ b/harbour/contrib/hbwin/wapi_commctrl.c @@ -550,7 +550,7 @@ HB_FUNC( WAPI_TABCTRL_GETROWCOUNT ) HB_FUNC( WAPI_TABCTRL_GETIMAGELIST ) { - wapi_ret_NINT( ( LONG ) TabCtrl_GetImageList( wapi_par_HWND( 1 ) ) ); + wapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_GetImageList( wapi_par_HWND( 1 ) ) ); } /*----------------------------------------------------------------------*/ /* #define TabCtrl_SetImageList(hwnd, himl) */ @@ -779,11 +779,11 @@ HB_FUNC( WAPI_TABCTRL_CREATE ) LONG hFont; LONG style; style = ISNIL( 6 ) ? 0 : ( LONG ) hb_parnl( 6 ); - hwnd = ( HWND ) hb_parnl( 1 ); + hwnd = ( HWND ) hb_parnint( 1 ); hFont = SendMessage( hwnd, WM_GETFONT, 0, 0 ); hbutton = CreateWindowEx( 0, WC_TABCONTROL, NULL, style, hb_parni( 2 ), hb_parni( 3 ) , hb_parni( 4 ), hb_parni( 5 ), hwnd, NULL, GetModuleHandle( NULL ), NULL ); SendMessage( hbutton, ( UINT ) WM_SETFONT, ( WPARAM ) hFont, 1 ); - hb_retnl( ( LONG ) hbutton ); + hb_retnint( ( HB_PTRDIFF ) hbutton ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h index 26d2e81f1b..c1aacd024c 100644 --- a/harbour/contrib/rddads/rddads.h +++ b/harbour/contrib/rddads/rddads.h @@ -58,7 +58,9 @@ #if !defined( unix ) && ( defined( __LINUX__ ) || defined( HB_OS_LINUX ) ) #define unix #endif - +#if defined( __MINGW64__ ) + #define x64 +#endif #if defined( __WATCOMC__ ) || defined( __LCC__ ) #define _declspec( dllexport ) __declspec( dllexport ) #endif diff --git a/harbour/contrib/xhb/hbxml.c b/harbour/contrib/xhb/hbxml.c index 759bac2c09..a11ab3c64b 100644 --- a/harbour/contrib/xhb/hbxml.c +++ b/harbour/contrib/xhb/hbxml.c @@ -2318,7 +2318,7 @@ HB_FUNC( HBXML_DATAREAD ) mxml_refill_from_handle_func, buffer, 0, 512 ); - refil.u.vPtr = (void *) hb_itemGetNL( pParam ); + refil.u.vPtr = (void *) hb_itemGetNInt( pParam ); } /* Now we can get the root node */ diff --git a/harbour/tests/testhtml.prg b/harbour/tests/testhtml.prg index fe697d3b98..a714c5ef63 100644 --- a/harbour/tests/testhtml.prg +++ b/harbour/tests/testhtml.prg @@ -82,7 +82,7 @@ STATIC FUNCTION New() ::cContent := "" ::cBody := "" - RETURN( Self ) + RETURN Self STATIC FUNCTION SetTitle( cTitle ) @@ -90,7 +90,7 @@ STATIC FUNCTION SetTitle( cTitle ) ::cTitle := cTitle - RETURN( Self ) + RETURN Self STATIC FUNCTION AddLink( cLinkTo, cLinkName ) @@ -99,7 +99,7 @@ STATIC FUNCTION AddLink( cLinkTo, cLinkName ) ::cBody := ::cBody + ; "" + cLinkName + "" - RETURN( Self ) + RETURN Self STATIC FUNCTION AddHead( cDescr ) @@ -126,7 +126,7 @@ STATIC FUNCTION AddPara( cPara, cAlign ) cPara + s_cNewLine + ; "

" - RETURN( Self ) + RETURN Self STATIC FUNCTION Generate() @@ -140,25 +140,25 @@ STATIC FUNCTION Generate() ::cBody + s_cNewLine + ; "" - RETURN( Self ) + RETURN Self STATIC FUNCTION ShowResult() LOCAL Self := QSelf() - qqOut( ; - "HTTP/1.0 200 OK" + s_cNewLine + ; + OutStd( ; +;// "HTTP/1.0 200 OK" + s_cNewLine + ; "CONTENT-TYPE: TEXT/HTML" + s_cNewLine + s_cNewLine + ; ::cContent ) - RETURN( Self ) + RETURN Self STATIC FUNCTION SaveToFile( cFile ) LOCAL Self := QSelf() - LOCAL hFile := fCreate( cFile ) + LOCAL hFile := FCreate( cFile ) - fWrite( hFile, ::cContent ) - fClose( hFile ) + FWrite( hFile, ::cContent ) + FClose( hFile ) - RETURN( Self ) + RETURN Self