2011-06-01 11:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbwin/mapi.c
    ! fixed UNICODE conflict after recent LoadLibrary patch. 
      this file has forced UNICODE off due to MS idiocy so I had 
      to add more idiocy to interface with properly UNICODE setting 
      compliant local API
      Note, I didn't test non-UNICODE build, if you're interested
      in it, pls do it
  * contrib/hbwin/tests/testmapi.prg
    + simpleio

harbour/ChangeLog

@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-06-01 11:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/mapi.c
+    ! fixed UNICODE conflict after recent LoadLibrary patch.
+      this file has forced UNICODE off due to MS idiocy so I had
+      to add more idiocy to interface with properly UNICODE setting
+      compliant local API
+      Note, I didn't test non-UNICODE build, if you're interested
+      in it, pls do it
+  * contrib/hbwin/tests/testmapi.prg
+    + simpleio
+
 2011-05-31 15:12 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbide.qrc
   * contrib/hbide/resources/hideshow.png
@@ -26,14 +37,14 @@
   * contrib/hbide/idemain.prg
   * contrib/hbide/idesaveload.prg
     + Implemented: a single-click mechanism to hide or show all managed
-      dock widgets in all docking areas. This can be accomplished via 
+      dock widgets in all docking areas. This can be accomplished via
       "Hide Show Docks" top-toolbar icon or <View> main menu option.
 
       This implementation is extremely usable feature, requested by Massimo.
-      Just manage docks to the desired position and areas, activate this 
-      option on/off and then see how useful it is. User gets more editing 
-      area and also has the power to do additional tasks by bringing 
-      back the last setup as and when required. The setup is remembered for 
+      Just manage docks to the desired position and areas, activate this
+      option on/off and then see how useful it is. User gets more editing
+      area and also has the power to do additional tasks by bringing
+      back the last setup as and when required. The setup is remembered for
       the next run even if docks are hidden at the time of previous close.
 
 2011-05-31 16:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -47,14 +58,14 @@
 
 2011-05-31 00:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/setup.ui
-    + Started: few more user-definable elements to manage docking 
+    + Started: few more user-definable elements to manage docking
       widgets to suit one's preferences.
   * contrib/hbide/mainwindow.ui
   * contrib/hbide/idedocks.prg
     + Enabled: more options for docking widgets.
       Now docks can be placed tabifyied, horizonal to each other,
       vertical to each other and/or tabified within its group.
-      Now user can arrange docks in any area with any combination.    
+      Now user can arrange docks in any area with any combination.
     TODO: control this behavior via <setup>, slots are already added.
 
 2011-05-30 21:05 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -77,9 +88,9 @@
 
 2011-05-28 15:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
-    ! Fixed: wrong multi-line syntax highlighting in case 
+    ! Fixed: wrong multi-line syntax highlighting in case
       multi-line comment indicator "/*" is embedded in a string,
-      like __run("mdel a:/*.*"). Was a long standing bug in hbIDE. 
+      like __run("mdel a:/*.*"). Was a long standing bug in hbIDE.
 
 2011-05-28 20:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbodbc/hbodbc.hbc

harbour/contrib/hbwin/mapi.c

@@ -53,6 +53,10 @@
 
 #include "hbapi.h" /* for HB_OS_* detection */
 
+#if defined( UNICODE )
+#  define HB_UNICODE_ORI
+#endif
+
 #if ! defined( HB_OS_WIN_CE )
 #  if defined( UNICODE )
 #     undef UNICODE
@@ -85,7 +89,13 @@ HB_FUNC( WIN_MAPISENDMAIL )
    /* Set default return value */
    hb_retnl( -1 );
 
-   if( ( hMapiDll = hbwapi_LoadLibrarySystem( TEXT( "mapi32.dll" ) ) ) >= ( HINSTANCE ) 32 )
+   if( ( hMapiDll = hbwapi_LoadLibrarySystem(
+#if defined( HB_UNICODE_ORI ) || defined( UNICODE )
+                                              ( LPCTSTR ) L"mapi32.dll"
+#else
+                                              ( LPCTSTR ) "mapi32.dll"
+#endif
+                                            ) ) >= ( HINSTANCE ) 32 )
    {
       LPMAPISENDMAIL MAPISendMail = ( LPMAPISENDMAIL ) GetProcAddress( hMapiDll, "MAPISendMail" );
 

harbour/contrib/hbwin/tests/testmapi.prg

@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#include "simpleio.ch"
+
 #include "hbwin.ch"
 
 PROCEDURE Main()