From a61c73f11d5b5eade90577bb7aba43220a65912e Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 27 Nov 2007 13:47:57 +0000
Subject: [PATCH] 2007-11-27 14:47 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh     * inherit some
 parameters like -mlp{64,32}, -m{64,32} set in C_USR       during build as
 default C compiler/linker switches in hb* scripts

  * harbour/config/w32/pocc.cf
    + added comdlg32.lib to linked library list

  * harbour/source/common/hbwince.c
    + added dummy FreeResource() function. This is a note from MSDN:
         FreeResource() is an obsolete function. It is provided for backward
         compatibility with 16-bit Windows applications. FreeResource() is
         not necessary for 32-bit Windows applications to free the resources
         loaded using LoadResource() function.

  * harbour/contrib/gtwvg/wvtutils.c
    + added workaround for wrong ChooseColorW() definition in header
      files include in last oficial relase (0.50) of MinGW32-CE

      Pritpal above finished modifications I was able to make using
      only pure MinGW32-CE 0.50. The following functions used by GTWVG
      are still missing:
         GetMenu(), SetMenu(),
         CreateBrushIndirect(),
         GetViewportOrgEx(),
         IsDlgButtonChecked(),
         OleLoadPicture(),
         TrackPopupMenu(),
      If you are sure that they exist in WinCE then simply create
      static import library for them or dynamic wrappers.
---
 harbour/ChangeLog                | 31 +++++++++++++++++++++++++++++++
 harbour/bin/hb-func.sh           | 13 +++++++++++++
 harbour/config/w32/pocc.cf       |  3 ++-
 harbour/contrib/gtwvg/wvtutils.c |  8 ++++++++
 harbour/source/common/hbwince.c  |  6 ++++++
 5 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0308c03445..41d6f67403 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,37 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-27 14:47 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * inherit some parameters like -mlp{64,32}, -m{64,32} set in C_USR
+      during build as default C compiler/linker switches in hb* scripts
+
+  * harbour/config/w32/pocc.cf
+    + added comdlg32.lib to linked library list
+
+  * harbour/source/common/hbwince.c
+    + added dummy FreeResource() function. This is a note from MSDN:
+         FreeResource() is an obsolete function. It is provided for backward
+         compatibility with 16-bit Windows applications. FreeResource() is
+         not necessary for 32-bit Windows applications to free the resources
+         loaded using LoadResource() function.
+
+  * harbour/contrib/gtwvg/wvtutils.c
+    + added workaround for wrong ChooseColorW() definition in header
+      files include in last oficial relase (0.50) of MinGW32-CE
+
+      Pritpal above finished modifications I was able to make using
+      only pure MinGW32-CE 0.50. The following functions used by GTWVG
+      are still missing:
+         GetMenu(), SetMenu(),
+         CreateBrushIndirect(),
+         GetViewportOrgEx(),
+         IsDlgButtonChecked(),
+         OleLoadPicture(),
+         TrackPopupMenu(),
+      If you are sure that they exist in WinCE then simply create
+      static import library for them or dynamic wrappers.
+
 2007-11-27 11:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/common/hbwince.c
     * added MulDiv() implementation for MinGW32-CE builds
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 2f78fbfd65..3711f095e2 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -160,6 +160,19 @@ mk_hbtools()
         fi
         HB_SLN_LIB="slang"
     fi
+    if [ "${C_USR//-mlp64/}" != "${C_USR}" ]; then
+        CC_L_USR="${CC_L_USR} -mlp64"
+        CC_C_USR="${CC_C_USR} -mlp64"
+    elif [ "${C_USR//-mlp32/}" != "${C_USR}" ]; then
+        CC_L_USR="${CC_L_USR} -mlp32"
+        CC_C_USR="${CC_C_USR} -mlp32"
+    elif [ "${C_USR//-m64/}" != "${C_USR}" ]; then
+        CC_L_USR="${CC_L_USR} -m64"
+        CC_C_USR="${CC_C_USR} -m64"
+    elif [ "${C_USR//-m32/}" != "${C_USR}" ]; then
+        CC_L_USR="${CC_L_USR} -m32"
+        CC_C_USR="${CC_C_USR} -m32"
+    fi
 
     echo "Generating ${hb_tool}... "
     cat > ${hb_tool} <<EOF
diff --git a/harbour/config/w32/pocc.cf b/harbour/config/w32/pocc.cf
index 86d8dd29f1..020b9f5453 100644
--- a/harbour/config/w32/pocc.cf
+++ b/harbour/config/w32/pocc.cf
@@ -66,7 +66,8 @@ endif
 LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib \
           winspool.lib ole32.lib oleaut32.lib uuid.lib \
           comctl32.lib mapi32.lib advapi32.lib \
-          gdi32.lib mpr.lib wsock32.lib ws2.lib ws2_32.lib
+          gdi32.lib mpr.lib wsock32.lib ws2.lib ws2_32.lib \
+          comdlg32.lib
 
 # ws2 ws2_32
 
diff --git a/harbour/contrib/gtwvg/wvtutils.c b/harbour/contrib/gtwvg/wvtutils.c
index ec60313174..f50f97829a 100644
--- a/harbour/contrib/gtwvg/wvtutils.c
+++ b/harbour/contrib/gtwvg/wvtutils.c
@@ -84,6 +84,14 @@
    #define TTM_SETTITLE TTM_SETTITLEA
 #endif
 
+#if defined(__MINGW32CE__)
+/* ChooseColorW() problem is fixed in current devel MINGW32CE version but
+ * people who use recent official release (0.50) needs it
+ */
+#undef ChooseColor
+BOOL WINAPI ChooseColor( LPCHOOSECOLORW );
+#endif /* __MINGW32CE__ */
+
 //-------------------------------------------------------------------//
 
 static GLOBAL_DATA *_s = NULL;
diff --git a/harbour/source/common/hbwince.c b/harbour/source/common/hbwince.c
index a89876e6c1..68b8af6b43 100644
--- a/harbour/source/common/hbwince.c
+++ b/harbour/source/common/hbwince.c
@@ -685,6 +685,12 @@ int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator )
 }
 #endif /* __MINGW32CE__ */
 
+BOOL WINAPI FreeResource( HGLOBAL h )
+{
+   HB_SYMBOL_UNUSED( h );
+   return FALSE;
+}
+
 BOOL WINAPI Arc( HDC h, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8 )
 {
    HB_SYMBOL_UNUSED( h );