wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jacek Caban : ieframe: Store embedder iface as IWebBrowser2 in DocHost.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: a8816f51d8c5e67f88cbcf98400e1859ed1dac6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8816f51d8c5e67f88cbcf984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:05 2012 +0100 ieframe: Store embedder iface as IWebBrowser2 in DocHost. --- dlls/ieframe/client.c | 6 +++--- dlls/ieframe/dochost.c | 8 ++++---- dlls/ieframe/ieframe.h | 4 ++-- dlls/ieframe/iexplore.c | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/ieframe/shellbrowser.c | 6 +++--- dlls/ieframe/webbrowser.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index 6a567ae..dd1d9db 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -471,7 +471,7 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); - hr = IDispatch_QueryInterface(This->disp, &IID_IOleObject, (void**)&wb_obj); + hr = IWebBrowser2_QueryInterface(This->wb, &IID_IOleObject, (void**)&wb_obj); if(SUCCEEDED(hr)) { hr = IOleObject_GetClientSite(wb_obj, &clientsite); if(SUCCEEDED(hr)) { @@ -663,12 +663,12 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IShellBrowser, guidService)) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ebc5978..d59c335 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -91,7 +91,7 @@ static void notif_complete(DocHost *This, DISPID dispid) V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->disp; + V_DISPATCH(params+1) = (IDispatch*)This->wb; V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); @@ -871,13 +871,13 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_OnRequestEdit }; -void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* container) +void DocHost_Init(DocHost *This, IWebBrowser2 *wb, const IDocHostContainerVtbl* container) { This->IDocHostUIHandler2_iface.lpVtbl = &DocHostUIHandler2Vtbl; This->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; This->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; - This->disp = disp; + This->wb = wb; This->container_vtbl = container; This->ready_state = READYSTATE_UNINITIALIZED; @@ -886,7 +886,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); - ConnectionPointContainer_Init(&This->cps, (IUnknown*)disp); + ConnectionPointContainer_Init(&This->cps, (IUnknown*)wb); IEHTMLWindow_Init(This); NewWindowManager_Init(This); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b7a7b02..60a65fb 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -118,7 +118,7 @@ struct DocHost { /* Interfaces of InPlaceFrame object */ IOleInPlaceFrame IOleInPlaceFrame_iface; - IDispatch *disp; + IWebBrowser2 *wb; IDispatch *client_disp; IDocHostUIHandler *hostui; @@ -231,7 +231,7 @@ void WebBrowser_ClassInfo_Init(WebBrowser*) DECLSPEC_HIDDEN; void WebBrowser_OleObject_Destroy(WebBrowser*) DECLSPEC_HIDDEN; -void DocHost_Init(DocHost*,IDispatch*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; +void DocHost_Init(DocHost*,IWebBrowser2*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; void DocHost_Release(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Init(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Release(DocHost*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index cbab8f5..2d9bca3 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,7 +789,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) ret->doc_host->ref = 1; ret->doc_host->ie = ret; - DocHost_Init(&ret->doc_host->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); InternetExplorer_WebBrowser_Init(ret); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index a12b195..6a74d2e 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -329,7 +329,7 @@ void handle_navigation_error(DocHost* doc_host, HRESULT hres, BSTR url, IHTMLWin V_BSTR(&var_url) = url; V_VT(params+4) = VT_DISPATCH; - V_DISPATCH(params+4) = doc_host->disp; + V_DISPATCH(params+4) = (IDispatch*)doc_host->wb; call_sink(doc_host->cps.wbe2, DISPID_NAVIGATEERROR, &dispparams); SysFreeString(V_BSTR(&var_frame_name)); @@ -551,7 +551,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->disp; + V_DISPATCH(params+6) = (IDispatch*)This->wb; call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index b97f3f9..86bba68 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -706,7 +706,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->doc_host->disp; + V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); @@ -751,7 +751,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; @@ -812,7 +812,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index ff026db..2d4d818 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1252,7 +1252,7 @@ static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void ret->ref = 1; ret->version = version; - DocHost_Init(&ret->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE;

1 0

Jacek Caban : ieframe: Added support for SID_SHTMLWindow in WebBrowser:: QueryService.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 39c1298958dd38fe98931d9e0e2dbb98ca7a4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c1298958dd38fe98931d9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:55:52 2012 +0100 ieframe: Added support for SID_SHTMLWindow in WebBrowser::QueryService. --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++------ dlls/ieframe/webbrowser.c | 9 ++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 8c12d39..516e0b8 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2697,21 +2697,25 @@ static void test_olecmd(IUnknown *unk, BOOL loaded) static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; + IUnknown *iface; HRESULT hres; - IUnknown *ret = NULL; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; - hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&ret); + hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&iface); ok(hres == E_FAIL, "QueryService returned %08x, expected E_FAIL\n", hres); - ok(ret == NULL, "ret returned %p, expected NULL\n", ret); + ok(!iface, "QueryService returned %p, expected NULL\n", iface); if(hres == S_OK) - { - IUnknown_Release(ret); - } + IUnknown_Release(iface); + + hres = IServiceProvider_QueryService(servprov, &SID_SHTMLWindow, &IID_IHTMLWindow2, (LPVOID*)&iface); + ok(hres == S_OK, "QueryService returned %08x, expected S_OK\n", hres); + ok(iface != NULL, "QueryService returned NULL\n"); + if(hres == S_OK) + IUnknown_Release(iface); IServiceProvider_Release(servprov); } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 706600d..ff026db 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1143,16 +1143,19 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider { WebBrowser *This = impl_from_IServiceProvider(iface); - if(*ppv) - ppv = NULL; + if(IsEqualGUID(&SID_SHTMLWindow, riid)) { + TRACE("(%p)->(SID_SHTMLWindow)\n", This); + return IHTMLWindow2_QueryInterface(&This->doc_host.html_window.IHTMLWindow2_iface, riid, ppv); + } if(IsEqualGUID(&IID_IBrowserService2, riid)) { TRACE("(%p)->(IID_IBrowserService2 return E_FAIL)\n", This); + *ppv = NULL; return E_FAIL; } FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - + *ppv = NULL; return E_NOINTERFACE; }

1 0

Alexandre Julliard : user32/tests: Fix some test failures on Windows.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 0702d31c81b2cd9267d68b003670a6fe2791386e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0702d31c81b2cd9267d68b003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:40:28 2012 +0100 user32/tests: Fix some test failures on Windows. --- dlls/user32/tests/msg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f40a0b..42f4c4f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13497,7 +13497,7 @@ static const struct message WmSetFocus_1[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, - { WM_NCACTIVATE, sent|wparam|parent, 1 }, + { WM_NCACTIVATE, sent|parent }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_ACTIVATE, sent|wparam|parent, 1 }, @@ -13573,7 +13573,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_focus = SetFocus((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetFocus on an invalid window", FALSE); ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); @@ -13602,7 +13603,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_active = SetActiveWindow((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", FALSE); ok(old_active == 0, "expected old focus 0, got %p\n", old_active);

1 0

Alexandre Julliard : gdi32/tests: Remove device capabilities test that fails on XP.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 62eaaa796b43aee366c47f00c8f9c6b229d95cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eaaa796b43aee366c47f00c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:27:41 2012 +0100 gdi32/tests: Remove device capabilities test that fails on XP. --- dlls/gdi32/tests/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 922907a..25d6982 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -284,7 +284,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) CURVECAPS, LINECAPS, POLYGONALCAPS, - TEXTCAPS, + /* TEXTCAPS broken on printer DC on winxp */ CLIPCAPS, RASTERCAPS, ASPECTX,

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 4777a1c1c97e90765610e6eb7840c68f11ff7482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777a1c1c97e90765610e6eb7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 8 16:11:22 2012 +0100 po: Update German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index e962a22..47813e9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-05 19:30+0100\n" +"PO-Revision-Date: 2012-01-08 16:10+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -1301,7 +1301,7 @@ msgstr "CPS" #: crypt32.rc:54 cryptdlg.rc:32 msgid "User Notice" -msgstr "Benutzerbenachrichtung" +msgstr "Benutzerbenachrichtigung" #: crypt32.rc:55 msgid "On-line Certificate Status Protocol" @@ -8771,7 +8771,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"Der Befehl kann nicht auf ein selbst öffnedes Gerät angewandt werden. Warten " +"Der Befehl kann nicht auf ein selbst öffnendes Gerät angewandt werden. Warten " "Sie, bis das Gerät geschlossen wurde und versuchen Sie es erneut." #: winmm.rc:99 @@ -13126,9 +13126,8 @@ msgid "&Color" msgstr "F&arbe" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Konfiguration " +msgstr "Konfiguration" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Jörg Höhle : mmdevapi: Round buffer size like native in shared mode.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: fcc9b74cb2c3d6433c20527b4c8b487fdd5cd6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b74cb2c3d6433c20527b4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:56:46 2012 +0100 mmdevapi: Round buffer size like native in shared mode. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 93ff3d6..19a505c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1006,7 +1006,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_ms = period / 10000; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(This->dataflow == eCapture){ int i; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 15bda6a..bc4d952 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -956,7 +956,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_us = period / 10; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Nikolay Sivov : shell32: Use S_OK as successful return code name.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: a4dd8fb6a8a1424d356aa3194030e1c5dd751db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dd8fb6a8a1424d356aa3194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:31:54 2012 +0300 shell32: Use S_OK as successful return code name. --- dlls/shell32/folders.c | 2 +- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/shelllink.c | 12 ++++++------ dlls/shell32/shellole.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shlfsbind.c | 4 ++-- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 4 ++-- dlls/shell32/shv_bg_cmenu.c | 4 ++-- dlls/shell32/shv_item_cmenu.c | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 379ffde..6f49a3d 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -381,7 +381,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); - return NOERROR; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c394e5b..2130b49 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1140,7 +1140,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: @@ -1199,7 +1199,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, pfd->cAlternateFileName[0] = '\0'; else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14)) pfd->cAlternateFileName[13] = 0; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2561f8c..5370b99 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -932,7 +932,7 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) { IUnknown * pUnk = ptr; IUnknown_Release(pUnk); - return NOERROR; + return S_OK; } return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 1fb3fbd..e325e2e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -509,11 +509,11 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile return r; } -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName) +static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR filename) { - IShellLinkImpl *This = impl_from_IPersistFile(iface); - FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName)); - return NOERROR; + IShellLinkImpl *This = impl_from_IPersistFile(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename)); + return S_OK; } static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) @@ -1597,7 +1597,7 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA *iface, INT iShowCmd) This->iShowCmd = iShowCmd; This->bDirty = TRUE; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR pszIconPath, @@ -1866,7 +1866,7 @@ static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR psz if( This->sArgs ) lstrcpynW( pszArgs, This->sArgs, cchMaxPath ); - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 49491a0..fbf917d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -507,7 +507,7 @@ HRESULT WINAPI SHCreateDefClassObject( if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY; *ppv = pcf; - return NOERROR; + return S_OK; } /************************************************************************* diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5b74c37..05105c5 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1162,7 +1162,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown) return E_FAIL; IUnknown_AddRef(SHELL32_IExplorerInterface); - return NOERROR; + return S_OK; } /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f3490c1..71d82c8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2961,7 +2961,7 @@ HRESULT WINAPI SHGetFolderLocation( } } if(*ppidl) - hr = NOERROR; + hr = S_OK; TRACE("-- (new pidl %p)\n",*ppidl); return hr; diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index ff13013..5988290 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -166,7 +166,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( return E_INVALIDARG; *pfd = This->findFile; - return NOERROR; + return S_OK; } static HRESULT WINAPI IFileSystemBindData_fnSetFindData( @@ -179,5 +179,5 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( This->findFile = *pfd; else memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); - return NOERROR; + return S_OK; } diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 4006807..476cbec 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -184,7 +184,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) LPITEMIDLIST pidlTemp = NULL; ULONG ulFetched; - while ((!bAbortInit) && (NOERROR == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) + while ((!bAbortInit) && (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) { if (SUCCEEDED (IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr))) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 787a1b7..191dfb1 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1998,7 +1998,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 *iface, LPFOLDERSE if (!lpfs) return E_INVALIDARG; *lpfs = This->FolderSettings; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 *iface, DWORD dwReserved, @@ -2559,7 +2559,7 @@ static HRESULT WINAPI ISVDropSource_QueryContinueDrag( else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON)) return DRAGDROP_S_DROP; else - return NOERROR; + return S_OK; } static HRESULT WINAPI ISVDropSource_GiveFeedback( diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b8f16b3..c2c6f08 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -372,7 +372,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( if (lpSV) IShellView_Release(lpSV); /* QueryActiveShellView does AddRef */ - return NOERROR; + return S_OK; } /************************************************************************** @@ -401,7 +401,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) { - return NOERROR; + return S_OK; } } } diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index f1a96cf..4c05460 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -535,7 +535,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( return E_FAIL; } } - return NOERROR; + return S_OK; } /************************************************************************** @@ -567,7 +567,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); - hr = NOERROR; + hr = S_OK; break; } break; @@ -579,14 +579,14 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = NOERROR; + hr = S_OK; break; } break; case GCS_VALIDATEA: case GCS_VALIDATEW: - hr = NOERROR; + hr = S_OK; break; } TRACE("-- (%p)->(name=%s)\n",This, lpszName);

1 0

Nikolay Sivov : shell32: Remove redundant loop to count already known value .
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 1e864366284065ffcb0fae7a10512c6059f95a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e864366284065ffcb0fae7a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:14:36 2012 +0300 shell32: Remove redundant loop to count already known value. --- dlls/shell32/shv_item_cmenu.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 8a97a6e..f1a96cf 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -73,20 +73,17 @@ static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) * ISvItemCm_CanRenameItems() */ static BOOL ISvItemCm_CanRenameItems(ItemCmImpl *This) -{ UINT i; - DWORD dwAttributes; +{ + DWORD attr; - TRACE("(%p)->()\n",This); + TRACE("(%p)\n", This); - if(This->apidl) - { - for(i = 0; i < This->cidl; i++){} - if(i > 1) return FALSE; /* can't rename more than one item at a time*/ - dwAttributes = SFGAO_CANRENAME; - IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); - return dwAttributes & SFGAO_CANRENAME; - } - return FALSE; + /* can't rename more than one item at a time*/ + if (!This->apidl || This->cidl > 1) return FALSE; + + attr = SFGAO_CANRENAME; + IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + return attr & SFGAO_CANRENAME; } /**************************************************************************

1 0

Nikolay Sivov : shell32: Store common menu data in a separate structure.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: beb89fd16097a516529cf8b8e98a9863f1e0b58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb89fd16097a516529cf8b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 02:49:19 2012 +0300 shell32: Store common menu data in a separate structure. --- dlls/shell32/shv_bg_cmenu.c | 7 ++- dlls/shell32/shv_item_cmenu.c | 99 +++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b67dc4d..b8f16b3 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -430,7 +430,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg( * IContextMenu2 VTable * */ -static const IContextMenu2Vtbl cmvt = +static const IContextMenu2Vtbl BackgroundContextMenuVtbl = { ISVBgCm_fnQueryInterface, ISVBgCm_fnAddRef, @@ -445,11 +445,12 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder *pSFParent, BOOL bDesktop) { BgCmImpl *cm; - cm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cm)); - cm->IContextMenu2_iface.lpVtbl = &cmvt; + cm = HeapAlloc(GetProcessHeap(), 0, sizeof(*cm)); + cm->IContextMenu2_iface.lpVtbl = &BackgroundContextMenuVtbl; cm->ref = 1; cm->pSFParent = pSFParent; cm->bDesktop = bDesktop; + cm->verb_offset = 0; if(pSFParent) IShellFolder_AddRef(pSFParent); TRACE("(%p)->()\n", cm); diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 604099c..8a97a6e 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -42,29 +42,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct +{ + IContextMenu2 IContextMenu2_iface; + LONG ref; + IShellFolder* parent; + UINT verb_offset; +} ContextMenu; + /************************************************************************** * IContextMenu Implementation */ typedef struct { - IContextMenu2 IContextMenu2_iface; - LONG ref; - IShellFolder* pSFParent; + ContextMenu menu; + LPITEMIDLIST pidl; /* root pidl */ LPITEMIDLIST *apidl; /* array of child pidls */ UINT cidl; BOOL bAllValues; - UINT verb_offset; } ItemCmImpl; static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) { - return CONTAINING_RECORD(iface, ItemCmImpl, IContextMenu2_iface); + return CONTAINING_RECORD(iface, ItemCmImpl, menu.IContextMenu2_iface); } - -static const IContextMenu2Vtbl cmvt; - /************************************************************************** * ISvItemCm_CanRenameItems() */ @@ -79,42 +83,13 @@ static BOOL ISvItemCm_CanRenameItems(ItemCmImpl *This) for(i = 0; i < This->cidl; i++){} if(i > 1) return FALSE; /* can't rename more than one item at a time*/ dwAttributes = SFGAO_CANRENAME; - IShellFolder_GetAttributesOf(This->pSFParent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); + IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); return dwAttributes & SFGAO_CANRENAME; } return FALSE; } /************************************************************************** -* ISvItemCm_Constructor() -*/ -IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) -{ ItemCmImpl* cm; - UINT u; - - cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ItemCmImpl)); - cm->IContextMenu2_iface.lpVtbl = &cmvt; - cm->ref = 1; - cm->pidl = ILClone(pidl); - cm->pSFParent = pSFParent; - - if(pSFParent) IShellFolder_AddRef(pSFParent); - - cm->apidl = _ILCopyaPidl(apidl, cidl); - cm->cidl = cidl; - - cm->bAllValues = 1; - for(u = 0; u < cidl; u++) - { - cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); - } - - TRACE("(%p)->()\n",cm); - - return &cm->IContextMenu2_iface; -} - -/************************************************************************** * ISvItemCm_fnQueryInterface */ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) @@ -152,7 +127,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) { ItemCmImpl *This = impl_from_IContextMenu2(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->menu.ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -165,7 +140,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { ItemCmImpl *This = impl_from_IContextMenu2(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG refCount = InterlockedDecrement(&This->menu.ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -173,8 +148,8 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { TRACE(" destroying IContextMenu(%p)\n",This); - if(This->pSFParent) - IShellFolder_Release(This->pSFParent); + if(This->menu.parent) + IShellFolder_Release(This->menu.parent); SHFree(This->pidl); @@ -229,7 +204,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - This->verb_offset=idCmdFirst; + This->menu.verb_offset=idCmdFirst; if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) { @@ -339,7 +314,7 @@ static void DoDelete(ItemCmImpl *This) { ISFHelper * psfhlp; - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); + IShellFolder_QueryInterface(This->menu.parent, &IID_ISFHelper, (LPVOID*)&psfhlp); if (psfhlp) { ISFHelper_DeleteItems(psfhlp, This->cidl, (LPCITEMIDLIST *)This->apidl); @@ -516,7 +491,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( if (HIWORD(lpcmi->lpVerb) == 0) { - switch(LOWORD(lpcmi->lpVerb-This->verb_offset)) + switch(LOWORD(lpcmi->lpVerb-This->menu.verb_offset)) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -547,7 +522,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( DoOpenProperties(This, lpcmi->hwnd); break; default: - FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->verb_offset); + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->menu.verb_offset); return E_INVALIDARG; } } @@ -591,7 +566,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( break; case GCS_VERBA: - switch(idCommand-This->verb_offset) + switch(idCommand-This->menu.verb_offset) { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); @@ -603,7 +578,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This case, you need to do the lstrcpyW to the pointer passed.*/ case GCS_VERBW: - switch(idCommand-This->verb_offset) + switch(idCommand-This->menu.verb_offset) { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); @@ -640,7 +615,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( return E_NOTIMPL; } -static const IContextMenu2Vtbl cmvt = +static const IContextMenu2Vtbl ItemContextMenuVtbl = { ISvItemCm_fnQueryInterface, ISvItemCm_fnAddRef, @@ -650,3 +625,29 @@ static const IContextMenu2Vtbl cmvt = ISvItemCm_fnGetCommandString, ISvItemCm_fnHandleMenuMsg }; + +IContextMenu2 *ISvItemCm_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) +{ ItemCmImpl* cm; + UINT u; + + cm = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemCmImpl)); + cm->menu.IContextMenu2_iface.lpVtbl = &ItemContextMenuVtbl; + cm->menu.ref = 1; + cm->menu.verb_offset = 0; + cm->menu.parent = parent; + + cm->pidl = ILClone(pidl); + + if (parent) IShellFolder_AddRef(parent); + + cm->apidl = _ILCopyaPidl(apidl, cidl); + cm->cidl = cidl; + + cm->bAllValues = 1; + for(u = 0; u < cidl; u++) + cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); + + TRACE("(%p)\n",cm); + + return &cm->menu.IContextMenu2_iface; +}

1 0

Daniel Lehman : kernel32: If string arg to FormatMessage is NULL, use "( null)" instead of crashing.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: b1f04e23bf361e06d239e03693c904a597b9a32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f04e23bf361e06d239e0369… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 10:48:44 2012 -0800 kernel32: If string arg to FormatMessage is NULL, use "(null)" instead of crashing. --- dlls/kernel32/format_msg.c | 9 ++++++--- dlls/kernel32/tests/format_msg.c | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index d6d19ff..b9e471f 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,15 +135,18 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, if (*format != '!') /* simple string */ { arg = get_arg( insert, flags, args ); - if (unicode_caller) + if (unicode_caller || !arg) { - WCHAR *str = (WCHAR *)arg; + static const WCHAR nullW[] = {'(','n','u','l','l',')',0}; + const WCHAR *str = (const WCHAR *)arg; + + if (!str) str = nullW; *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); strcpyW( *result, str ); } else { - char *str = (char *)arg; + const char *str = (const char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 37ea3e9..1f56440 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -125,6 +125,7 @@ static void test_message_from_string_wide(void) static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0}; static const WCHAR s_sp002sp003[] = {' ',' ','0','0','0','2',',',' ','0','0','0','0','3',0}; static const WCHAR s_sp001004[] = {' ',' ','0','0','1',',','0','0','0','0','0','4',0}; + static const WCHAR s_null[] = {'(','n','u','l','l',')',0}; static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'}; static const WCHAR broken_buf[] = {'t','e','s','t','x','x'}; @@ -381,6 +382,12 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* null string as argument */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ok(!lstrcmpW(s_null, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, @@ -700,6 +707,12 @@ static void test_message_from_string(void) ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* null string as argument */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!strcmp("(null)", out),"failed out=[%s]\n",out); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!",

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012