ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only do unicode conversion in HTML Help control when filename is 

specified.
This commit is contained in:
Mike Hearn 2005-04-11 12:47:40 +00:00 committed by Alexandre Julliard
parent 499a887d0f
commit f0d4fa0465
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/hhctrl.ocx/hhctrl.c
View File

@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data)
{ {
FIXME("(%p, %s, %d, %ld): stub\n", caller, debugstr_w(filename), command, data); FIXME("(%p, %s, command=%d, data=%ld): stub\n", caller, debugstr_w(filename), command, data);
/* if command is HH_DISPLAY_TOPIC just display an informative message for now */ /* if command is HH_DISPLAY_TOPIC just display an informative message for now */
if (command == HH_DISPLAY_TOPIC) if (command == HH_DISPLAY_TOPIC)
@ -45,12 +45,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data)
HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data)
{ {
WCHAR *wfile = NULL; WCHAR *wfile = NULL;
DWORD len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 );
HWND result; HWND result;
wfile = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR)); if (filename)
MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); {
DWORD len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 );
wfile = HeapAlloc( GetProcessHeap(), 0, (len+1) * sizeof(WCHAR));
MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len );
}
result = HtmlHelpW( caller, wfile, command, data ); result = HtmlHelpW( caller, wfile, command, data );
HeapFree( GetProcessHeap(), 0, wfile ); HeapFree( GetProcessHeap(), 0, wfile );