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

hhctrl.ocx: Don't use doWinMain in HtmlHelpW.

This commit is contained in:
Jacek Caban 2007-02-28 03:53:37 +01:00 committed by Alexandre Julliard
parent ae9c043d87
commit 8cef086337
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,8 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine);
HINSTANCE hhctrl_hinstance; HINSTANCE hhctrl_hinstance;
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved)
@ -87,33 +85,34 @@ static const char *command_to_string(UINT command)
HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data)
{ {
CHAR *file = NULL;
TRACE("(%p, %s, command=%s, data=%d)\n", TRACE("(%p, %s, command=%s, data=%d)\n",
caller, debugstr_w( filename ), caller, debugstr_w( filename ),
command_to_string( command ), data); command_to_string( command ), data);
if (filename)
{
DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
file = hhctrl_alloc(len);
WideCharToMultiByte( CP_ACP, 0, filename, -1, file, len, NULL, NULL );
}
switch (command) switch (command)
{ {
case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOPIC:
case HH_DISPLAY_TOC: case HH_DISPLAY_TOC:
case HH_DISPLAY_SEARCH: case HH_DISPLAY_SEARCH:
case HH_HELP_CONTEXT: case HH_HELP_CONTEXT: {
FIXME("Not all HH cases handled correctly\n"); HHInfo *info;
doWinMain(GetModuleHandleW(NULL), file); BOOL res;
break;
default: FIXME("Not all HH cases handled correctly\n");
FIXME("HH case %s not handled.\n", command_to_string( command ));
info = CreateHelpViewer(filename);
res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile);
if(!res)
ReleaseHelpViewer(info);
return NULL; /* FIXME */
} }
hhctrl_free(file); default:
FIXME("HH case %s not handled.\n", command_to_string( command ));
}
return 0; return 0;
} }