February 2007 - Wine-commits

Andrew Talbot : version: Constify a variable.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: b940df14087690eee260727f3be403c5ade0e763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b940df14087690eee260727f3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 23 16:21:21 2007 +0000 version: Constify a variable. --- dlls/version/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 84a7eed..56c9cd9 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); * Added this function to clean up the code. * *****************************************************************************/ -static void print_vffi_debug(VS_FIXEDFILEINFO *vffi) +static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi) { BOOL versioned_printer = FALSE;

1 0

Andrew Talbot : wineps.drv: Constify some variables.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: a46ad829e43d70f405c86a948e6a05dabae55b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46ad829e43d70f405c86a948… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 23 16:22:04 2007 +0000 wineps.drv: Constify some variables. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 8ec88b5..1bd56ca 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); static void *cupshandle = NULL; #endif -static PSDRV_DEVMODEA DefaultDevmode = +static const PSDRV_DEVMODEA DefaultDevmode = { { /* dmPublic */ /* dmDeviceName */ "Wine PostScript Driver", @@ -109,7 +109,7 @@ HINSTANCE PSDRV_hInstance = 0; HANDLE PSDRV_Heap = 0; static HFONT PSDRV_DefaultFont = 0; -static LOGFONTA DefaultLogFont = { +static const LOGFONTA DefaultLogFont = { 100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" };

1 0

Andrew Talbot : wininet: Constify some variables.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 46fc9c2e11700496b67ba98e03ba27595e535529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fc9c2e11700496b67ba98e0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 24 21:55:12 2007 +0000 wininet: Constify some variables. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05fd301..81ebdb9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -95,7 +95,7 @@ typedef enum { FTP_CMD_QUIT, } FTP_COMMAND; -static const CHAR *szFtpCommands[] = { +static const CHAR *const szFtpCommands[] = { "ACCT", "CWD", "DELE", diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 17e48c9..08c057d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -851,7 +851,7 @@ end: static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 ) { UINT n = 0, x; - static LPCSTR HTTP_Base64Enc = + static const CHAR HTTP_Base64Enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; while( len > 0 )

1 0

Alexandre Julliard : cmd: Remove execute permission on source files.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: cdca32c12ede98c87035ea432aa54a1cb829b576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdca32c12ede98c87035ea432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 12:51:55 2007 +0100 cmd: Remove execute permission on source files. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c old mode 100755 new mode 100644 diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c old mode 100755 new mode 100644 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h old mode 100755 new mode 100644 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c old mode 100755 new mode 100644

1 0

Jacek Caban : hhctrl.ocx: Added beginning #SYSTEM parsing code.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 5ed9be800d0469786db85d9e08989cf2d73ff174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed9be800d0469786db85d9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 23 03:31:13 2007 +0100 hhctrl.ocx: Added beginning #SYSTEM parsing code. --- dlls/hhctrl.ocx/chm.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 83599a1..d0498ff 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -72,6 +72,80 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) return chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); } +static BOOL ReadChmSystem(CHMInfo *chm) +{ + IStream *stream; + DWORD ver=0xdeadbeef, read, buf_size; + char *buf; + HRESULT hres; + + struct { + WORD code; + WORD len; + } entry; + + static const WCHAR wszSYSTEM[] = {'#','S','Y','S','T','E','M',0}; + + hres = IStorage_OpenStream(chm->pStorage, wszSYSTEM, NULL, STGM_READ, 0, &stream); + if(FAILED(hres)) { + WARN("Could not open #SYSTEM stream: %08x\n", hres); + return FALSE; + } + + IStream_Read(stream, &ver, sizeof(ver), &read); + TRACE("version is %x\n", ver); + + buf = hhctrl_alloc(8*sizeof(DWORD)); + buf_size = 8*sizeof(DWORD); + + while(1) { + hres = IStream_Read(stream, &entry, sizeof(entry), &read); + if(hres != S_OK) + break; + + if(entry.len > buf_size) + buf = hhctrl_realloc(buf, buf_size=entry.len); + + hres = IStream_Read(stream, buf, entry.len, &read); + if(hres != S_OK) + break; + + switch(entry.code) { + case 0x2: + TRACE("Default topic is %s\n", debugstr_an(buf, entry.len)); + break; + case 0x3: + TRACE("Title is %s\n", debugstr_an(buf, entry.len)); + break; + case 0x5: + TRACE("Default window is %s\n", debugstr_an(buf, entry.len)); + break; + case 0x6: + TRACE("Compiled file is %s\n", debugstr_an(buf, entry.len)); + break; + case 0x9: + TRACE("Version is %s\n", debugstr_an(buf, entry.len)); + break; + case 0xa: + TRACE("Time is %08x\n", *(DWORD*)buf); + break; + case 0xc: + TRACE("Number of info types: %d\n", *(DWORD*)buf); + break; + case 0xf: + TRACE("Check sum: %x\n", *(DWORD*)buf); + break; + default: + TRACE("unhandled code %x, size %x\n", entry.code, entry.len); + } + } + + hhctrl_free(buf); + IStream_Release(stream); + + return SUCCEEDED(hres); +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so @@ -158,6 +232,11 @@ CHMInfo *OpenCHM(LPCWSTR szFile) return CloseCHM(ret); } + if(!ReadChmSystem(ret)) { + WARN("Could not read #SYSTEM\n"); + return CloseCHM(ret); + } + return ret; }

1 0

Bang Jun-Young : README: Fully revise Korean translation.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: cbd54cfd6a89a9c60eeadae4652cfa9505819b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd54cfd6a89a9c60eeadae46… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Thu Feb 22 18:36:17 2007 +0900 README: Fully revise Korean translation. --- documentation/README.ko | 263 +++++++++++++++++++++++------------------------ 1 files changed, 128 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbd54cfd6a89a9c60eead…

1 0

Jacek Caban : hhctrl.ocx: Handle memory allocation in OpenCHM and CloseCHM.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 1711c3a5c473d5b011e67f32a25b7fad9645df73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1711c3a5c473d5b011e67f32a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 23 03:30:38 2007 +0100 hhctrl.ocx: Handle memory allocation in OpenCHM and CloseCHM. --- dlls/hhctrl.ocx/chm.c | 60 +++++++++++++++++++++++++++------------------ dlls/hhctrl.ocx/help.c | 15 ++++++----- dlls/hhctrl.ocx/hhctrl.h | 4 +- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 9fc98c6..83599a1 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -127,48 +127,60 @@ done: } /* Opens the CHM file for reading */ -BOOL CHM_OpenCHM(CHMInfo *pChmInfo, LPCWSTR szFile) +CHMInfo *OpenCHM(LPCWSTR szFile) { HRESULT hres; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; - pChmInfo->szFile = szFile; + CHMInfo *ret = hhctrl_alloc_zero(sizeof(CHMInfo)); - if (FAILED(CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, - &IID_IITStorage, (void **) &pChmInfo->pITStorage))) - return FALSE; + ret->szFile = szFile; - if (FAILED(IITStorage_StgOpenStorage(pChmInfo->pITStorage, szFile, NULL, - STGM_READ | STGM_SHARE_DENY_WRITE, - NULL, 0, &pChmInfo->pStorage))) - return FALSE; + hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, + &IID_IITStorage, (void **) &ret->pITStorage) ; + if(FAILED(hres)) { + WARN("Could not create ITStorage: %08x\n", hres); + return CloseCHM(ret); + } - hres = IStorage_OpenStream(pChmInfo->pStorage, wszSTRINGS, NULL, STGM_READ, 0, - &pChmInfo->strings_stream); + hres = IITStorage_StgOpenStorage(ret->pITStorage, szFile, NULL, + STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &ret->pStorage); if(FAILED(hres)) { - WARN("Could not open #STRINGS stream: %08x\n", hres); - return FALSE; + WARN("Could not open storage: %08x\n", hres); + return CloseCHM(ret); } - pChmInfo->strings = NULL; - pChmInfo->strings_size = 0; + hres = IStorage_OpenStream(ret->pStorage, wszSTRINGS, NULL, STGM_READ, 0, + &ret->strings_stream); + if(FAILED(hres)) { + WARN("Could not open #STRINGS stream: %08x\n", hres); + return CloseCHM(ret); + } - return TRUE; + return ret; } -void CHM_CloseCHM(CHMInfo *pCHMInfo) +CHMInfo *CloseCHM(CHMInfo *chm) { - IITStorage_Release(pCHMInfo->pITStorage); - IStorage_Release(pCHMInfo->pStorage); - IStream_Release(pCHMInfo->strings_stream); + if(chm->pITStorage) + IITStorage_Release(chm->pITStorage); - if(pCHMInfo->strings_size) { + if(chm->pStorage) + IStorage_Release(chm->pStorage); + + if(chm->strings_stream) + IStream_Release(chm->strings_stream); + + if(chm->strings_size) { int i; - for(i=0; i<pCHMInfo->strings_size; i++) - hhctrl_free(pCHMInfo->strings[i]); + for(i=0; i<chm->strings_size; i++) + hhctrl_free(chm->strings[i]); } - hhctrl_free(pCHMInfo->strings); + hhctrl_free(chm->strings); + hhctrl_free(chm); + + return NULL; } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 0e5d4bd..e018c14 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -800,10 +800,7 @@ static void HH_Close(HHInfo *pHHInfo) hhctrl_free(pHHInfo->pHHWinType); if (pHHInfo->pCHMInfo) - { - CHM_CloseCHM(pHHInfo->pCHMInfo); - hhctrl_free(pHHInfo->pCHMInfo); - } + CloseCHM(pHHInfo->pCHMInfo); if (pHHInfo->pWBInfo) { @@ -816,12 +813,16 @@ static HHInfo *HH_OpenHH(LPWSTR filename) { HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); + pHHInfo->pCHMInfo = OpenCHM(filename); + if(!pHHInfo->pCHMInfo) { + HH_Close(pHHInfo); + return NULL; + } + pHHInfo->pHHWinType = hhctrl_alloc_zero(sizeof(HH_WINTYPEW)); - pHHInfo->pCHMInfo = hhctrl_alloc(sizeof(CHMInfo)); pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); - if (!CHM_OpenCHM(pHHInfo->pCHMInfo, filename) - || !CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, pHHInfo->pHHWinType)) { + if (!CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, pHHInfo->pHHWinType)) { HH_Close(pHHInfo); return NULL; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 355fc02..23803b1 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -70,9 +70,9 @@ void WB_UnEmbedBrowser(WBInfo *pWBInfo); void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight); void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction); -BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile); +CHMInfo *OpenCHM(LPCWSTR szFile); BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); -void CHM_CloseCHM(CHMInfo *pCHMInfo); +CHMInfo *CloseCHM(CHMInfo *pCHMInfo); /* memory allocation functions */

1 0

Jacek Caban : hhctrl.ocx: Use hhctrl.ocx's HINSTANCE.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 0262fb54891b0831d88d6a6e229fd53fa19fdec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0262fb54891b0831d88d6a6e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:57:40 2007 +0100 hhctrl.ocx: Use hhctrl.ocx's HINSTANCE. --- dlls/hhctrl.ocx/help.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index cfb4b90..6b40baa 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -48,7 +48,6 @@ typedef struct tagHHInfo HH_WINTYPEW *pHHWinType; CHMInfo *pCHMInfo; WBInfo *pWBInfo; - HINSTANCE hInstance; LPWSTR szCmdLine; HWND hwndTabCtrl; HWND hwndSizeBar; @@ -196,7 +195,7 @@ static void HH_RegisterSizeBarClass(HHInfo *pHHInfo) wcex.lpfnWndProc = (WNDPROC)SizeBar_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; - wcex.hInstance = pHHInfo->hInstance; + wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_SIZEWE); wcex.hbrBackground = (HBRUSH)(COLOR_MENU + 1); @@ -233,7 +232,7 @@ static BOOL HH_AddSizeBar(HHInfo *pHHInfo) hWnd = CreateWindowExW(dwExStyles, szSizeBarClass, szEmpty, dwStyles, rc.left, rc.top, rc.right, rc.bottom, - hwndParent, NULL, pHHInfo->hInstance, NULL); + hwndParent, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -303,7 +302,7 @@ static void HH_RegisterChildWndClass(HHInfo *pHHInfo) wcex.lpfnWndProc = (WNDPROC)Child_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; - wcex.hInstance = pHHInfo->hInstance; + wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); @@ -437,7 +436,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) hToolbar = CreateWindowExW(dwExStyles, TOOLBARCLASSNAMEW, NULL, dwStyles, 0, 0, 0, 0, hwndParent, NULL, - pHHInfo->hInstance, NULL); + hhctrl_hinstance, NULL); if (!hToolbar) return FALSE; @@ -520,7 +519,7 @@ static BOOL HH_AddNavigationPane(HHInfo *pHHInfo) hWnd = CreateWindowExW(dwExStyles, szChildClass, szEmpty, dwStyles, rc.left, rc.top, rc.right, rc.bottom, - hwndParent, NULL, pHHInfo->hInstance, NULL); + hwndParent, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -528,21 +527,21 @@ static BOOL HH_AddNavigationPane(HHInfo *pHHInfo) 0, TAB_TOP_PADDING, rc.right - TAB_RIGHT_PADDING, rc.bottom - TAB_TOP_PADDING, - hWnd, NULL, pHHInfo->hInstance, NULL); + hWnd, NULL, hhctrl_hinstance, NULL); if (!hwndTabCtrl) return FALSE; if (*pHHInfo->pHHWinType->pszToc) - NP_CreateTab(pHHInfo->hInstance, hwndTabCtrl, IDS_CONTENTS, dwIndex++); + NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_CONTENTS, dwIndex++); if (*pHHInfo->pHHWinType->pszIndex) - NP_CreateTab(pHHInfo->hInstance, hwndTabCtrl, IDS_INDEX, dwIndex++); + NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_INDEX, dwIndex++); if (pHHInfo->pHHWinType->fsWinProperties & HHWIN_PROP_TAB_SEARCH) - NP_CreateTab(pHHInfo->hInstance, hwndTabCtrl, IDS_SEARCH, dwIndex++); + NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_SEARCH, dwIndex++); if (pHHInfo->pHHWinType->fsWinProperties & HHWIN_PROP_TAB_FAVORITES) - NP_CreateTab(pHHInfo->hInstance, hwndTabCtrl, IDS_FAVORITES, dwIndex++); + NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_FAVORITES, dwIndex++); SendMessageW(hwndTabCtrl, WM_SETFONT, (WPARAM)pHHInfo->hFont, TRUE); @@ -580,7 +579,7 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) hWnd = CreateWindowExW(dwExStyles, szChildClass, szEmpty, dwStyles, rc.left, rc.top, rc.right, rc.bottom, - hwndParent, NULL, pHHInfo->hInstance, NULL); + hwndParent, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -662,7 +661,6 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *pHHInfo) { HWND hWnd; - HINSTANCE hInstance = pHHInfo->hInstance; RECT winPos = pHHInfo->pHHWinType->rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -677,7 +675,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *pHHInfo) wcex.lpfnWndProc = (WNDPROC)Help_WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; + wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_MENU + 1); @@ -716,7 +714,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *pHHInfo) } hWnd = CreateWindowExW(dwExStyles, windowClassW, pHHInfo->pHHWinType->pszCaption, - dwStyles, x, y, width, height, NULL, NULL, hInstance, NULL); + dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -780,14 +778,13 @@ static BOOL HH_CreateViewer(HHInfo *pHHInfo) return TRUE; } -static HHInfo *HH_OpenHH(HINSTANCE hInstance, LPWSTR szCmdLine) +static HHInfo *HH_OpenHH(LPWSTR szCmdLine) { HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); pHHInfo->pHHWinType = hhctrl_alloc_zero(sizeof(HH_WINTYPEW)); pHHInfo->pCHMInfo = hhctrl_alloc(sizeof(CHMInfo)); pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); - pHHInfo->hInstance = hInstance; pHHInfo->szCmdLine = szCmdLine; return pHHInfo; @@ -849,7 +846,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) if (FAILED(OleInitialize(NULL))) return -1; - pHHInfo = HH_OpenHH(hInstance, strdupAtoW(szCmdLine)); + pHHInfo = HH_OpenHH(strdupAtoW(szCmdLine)); if (!pHHInfo || !HH_OpenCHM(pHHInfo) || !HH_CreateViewer(pHHInfo)) { OleUninitialize();

1 0

Jacek Caban : hhctrl.ocx: Move HH_OpenCHM implementation to HH_Open.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 976f2db58d780e3cf082daae5abf86b97195e2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976f2db58d780e3cf082daae5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 23 03:30:02 2007 +0100 hhctrl.ocx: Move HH_OpenCHM implementation to HH_Open. --- dlls/hhctrl.ocx/help.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 6b40baa..0e5d4bd 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -48,7 +48,6 @@ typedef struct tagHHInfo HH_WINTYPEW *pHHWinType; CHMInfo *pCHMInfo; WBInfo *pWBInfo; - LPWSTR szCmdLine; HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont; @@ -778,18 +777,6 @@ static BOOL HH_CreateViewer(HHInfo *pHHInfo) return TRUE; } -static HHInfo *HH_OpenHH(LPWSTR szCmdLine) -{ - HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); - - pHHInfo->pHHWinType = hhctrl_alloc_zero(sizeof(HH_WINTYPEW)); - pHHInfo->pCHMInfo = hhctrl_alloc(sizeof(CHMInfo)); - pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); - pHHInfo->szCmdLine = szCmdLine; - - return pHHInfo; -} - static void HH_Close(HHInfo *pHHInfo) { if (!pHHInfo) @@ -811,7 +798,6 @@ static void HH_Close(HHInfo *pHHInfo) } hhctrl_free(pHHInfo->pHHWinType); - hhctrl_free(pHHInfo->szCmdLine); if (pHHInfo->pCHMInfo) { @@ -826,15 +812,21 @@ static void HH_Close(HHInfo *pHHInfo) } } -static BOOL HH_OpenCHM(HHInfo *pHHInfo) +static HHInfo *HH_OpenHH(LPWSTR filename) { - if (!CHM_OpenCHM(pHHInfo->pCHMInfo, pHHInfo->szCmdLine)) - return FALSE; + HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); - if (!CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, pHHInfo->pHHWinType)) - return FALSE; + pHHInfo->pHHWinType = hhctrl_alloc_zero(sizeof(HH_WINTYPEW)); + pHHInfo->pCHMInfo = hhctrl_alloc(sizeof(CHMInfo)); + pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); - return TRUE; + if (!CHM_OpenCHM(pHHInfo->pCHMInfo, filename) + || !CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, pHHInfo->pHHWinType)) { + HH_Close(pHHInfo); + return NULL; + } + + return pHHInfo; } /* FIXME: Check szCmdLine for bad arguments */ @@ -847,7 +839,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) return -1; pHHInfo = HH_OpenHH(strdupAtoW(szCmdLine)); - if (!pHHInfo || !HH_OpenCHM(pHHInfo) || !HH_CreateViewer(pHHInfo)) + if (!pHHInfo || !HH_CreateViewer(pHHInfo)) { OleUninitialize(); return -1;

1 0

Jacek Caban : hhctrl.ocx: Move DllMain to hhctrl.c.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 5faa1f6b1e371a77ea8de389fd386b50c66c1802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5faa1f6b1e371a77ea8de389f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:48:35 2007 +0100 hhctrl.ocx: Move DllMain to hhctrl.c. --- dlls/hhctrl.ocx/Makefile.in | 1 - dlls/hhctrl.ocx/hhctrl.c | 18 +++++++++++++++++ dlls/hhctrl.ocx/main.c | 45 ------------------------------------------- 3 files changed, 18 insertions(+), 46 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index d3dca8f..ae517c9 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ chm.c \ help.c \ hhctrl.c \ - main.c \ regsvr.c \ webbrowser.c diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 2881da0..445438d 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -27,6 +27,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine); +HINSTANCE hhctrl_hinstance; + +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + hhctrl_hinstance = hInstance; + DisableThreadLibraryCalls(hInstance); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + static const char *command_to_string(UINT command) { #define X(x) case x: return #x diff --git a/dlls/hhctrl.ocx/main.c b/dlls/hhctrl.ocx/main.c deleted file mode 100644 index 1faf1d0..0000000 --- a/dlls/hhctrl.ocx/main.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * HTML Help - * - * Copyright 2005 James Hawkins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); - -HINSTANCE hhctrl_hinstance; - -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - hhctrl_hinstance = hInstance; - DisableThreadLibraryCalls(hInstance); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -}

1 0