April 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tests: Remove tests failing on most platforms.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: 946936c2742849e77d71f3d566afedfab60ec183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946936c2742849e77d71f3d56… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 23 11:51:41 2009 +0400 comctl32/tests: Remove tests failing on most platforms. --- dlls/comctl32/tests/listview.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 61dca76..6482c74 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -994,11 +994,6 @@ static void test_create(void) ok(!IsWindow(hHeader), "Header shouldn't be created\n"); ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); - expect(0, rect.left); - expect(0, rect.right); - expect(0, rect.top); - expect(0, rect.bottom); - DestroyWindow(hList); }

1 0

Łukasz Wojniłowicz : kernel32: Added Polish translations.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: 1e0caf7dfde02a8bedeae01ae7999f3e338b9653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0caf7dfde02a8bedeae01ae… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Apr 21 22:41:54 2009 +0200 kernel32: Added Polish translations. --- .gitignore | 2 + dlls/kernel32/Makefile.in | 4 +- dlls/kernel32/nls/plk.nls | 36 +- dlls/kernel32/nls/winerr_nld.mc.rc | 2286 ---------------------- dlls/kernel32/nls/winerr_plk.mc | 3730 ++++++++++++++++++++++++++++++++++++ 5 files changed, 3753 insertions(+), 2305 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e0caf7dfde02a8bedeae…

1 0

Alexandre Julliard : dbghelp: Add a few more 64-bit symbol functions.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: 329c22f32392ccee09a35d688adbee5485d1bd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329c22f32392ccee09a35d688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 12:41:29 2009 +0200 dbghelp: Add a few more 64-bit symbol functions. --- dlls/dbghelp/dbghelp.spec | 8 +++--- dlls/dbghelp/symbol.c | 57 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index d7c7faa..63a107c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -118,11 +118,11 @@ @ stdcall SymGetSymFromAddr(long long ptr ptr) @ stdcall SymGetSymFromAddr64(long double ptr ptr) @ stdcall SymGetSymFromName(long str ptr) -@ stub SymGetSymFromName64 +@ stdcall SymGetSymFromName64(long str ptr) @ stdcall SymGetSymNext(long ptr) -@ stub SymGetSymNext64 +@ stdcall SymGetSymNext64(long ptr) @ stdcall SymGetSymPrev(long ptr) -@ stub SymGetSymPrev64 +@ stdcall SymGetSymPrev64(long ptr) @ stub SymGetSymbolFile @ stub SymGetSymbolFileW @ stdcall SymGetTypeFromName(ptr double str ptr) @@ -180,7 +180,7 @@ # @ stub SymSetSymWithAddr64 no longer present ?? @ stub SymSetSymWithAddr64 @ stdcall SymUnDName(ptr str long) -@ stub SymUnDName64 +@ stdcall SymUnDName64(ptr str long) @ stdcall SymUnloadModule(long long) @ stdcall SymUnloadModule64(long double) @ stdcall UnDecorateSymbolName(str str long long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ce3b842..3e70e85 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1350,6 +1350,28 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) } /*********************************************************************** + * SymGetSymFromName64 (DBGHELP.@) + */ +BOOL WINAPI SymGetSymFromName64(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL64 Symbol) +{ + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; + SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; + size_t len; + + if (Symbol->SizeOfStruct < sizeof(*Symbol)) return FALSE; + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = MAX_SYM_NAME; + if (!SymFromName(hProcess, Name, si)) return FALSE; + + Symbol->Address = si->Address; + Symbol->Size = si->Size; + Symbol->Flags = si->Flags; + len = min(Symbol->MaxNameLength, si->MaxNameLen); + lstrcpynA(Symbol->Name, si->Name, len); + return TRUE; +} + +/*********************************************************************** * SymGetSymFromName (DBGHELP.@) */ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symbol) @@ -1407,9 +1429,9 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } /*********************************************************************** - * SymGetSymNext (DBGHELP.@) + * SymGetSymNext64 (DBGHELP.@) */ -BOOL WINAPI SymGetSymNext(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) +BOOL WINAPI SymGetSymNext64(HANDLE hProcess, PIMAGEHLP_SYMBOL64 Symbol) { /* algo: * get module from Symbol.Address @@ -1423,9 +1445,28 @@ BOOL WINAPI SymGetSymNext(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) } /*********************************************************************** - * SymGetSymPrev (DBGHELP.@) + * SymGetSymNext (DBGHELP.@) */ +BOOL WINAPI SymGetSymNext(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) +{ + FIXME("(%p, %p): stub\n", hProcess, Symbol); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SymGetSymPrev64 (DBGHELP.@) + */ +BOOL WINAPI SymGetSymPrev64(HANDLE hProcess, PIMAGEHLP_SYMBOL64 Symbol) +{ + FIXME("(%p, %p): stub\n", hProcess, Symbol); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} +/*********************************************************************** + * SymGetSymPrev (DBGHELP.@) + */ BOOL WINAPI SymGetSymPrev(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) { FIXME("(%p, %p): stub\n", hProcess, Symbol); @@ -1685,7 +1726,15 @@ PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) */ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL sym, PSTR UnDecName, DWORD UnDecNameLength) { - TRACE("(%p %s %u)\n", sym, UnDecName, UnDecNameLength); + return UnDecorateSymbolName(sym->Name, UnDecName, UnDecNameLength, + UNDNAME_COMPLETE) != 0; +} + +/*********************************************************************** + * SymUnDName64 (DBGHELP.@) + */ +BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecNameLength) +{ return UnDecorateSymbolName(sym->Name, UnDecName, UnDecNameLength, UNDNAME_COMPLETE) != 0; }

1 0

Christian Costa : mciqtz32: Make sure the device is valid before starting the play.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: 7b1b498a31283558523ccc12f735d85299756bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1b498a31283558523ccc12f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 23 00:03:58 2009 +0200 mciqtz32: Make sure the device is valid before starting the play. --- dlls/mciqtz32/mciqtz.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 8222199..07b774c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -241,6 +241,8 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) {

1 0

Rein Klazes : comdlg32: Fix a crash in LookIn combo box WM_COMMAND message handler.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: 17e9174076b02e7e2d3f22c5f4b01e4290ae004f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e9174076b02e7e2d3f22c5f… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 23 08:25:13 2009 +0200 comdlg32: Fix a crash in LookIn combo box WM_COMMAND message handler. --- dlls/comdlg32/filedlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 4c2164d..8c8e230 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2787,6 +2787,8 @@ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode) iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB); + if( iItem == CB_ERR) return FALSE; + if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB, iItem))) return FALSE;

1 0

Alexandre Julliard : imagehlp: Forward some more 64-bit functions to dbghelp.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: bceedda955f7d38ccdfda07435c24e9d82cb75bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bceedda955f7d38ccdfda0743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 12:41:42 2009 +0200 imagehlp: Forward some more 64-bit functions to dbghelp. --- dlls/imagehlp/imagehlp.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 061d6a9..ddecb41 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -50,7 +50,7 @@ @ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules -@ stub SymEnumerateSymbols64 +@ stdcall SymEnumerateSymbols64(long double ptr ptr) dbghelp.SymEnumerateSymbols64 @ stdcall SymEnumerateSymbols(long long ptr ptr) dbghelp.SymEnumerateSymbols @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @@ -77,11 +77,11 @@ @ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath @ stdcall SymGetSymFromAddr64(long double ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr -@ stub SymGetSymFromName64 +@ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @ stdcall SymGetSymFromName(long str ptr) dbghelp.SymGetSymFromName -@ stub SymGetSymNext64 +@ stdcall SymGetSymNext64(long ptr) dbghelp.SymGetSymNext64 @ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext -@ stub SymGetSymPrev64 +@ stdcall SymGetSymPrev64(long ptr) dbghelp.SymGetSymPrev64 @ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev @ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName @ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo @@ -97,7 +97,7 @@ @ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext @ stdcall SymSetOptions(long) dbghelp.SymSetOptions @ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath -@ stub SymUnDName64 +@ stdcall SymUnDName64(ptr str long) dbghelp.SymUnDName64 @ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName @ stdcall SymUnloadModule64(long double) dbghelp.SymUnloadModule64 @ stdcall SymUnloadModule(long long) dbghelp.SymUnloadModule

1 0

Christian Costa : mciqtz32: Move MCIQTZ_mciGetOpenDev at the top and always use it.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: aa9550e6890a83dfc6ee2c78bbed4e192a9479d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9550e6890a83dfc6ee2c78b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 23 00:03:52 2009 +0200 mciqtz32: Move MCIQTZ_mciGetOpenDev at the top and always use it. --- dlls/mciqtz32/mciqtz.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 63b80f5..8222199 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -54,6 +54,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) } /************************************************************************** + * MCIQTZ_mciGetOpenDev [internal] + */ +static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) +{ + WINE_MCIQTZ* wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + + if (!wma) { + WARN("Invalid wDevID=%u\n", wDevID); + return NULL; + } + return wma; +} + +/************************************************************************** * MCIQTZ_drvOpen [internal] */ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) @@ -88,7 +102,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) /* finish all outstanding things */ MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); - wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); + wma = MCIQTZ_mciGetOpenDev(dwDevID); if (wma) { HeapFree(GetProcessHeap(), 0, wma); @@ -109,7 +123,7 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL); - wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); + wma = MCIQTZ_mciGetOpenDev(dwDevID); if (wma) { MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); @@ -119,20 +133,6 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) return 0; } -/************************************************************************** - * MCIQTZ_mciGetOpenDev [internal] - */ -static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) -{ - WINE_MCIQTZ* wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); - - if (!wma) { - WARN("Invalid wDevID=%u\n", wDevID); - return 0; - } - return wma; -} - /*************************************************************************** * MCIQTZ_mciOpen [internal] */ @@ -149,7 +149,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, if (!lpOpenParms) return MCIERR_NULL_PARAMETER_BLOCK; - wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID;

1 0

Christian Costa : mciqtz32: Stop the device only after param and device checks are done.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: fd80a7b7c44e91fd365e0204bd83ce0d46d2ff67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd80a7b7c44e91fd365e0204b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 23 00:04:04 2009 +0200 mciqtz32: Stop the device only after param and device checks are done. --- dlls/mciqtz32/mciqtz.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 07b774c..0435a11 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -99,12 +99,12 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) TRACE("(%04x)\n", dwDevID); - /* finish all outstanding things */ - MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); - wma = MCIQTZ_mciGetOpenDev(dwDevID); if (wma) { + /* finish all outstanding things */ + MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); + HeapFree(GetProcessHeap(), 0, wma); return 1; } @@ -121,16 +121,15 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) TRACE("(%04x)\n", dwDevID); - MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL); - wma = MCIQTZ_mciGetOpenDev(dwDevID); + if (!wma) + return 0; - if (wma) { - MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); - return 1; - } + MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL); - return 0; + MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); + + return 1; } /*************************************************************************** @@ -144,8 +143,6 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - if (!lpOpenParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -153,6 +150,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, if (!wma) return MCIERR_INVALID_DEVICE_ID; + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&wma->pgraph); @@ -211,12 +210,12 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + if (wma->opened) { IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl); @@ -267,8 +266,6 @@ static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - if (!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -276,6 +273,8 @@ static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms if (!wma) return MCIERR_INVALID_DEVICE_ID; + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + if (dwFlags & MCI_SEEK_TO_START) { newpos = 0; } else if (dwFlags & MCI_SEEK_TO_END) {

1 0

Alexandre Julliard : winex11.drv: Don' t give focus to a minimized window upon take focus.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: eafc9caa8039aa837eb670d706e5f6a126ade6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafc9caa8039aa837eb670d70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 12:41:57 2009 +0200 winex11.drv: Don't give focus to a minimized window upon take focus. --- dlls/winex11.drv/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a5d2e85..c746546 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -462,6 +462,7 @@ static inline BOOL can_activate_window( HWND hwnd ) LONG style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + if (style & WS_MINIMIZE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; return !(style & WS_DISABLED); }

1 0

Colin Finck : mshtml: Fix the size passed to MultiByteToWideChar.
by Alexandre Julliard April 23, 2009

April 23, 2009

Module: wine Branch: master Commit: fcceb61fd07e2db39b136b19d7398b66ef85687e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcceb61fd07e2db39b136b19d… Author: Colin Finck <mail(a)colinfinck.de> Date: Wed Apr 22 21:31:48 2009 +0200 mshtml: Fix the size passed to MultiByteToWideChar. --- dlls/mshtml/install.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 15f6d93..2dd91d8 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -425,6 +425,7 @@ static LPWSTR get_url(void) HKEY hkey; DWORD res, type; DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); + DWORD returned_size; LPWSTR url; static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; @@ -437,15 +438,16 @@ static LPWSTR get_url(void) return NULL; url = heap_alloc(size); + returned_size = size; - res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &size); + res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) { heap_free(url); return NULL; } - if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { + if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { strcatW(url, v_formatW); MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), size/sizeof(WCHAR)-strlenW(url)); }

1 0