commit 193cf50a09d724995f273acea623404276e98ec4
author Alexandre Julliard <julliard@winehq.org> Tue Jan 01 00:24:30 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 01 00:24:30 2002 +0000
tree 234cbaf8c19631aae63e5423c5d82673209f0578
parent 424a080c308c559782317ef57f8366625b648e97

Removed some of the calls to HEAP_strdup* functions.

windows/winhelp.c

diff --git a/windows/winhelp.c b/windows/winhelp.c
index c0e2d66..009e21a 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -12,7 +12,6 @@
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "win.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(win);
 
@@ -144,11 +143,20 @@
 /**********************************************************************
  *		WinHelpW (USER32.@)
  */
-BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command,
-                          DWORD dwData )
+BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command, DWORD dwData )
 {
-    LPSTR file = HEAP_strdupWtoA( GetProcessHeap(), 0, helpFile );
-    BOOL ret = WinHelpA( hWnd, file, command, dwData );
-    HeapFree( GetProcessHeap(), 0, file );
+    INT len;
+    LPSTR file;
+    BOOL ret = FALSE;
+
+    if (!helpFile) return WinHelpA( hWnd, NULL, command, dwData );
+
+    len = WideCharToMultiByte( CP_ACP, 0, helpFile, -1, NULL, 0, NULL, NULL );
+    if ((file = HeapAlloc( GetProcessHeap(), 0, len )))
+    {
+        WideCharToMultiByte( CP_ACP, 0, helpFile, -1, file, len, NULL, NULL );
+        ret = WinHelpA( hWnd, file, command, dwData );
+        HeapFree( GetProcessHeap(), 0, file );
+    }
     return ret;
 }