February 2007 - Wine-Commits

Jacek Caban : hhctrl.ocx: Added HH_HELP_CONTEXT implementation.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 736ef403a92ae4d0598d571efdb25bbad9958391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736ef403a92ae4d0598d571ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:55:39 2007 +0100 hhctrl.ocx: Added HH_HELP_CONTEXT implementation. --- dlls/hhctrl.ocx/chm.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/help.c | 29 +++++++++++++++++++++------ dlls/hhctrl.ocx/hhctrl.c | 30 +++++++++++++++++++++++++--- dlls/hhctrl.ocx/hhctrl.h | 2 + 4 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 8e9fcf8..7c3384e 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -146,6 +146,53 @@ static BOOL ReadChmSystem(CHMInfo *chm) return SUCCEEDED(hres); } +LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) +{ + IStream *ivb_stream; + DWORD size, read, i; + DWORD *buf; + LPCSTR ret = NULL; + HRESULT hres; + + static const WCHAR wszIVB[] = {'#','I','V','B',0}; + + hres = IStorage_OpenStream(chm->pStorage, wszIVB, NULL, STGM_READ, 0, &ivb_stream); + if(FAILED(hres)) { + WARN("Could not open #IVB stream: %08x\n", hres); + return NULL; + } + + hres = IStream_Read(ivb_stream, &size, sizeof(size), &read); + if(FAILED(hres)) { + WARN("Read failed: %08x\n", hres); + IStream_Release(ivb_stream); + return NULL; + } + + buf = hhctrl_alloc(size); + hres = IStream_Read(ivb_stream, buf, size, &read); + IStream_Release(ivb_stream); + if(FAILED(hres)) { + WARN("Read failed: %08x\n", hres); + hhctrl_free(buf); + return NULL; + } + + size /= 2*sizeof(DWORD); + + for(i=0; i<size; i++) { + if(buf[2*i] == index) { + ret = GetChmString(chm, buf[2*i+1]); + break; + } + } + + hhctrl_free(buf); + + TRACE("returning %s\n", debugstr_a(ret)); + return strdupAtoW(ret); +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index abbc0c5..baedf88 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -57,15 +57,32 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } +BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) +{ + VARIANT url; + HRESULT hres; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = SysAllocString(surl); + + hres = IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); + + VariantClear(&url); + + return SUCCEEDED(hres); +} + BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; WCHAR full_path[MAX_PATH]; - VARIANT url; + LPWSTR ptr; static const WCHAR url_format[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0}; + TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); + if (!info->web_browser) return FALSE; @@ -76,13 +93,11 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) wsprintfW(buf, url_format, full_path, index); - V_VT(&url) = VT_BSTR; - V_BSTR(&url) = SysAllocString(buf); - - IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); - VariantClear(&url); + /* FIXME: HACK */ + if((ptr = strchrW(buf, '#'))) + *ptr = 0; - return TRUE; + return NavigateToUrl(info, buf); } /* Size Bar */ diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index ec3cf74..de66a8a 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -2,6 +2,7 @@ * hhctrl implementation * * Copyright 2004 Krzysztof Foltman + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); HINSTANCE hhctrl_hinstance; -BOOL hh_process; +BOOL hh_process = FALSE; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { @@ -84,9 +85,11 @@ static const char *command_to_string(UINT command) #undef X } +/****************************************************************** + * HtmlHelpW (hhctrl.ocx.15) + */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { - TRACE("(%p, %s, command=%s, data=%d)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -95,8 +98,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: - case HH_DISPLAY_SEARCH: - case HH_HELP_CONTEXT: { + case HH_DISPLAY_SEARCH:{ HHInfo *info; BOOL res; @@ -110,6 +112,23 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) return NULL; /* FIXME */ } + case HH_HELP_CONTEXT: { + HHInfo *info; + LPWSTR url; + + info = CreateHelpViewer(filename); + if(!info) + return NULL; + + url = FindContextAlias(info->pCHMInfo, data); + if(!url) + return NULL; + + NavigateToUrl(info, url); + hhctrl_free(url); + + return NULL; /* FIXME */ + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } @@ -117,6 +136,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) return 0; } +/****************************************************************** + * HtmlHelpA (hhctrl.ocx.14) + */ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) { WCHAR *wfile = NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 0de19e2..f9d21f4 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -79,9 +79,11 @@ void DoPageAction(HHInfo*,DWORD); CHMInfo *OpenCHM(LPCWSTR szFile); BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +LPWSTR FindContextAlias(CHMInfo*,DWORD); HHInfo *CreateHelpViewer(LPCWSTR); void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToUrl(HHInfo*,LPCWSTR); BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); /* memory allocation functions */

1 0

Jacek Caban : hhctrl.ocx: Use HtmlHelpA in doWinMain.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 5d011551a315ec6bb0985cd723ca0b94cb5d4b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d011551a315ec6bb0985cd72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:55:00 2007 +0100 hhctrl.ocx: Use HtmlHelpA in doWinMain. --- dlls/hhctrl.ocx/hhctrl.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 0c50aba..ec3cf74 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -142,18 +142,11 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { MSG msg; - HHInfo *info; - LPWSTR filename = strdupAtoW(szCmdLine); hh_process = TRUE; /* FIXME: Check szCmdLine for bad arguments */ - info = CreateHelpViewer(filename); - hhctrl_free(filename); - if(!info) - return -1; - - NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); + HtmlHelpA(GetDesktopWindow(), szCmdLine, HH_DISPLAY_TOPIC, 0); while (GetMessageW(&msg, 0, 0, 0)) {

1 0

Jacek Caban : hhctrl.ocx: Don't use doWinMain in HtmlHelpW.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 8cef0863377ba2a2f52e8199cd07b78ffe6325a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cef0863377ba2a2f52e8199c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:53:37 2007 +0100 hhctrl.ocx: Don't use doWinMain in HtmlHelpW. --- dlls/hhctrl.ocx/hhctrl.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 031c997..0ab13bd 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); -int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine); - HINSTANCE hhctrl_hinstance; 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) { - CHAR *file = NULL; TRACE("(%p, %s, command=%s, data=%d)\n", caller, debugstr_w( filename ), command_to_string( command ), data); - if (filename) + switch (command) { - DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + case HH_DISPLAY_SEARCH: + case HH_HELP_CONTEXT: { + HHInfo *info; + BOOL res; - file = hhctrl_alloc(len); - WideCharToMultiByte( CP_ACP, 0, filename, -1, file, len, NULL, NULL ); - } + FIXME("Not all HH cases handled correctly\n"); - switch (command) - { - case HH_DISPLAY_TOPIC: - case HH_DISPLAY_TOC: - case HH_DISPLAY_SEARCH: - case HH_HELP_CONTEXT: - FIXME("Not all HH cases handled correctly\n"); - doWinMain(GetModuleHandleW(NULL), file); - break; - default: - 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; }

1 0

Jacek Caban : hhctrl.ocx: Release HHInfo on WM_CLOSE message.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: ae9c043d879f03926c0487d067dd12b8e2be3ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9c043d879f03926c0487d06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:52:39 2007 +0100 hhctrl.ocx: Release HHInfo on WM_CLOSE message. --- dlls/hhctrl.ocx/help.c | 6 ++++++ dlls/hhctrl.ocx/hhctrl.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index fb9eca8..e98eb82 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -627,6 +627,9 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA break; case WM_SIZE: return Help_OnSize(hWnd); + case WM_CLOSE: + ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA)); + return 0; case WM_DESTROY: PostQuitMessage(0); break; @@ -780,6 +783,9 @@ void ReleaseHelpViewer(HHInfo *info) ReleaseWebBrowser(info); + if(info->WinType.hwndHelp) + DestroyWindow(info->WinType.hwndHelp); + hhctrl_free(info); OleUninitialize(); } diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index b8c4f45..031c997 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -159,8 +159,6 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) DispatchMessageW(&msg); } - ReleaseHelpViewer(info); - return 0; }

1 0

Jacek Caban : hhctrl.ocx: Call PostQuitMessage only in hh.exe process.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 90fcc09d92c69feef8bcd25d2ea7fef177bca735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fcc09d92c69feef8bcd25d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:54:25 2007 +0100 hhctrl.ocx: Call PostQuitMessage only in hh.exe process. --- dlls/hhctrl.ocx/help.c | 3 ++- dlls/hhctrl.ocx/hhctrl.c | 3 +++ dlls/hhctrl.ocx/hhctrl.h | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e98eb82..abbc0c5 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -631,7 +631,8 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA)); return 0; case WM_DESTROY: - PostQuitMessage(0); + if(hh_process) + PostQuitMessage(0); break; default: diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 0ab13bd..0c50aba 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); HINSTANCE hhctrl_hinstance; +BOOL hh_process; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { @@ -144,6 +145,8 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) HHInfo *info; LPWSTR filename = strdupAtoW(szCmdLine); + hh_process = TRUE; + /* FIXME: Check szCmdLine for bad arguments */ info = CreateHelpViewer(filename); hhctrl_free(filename); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 9f2a9fa..0de19e2 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -142,5 +142,6 @@ static inline LPWSTR strdupAtoW(LPCSTR str) } extern HINSTANCE hhctrl_hinstance; +extern BOOL hh_process; #endif

1 0

Jacek Caban : hhctrl.ocx: Added DllGetClassObject stub implementation.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 8e98ca4727b5ea3504ea671cebd35ffa65353538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e98ca4727b5ea3504ea671ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:51:04 2007 +0100 hhctrl.ocx: Added DllGetClassObject stub implementation. --- dlls/hhctrl.ocx/hhctrl.c | 9 +++++++++ dlls/hhctrl.ocx/hhctrl.ocx.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 15e38ef..b8c4f45 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -163,3 +163,12 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) return 0; } + +/****************************************************************** + * DllGetClassObject (hhctrl.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/hhctrl.ocx/hhctrl.ocx.spec b/dlls/hhctrl.ocx/hhctrl.ocx.spec index 8d61a78..e9cd118 100644 --- a/dlls/hhctrl.ocx/hhctrl.ocx.spec +++ b/dlls/hhctrl.ocx/hhctrl.ocx.spec @@ -1,5 +1,6 @@ 13 stdcall doWinMain(long ptr) 14 stdcall HtmlHelpA(ptr ptr long long) 15 stdcall HtmlHelpW(ptr ptr long long) +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Jacek Caban : hhctrl.ocx: Remove redundant casts.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 74fffe66e4cea8db66ae7b43e9366a03f445b755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fffe66e4cea8db66ae7b43e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:50:14 2007 +0100 hhctrl.ocx: Remove redundant casts. --- dlls/hhctrl.ocx/help.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 14382c8..5e327ed 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -178,7 +178,7 @@ static void HH_RegisterSizeBarClass(HHInfo *pHHInfo) wcex.cbSize = sizeof(WNDCLASSEXW); wcex.style = 0; - wcex.lpfnWndProc = (WNDPROC)SizeBar_WndProc; + wcex.lpfnWndProc = SizeBar_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hhctrl_hinstance; @@ -285,7 +285,7 @@ static void HH_RegisterChildWndClass(HHInfo *pHHInfo) wcex.cbSize = sizeof(WNDCLASSEXW); wcex.style = 0; - wcex.lpfnWndProc = (WNDPROC)Child_WndProc; + wcex.lpfnWndProc = Child_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hhctrl_hinstance; @@ -658,7 +658,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) wcex.cbSize = sizeof(WNDCLASSEXW); wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = (WNDPROC)Help_WndProc; + wcex.lpfnWndProc = Help_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hhctrl_hinstance;

1 0

Jacek Caban : hhctrl.ocx: Clean up Help_WndProc.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 803cf4f40c7b14e3ce4d0b70cdd1d06a3d7e44c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803cf4f40c7b14e3ce4d0b70c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:51:59 2007 +0100 hhctrl.ocx: Clean up Help_WndProc. --- dlls/hhctrl.ocx/help.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5e327ed..fb9eca8 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); -static void Help_OnSize(HWND hWnd); +static LRESULT Help_OnSize(HWND hWnd); /* Window type defaults */ @@ -584,14 +584,14 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) /* Viewer Window */ -static void Help_OnSize(HWND hWnd) +static LRESULT Help_OnSize(HWND hWnd) { HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); DWORD dwSize; RECT rc; if (!pHHInfo) - return; + return 0; NP_GetNavigationRect(pHHInfo, &rc); SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0, @@ -613,32 +613,26 @@ static void Help_OnSize(HWND hWnd) /* Resize browser window taking the frame size into account */ dwSize = GetSystemMetrics(SM_CXFRAME); ResizeWebBrowser(pHHInfo, rc.right - dwSize, rc.bottom - dwSize); + + return 0; } static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - PAINTSTRUCT ps; - HDC hdc; - switch (message) { - case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) - TB_OnClick(hWnd, LOWORD(wParam)); - break; - case WM_SIZE: - Help_OnSize(hWnd); - break; - case WM_PAINT: - hdc = BeginPaint(hWnd, &ps); - EndPaint(hWnd, &ps); - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - - default: - return DefWindowProcW(hWnd, message, wParam, lParam); + case WM_COMMAND: + if (HIWORD(wParam) == BN_CLICKED) + TB_OnClick(hWnd, LOWORD(wParam)); + break; + case WM_SIZE: + return Help_OnSize(hWnd); + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcW(hWnd, message, wParam, lParam); } return 0;

1 0

Jacek Caban : hhctrl.ocx: Move doWinMain to hhctrl.c.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: e0b952b436086e396fd5f8f794913ea476bcbc9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b952b436086e396fd5f8f79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:49:20 2007 +0100 hhctrl.ocx: Move doWinMain to hhctrl.c. --- dlls/hhctrl.ocx/help.c | 31 +++---------------------------- dlls/hhctrl.ocx/hhctrl.c | 28 ++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.h | 4 ++++ 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 770b69a..14382c8 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -57,7 +57,7 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } -static BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) +BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; WCHAR full_path[MAX_PATH]; @@ -764,7 +764,7 @@ static BOOL CreateViewer(HHInfo *pHHInfo) return TRUE; } -static void ReleaseHelpViewer(HHInfo *info) +void ReleaseHelpViewer(HHInfo *info) { if (!info) return; @@ -790,7 +790,7 @@ static void ReleaseHelpViewer(HHInfo *info) OleUninitialize(); } -static HHInfo *CreateHelpViewer(LPCWSTR filename) +HHInfo *CreateHelpViewer(LPCWSTR filename) { HHInfo *info = hhctrl_alloc_zero(sizeof(HHInfo)); @@ -814,28 +814,3 @@ static HHInfo *CreateHelpViewer(LPCWSTR filename) return info; } - -/* FIXME: Check szCmdLine for bad arguments */ -int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) -{ - MSG msg; - HHInfo *info; - LPWSTR filename = strdupAtoW(szCmdLine); - - info = CreateHelpViewer(filename); - hhctrl_free(filename); - if(!info) - return -1; - - NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); - - while (GetMessageW(&msg, 0, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - ReleaseHelpViewer(info); - - return 0; -} diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 18e769f..15e38ef 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -135,3 +135,31 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) hhctrl_free(wfile); return result; } + +/****************************************************************** + * doWinMain (hhctrl.ocx.13) + */ +int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) +{ + MSG msg; + HHInfo *info; + LPWSTR filename = strdupAtoW(szCmdLine); + + /* FIXME: Check szCmdLine for bad arguments */ + info = CreateHelpViewer(filename); + hhctrl_free(filename); + if(!info) + return -1; + + NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); + + while (GetMessageW(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + ReleaseHelpViewer(info); + + return 0; +} diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 5d2bb0f..9f2a9fa 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -80,6 +80,10 @@ CHMInfo *OpenCHM(LPCWSTR szFile); BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +HHInfo *CreateHelpViewer(LPCWSTR); +void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); + /* memory allocation functions */ static inline void *hhctrl_alloc(size_t len)

1 0

Jacek Caban : hhctrl.ocx: Move more code from doWinMain.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 1a2456cc4ce28cbcdd5daf3dce13affa48dffd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2456cc4ce28cbcdd5daf3dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:48:45 2007 +0100 hhctrl.ocx: Move more code from doWinMain. --- dlls/hhctrl.ocx/chm.c | 4 +- dlls/hhctrl.ocx/help.c | 51 ++++++++++++++++++++++++--------------------- dlls/hhctrl.ocx/hhctrl.h | 19 ++++++++++++++++- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index d0498ff..8e9fcf8 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -151,7 +151,7 @@ static BOOL ReadChmSystem(CHMInfo *chm) * FIXME: There may be more than one window type in the file, so * add the ability to choose a certain window type */ -BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) +BOOL LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) { LARGE_INTEGER liOffset; IStorage *pStorage = pChmInfo->pStorage; @@ -209,7 +209,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile) CHMInfo *ret = hhctrl_alloc_zero(sizeof(CHMInfo)); - ret->szFile = szFile; + ret->szFile = strdupW(szFile); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 8196e4e..770b69a 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -24,7 +24,6 @@ #include "commctrl.h" #include "wininet.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "resource.h" @@ -737,7 +736,7 @@ static void HH_InitRequiredControls(DWORD dwControls) } /* Creates the whole package */ -static BOOL HH_CreateViewer(HHInfo *pHHInfo) +static BOOL CreateViewer(HHInfo *pHHInfo) { HH_CreateFont(pHHInfo); @@ -765,7 +764,7 @@ static BOOL HH_CreateViewer(HHInfo *pHHInfo) return TRUE; } -static void HH_Close(HHInfo *info) +static void ReleaseHelpViewer(HHInfo *info) { if (!info) return; @@ -786,43 +785,49 @@ static void HH_Close(HHInfo *info) CloseCHM(info->pCHMInfo); ReleaseWebBrowser(info); + + hhctrl_free(info); + OleUninitialize(); } -static HHInfo *HH_OpenHH(LPWSTR filename) +static HHInfo *CreateHelpViewer(LPCWSTR filename) { - HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); + HHInfo *info = hhctrl_alloc_zero(sizeof(HHInfo)); + + OleInitialize(NULL); + + info->pCHMInfo = OpenCHM(filename); + if(!info->pCHMInfo) { + ReleaseHelpViewer(info); + return NULL; + } - pHHInfo->pCHMInfo = OpenCHM(filename); - if(!pHHInfo->pCHMInfo) { - HH_Close(pHHInfo); + if (!LoadWinTypeFromCHM(info->pCHMInfo, &info->WinType)) { + ReleaseHelpViewer(info); return NULL; } - if (!CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, &pHHInfo->WinType)) { - HH_Close(pHHInfo); + if(!CreateViewer(info)) { + ReleaseHelpViewer(info); return NULL; } - return pHHInfo; + return info; } /* FIXME: Check szCmdLine for bad arguments */ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { MSG msg; - HHInfo *pHHInfo; + HHInfo *info; + LPWSTR filename = strdupAtoW(szCmdLine); - if (FAILED(OleInitialize(NULL))) + info = CreateHelpViewer(filename); + hhctrl_free(filename); + if(!info) return -1; - pHHInfo = HH_OpenHH(strdupAtoW(szCmdLine)); - if (!pHHInfo || !HH_CreateViewer(pHHInfo)) - { - OleUninitialize(); - return -1; - } - - NavigateToChm(pHHInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszFile); + NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); while (GetMessageW(&msg, 0, 0, 0)) { @@ -830,9 +835,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) DispatchMessageW(&msg); } - HH_Close(pHHInfo); - hhctrl_free(pHHInfo); - OleUninitialize(); + ReleaseHelpViewer(info); return 0; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 2c0b71d..5d2bb0f 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -1,5 +1,6 @@ /* * Copyright 2005 James Hawkins + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ #endif #include "wine/itss.h" +#include "wine/unicode.h" #define WB_GOBACK 0 #define WB_GOFORWARD 1 @@ -75,7 +77,7 @@ void ResizeWebBrowser(HHInfo*,DWORD,DWORD); void DoPageAction(HHInfo*,DWORD); CHMInfo *OpenCHM(LPCWSTR szFile); -BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); +BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); /* memory allocation functions */ @@ -105,6 +107,21 @@ static inline BOOL hhctrl_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR strdupW(LPCWSTR str) +{ + LPWSTR ret; + int size; + + if(!str) + return NULL; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = hhctrl_alloc(size); + memcpy(ret, str, size); + + return ret; +} + static inline LPWSTR strdupAtoW(LPCSTR str) { LPWSTR ret;

1 0