October 2006 - Wine-commits

Jacek Caban : ole32: Don't fail in OleCreate if created object doesn' t implement IRunnableObject or IOleChache.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 2abe8348fa907d201b60e726d774a8ccd21e237f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abe8348fa907d201b60e726d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 7 14:56:09 2006 +0200 ole32: Don't fail in OleCreate if created object doesn't implement IRunnableObject or IOleChache. --- dlls/ole32/ole2.c | 17 ++++++---- dlls/ole32/tests/ole2.c | 79 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c6df7ed..9779618 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2378,21 +2378,24 @@ HRESULT WINAPI OleCreate( { IRunnableObject *pRunnable; IOleCache *pOleCache; + HRESULT hres2; - hres = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); - if (SUCCEEDED(hres)) + hres2 = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); + if (SUCCEEDED(hres2)) { hres = IRunnableObject_Run(pRunnable, NULL); IRunnableObject_Release(pRunnable); } if (SUCCEEDED(hres)) - hres = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); - if (SUCCEEDED(hres)) { - DWORD dwConnection; - hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); - IOleCache_Release(pOleCache); + hres2 = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); + if (SUCCEEDED(hres2)) + { + DWORD dwConnection; + hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); + IOleCache_Release(pOleCache); + } } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index c7a3023..fe3a6a2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -32,8 +32,8 @@ #include "wine/test.h" #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr) static IPersistStorage OleObjectPersistStg; -static IOleCache OleObjectCache; -static IRunnableObject OleObjectRunnable; +static IOleCache *cache; +static IRunnableObject *runnable; static char const * const *expected_method_list; @@ -52,33 +52,24 @@ #define CHECK_EXPECTED_METHOD(method_nam static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) - { *ppv = (void *)iface; - IUnknown_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IPersistStorage)) - { *ppv = &OleObjectPersistStg; - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } else if (IsEqualIID(riid, &IID_IOleCache)) - { - *ppv = &OleObjectCache; - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } + *ppv = cache; else if (IsEqualIID(riid, &IID_IRunnableObject)) - { - *ppv = &OleObjectRunnable; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = runnable; + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } trace("OleObject_QueryInterface: returning E_NOINTERFACE\n"); - *ppv = NULL; return E_NOINTERFACE; } @@ -722,7 +713,41 @@ static void test_OleCreate(IStorage *pSt "OleObject_Release", NULL }; + static const char *methods_olerender_draw_no_runnable[] = + { + "OleObject_QueryInterface", + "OleObject_AddRef", + "OleObject_QueryInterface", + "OleObjectPersistStg_AddRef", + "OleObjectPersistStg_InitNew", + "OleObjectPersistStg_Release", + "OleObject_QueryInterface", + "OleObject_QueryInterface", + "OleObjectCache_AddRef", + "OleObjectCache_Cache", + "OleObjectCache_Release", + "OleObject_Release", + NULL + }; + static const char *methods_olerender_draw_no_cache[] = + { + "OleObject_QueryInterface", + "OleObject_AddRef", + "OleObject_QueryInterface", + "OleObjectPersistStg_AddRef", + "OleObjectPersistStg_InitNew", + "OleObjectPersistStg_Release", + "OleObject_QueryInterface", + "OleObjectRunnable_AddRef", + "OleObjectRunnable_Run", + "OleObjectRunnable_Release", + "OleObject_QueryInterface", + "OleObject_Release", + NULL + }; + runnable = &OleObjectRunnable; + cache = &OleObjectCache; expected_method_list = methods_olerender_none; trace("OleCreate with OLERENDER_NONE:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_NONE, NULL, NULL, pStorage, (void **)&pObject); @@ -756,6 +781,22 @@ static void test_OleCreate(IStorage *pSt IOleObject_Release(pObject); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + runnable = NULL; + expected_method_list = methods_olerender_draw_no_runnable; + trace("OleCreate with OLERENDER_DRAW (no IOlObjectRunnable):\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + + runnable = &OleObjectRunnable; + cache = NULL; + expected_method_list = methods_olerender_draw_no_cache; + trace("OleCreate with OLERENDER_DRAW (no IOlObjectRunnable):\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); trace("end\n"); }

1 0

Hans Leidekker : iphlpapi: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: f5095df935ce33f794b9e17dc0604114806d81b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5095df935ce33f794b9e17dc… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 7 20:18:10 2006 +0200 iphlpapi: Win64 printf format warning fixes. --- dlls/iphlpapi/Makefile.in | 1 dlls/iphlpapi/iphlpapi_main.c | 86 ++++++++++++++++++++------------------- dlls/iphlpapi/tests/Makefile.in | 1 dlls/iphlpapi/tests/iphlpapi.c | 80 ++++++++++++++++++------------------ 4 files changed, 83 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5095df935ce33f794b9e…

1 0

Paul Vriens : comdlg32: Move NULL check before use (Coverity).
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 06ec62d9c7ef16f74ea6473408dd21809cdb4d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ec62d9c7ef16f74ea647340… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Oct 7 16:48:49 2006 +0200 comdlg32: Move NULL check before use (Coverity). --- dlls/comdlg32/fontdlg16.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index a90dca2..3f3264f 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -174,12 +174,13 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1 LOGFONT16 *font16; SEGPTR lpTemplateName; - cf32w.lpLogFont=&lf32w; - CFn_CHOOSEFONT16to32W(lpChFont, &cf32w); - TRACE("ChooseFont\n"); + if (!lpChFont) return FALSE; + cf32w.lpLogFont=&lf32w; + CFn_CHOOSEFONT16to32W(lpChFont, &cf32w); + if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags);

1 0

Jacek Caban : mshtml: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: f3dbf490a7df11f6010c8c785f7ddb769dd40e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dbf490a7df11f6010c8c785… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 7 15:31:04 2006 +0200 mshtml: Win64 printf format warning fixes. --- dlls/mshtml/tests/Makefile.in | 1 dlls/mshtml/tests/htmldoc.c | 288 +++++++++++++++++++++-------------------- dlls/mshtml/tests/misc.c | 40 +++--- dlls/mshtml/tests/protocol.c | 158 +++++++++++----------- 4 files changed, 243 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3dbf490a7df11f6010c8…

1 0

Jacek Caban : urlmon: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 009996e7e3911fb230399af04294ca717c755deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=009996e7e3911fb230399af04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 7 15:30:28 2006 +0200 urlmon: Win64 printf format warning fixes. --- dlls/urlmon/tests/Makefile.in | 1 dlls/urlmon/tests/misc.c | 250 +++++++++++++++++++++-------------------- dlls/urlmon/tests/protocol.c | 122 ++++++++++---------- dlls/urlmon/tests/url.c | 90 +++++++-------- 4 files changed, 231 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=009996e7e3911fb230399…

1 0

Jacek Caban : shdocvw: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: ba139940da2864cfef9363811f75105af13027a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba139940da2864cfef9363811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 7 15:29:57 2006 +0200 shdocvw: Win64 printf format warning fixes. --- dlls/shdocvw/tests/Makefile.in | 1 dlls/shdocvw/tests/shortcut.c | 12 ++- dlls/shdocvw/tests/webbrowser.c | 150 ++++++++++++++++++++------------------- 3 files changed, 81 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba139940da2864cfef936…

1 0

Hans Leidekker : shlwapi/tests: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: a8ccd5816a7f910665b396c12c9f205c0c5e6a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ccd5816a7f910665b396c12… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Oct 6 12:43:34 2006 +0200 shlwapi/tests: Win64 printf format warning fixes. --- dlls/shlwapi/tests/Makefile.in | 1 dlls/shlwapi/tests/clist.c | 4 - dlls/shlwapi/tests/ordinal.c | 92 +++++++------- dlls/shlwapi/tests/path.c | 254 ++++++++++++++++++++-------------------- dlls/shlwapi/tests/shreg.c | 76 ++++++------ dlls/shlwapi/tests/string.c | 18 +-- 6 files changed, 222 insertions(+), 223 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ccd5816a7f910665b39…

1 0

Andrew Talbot : winefile: Cast-qual warnings fix.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 6e4c1501a42708aa05052e2b35c5801b1aae6ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4c1501a42708aa05052e2b3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Oct 7 15:50:46 2006 +0100 winefile: Cast-qual warnings fix. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 3ec614e..84d06de 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3048,7 +3048,7 @@ static void calc_width(Pane* pane, LPDRA { RECT rt = {0, 0, 0, 0}; - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX); + DrawText(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX); if (rt.right > pane->widths[col]) pane->widths[col] = rt.right; @@ -3061,7 +3061,7 @@ static void calc_tabbed_width(Pane* pane /* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); + DrawText(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); /*FIXME rt (0,0) ??? */ if (rt.right > pane->widths[col]) @@ -3079,7 +3079,7 @@ static void output_text(Pane* pane, LPDR rt.right = x+pane->positions[col+1]-Globals.spaceSize.cx; rt.bottom = dis->rcItem.bottom; - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|flags); + DrawText(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|flags); } static void output_tabbed_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str) @@ -3095,7 +3095,7 @@ static void output_tabbed_text(Pane* pan /* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); + DrawText(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); } static void output_number(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str)

1 0

Andrew Talbot : winebrowser: Cast-qual warnings fix.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 50e649087af516011f398b16e5c0fcf6f83b06ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e649087af516011f398b16e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Oct 6 20:41:16 2006 +0100 winebrowser: Cast-qual warnings fix. --- programs/winebrowser/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 690f931..165b54e 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -94,7 +94,7 @@ static int open_http_url( const char *ur if (r != ERROR_SUCCESS) { /* set value to the default */ - RegSetValueExA( key, "Browsers", 0, REG_SZ, (LPBYTE)defaultbrowsers, + RegSetValueExA( key, "Browsers", 0, REG_SZ, (const BYTE *)defaultbrowsers, lstrlen( defaultbrowsers ) + 1 ); strcpy( browsers, defaultbrowsers ); } @@ -126,7 +126,7 @@ static int open_mailto_url( const char * if (r != ERROR_SUCCESS) { /* set value to the default */ - RegSetValueExA( key, "Mailers", 0, REG_SZ, (LPBYTE)defaultmailers, + RegSetValueExA( key, "Mailers", 0, REG_SZ, (const BYTE *)defaultmailers, lstrlen( defaultmailers ) + 1 ); strcpy( mailers, defaultmailers ); }

1 0

Andrew Talbot : wineboot: Cast-qual warning fix.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 457ce21fcfd8d687fa5ef917a13e7d33e7515ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457ce21fcfd8d687fa5ef917a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Oct 6 20:34:29 2006 +0100 wineboot: Cast-qual warning fix. --- programs/wineboot/wineboot.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index d074533..1434003 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -547,12 +547,12 @@ static int ProcessWindowsFileProtection( { WIN32_FIND_DATA finddata; LPSTR custom_dllcache = NULL; - static const CHAR default_dllcache[] = "C:\\Windows\\System32\\dllcache"; + static CHAR default_dllcache[] = "C:\\Windows\\System32\\dllcache"; HANDLE find_handle; BOOL find_rc; DWORD rc; HKEY hkey; - LPCSTR dllcache; + LPSTR dllcache; CHAR find_string[MAX_PATH]; CHAR windowsdir[MAX_PATH]; @@ -574,7 +574,7 @@ static int ProcessWindowsFileProtection( dllcache = custom_dllcache; else dllcache = default_dllcache; - + strcpy(find_string,dllcache); strcat(find_string,"\\*.*"); @@ -603,7 +603,7 @@ static int ProcessWindowsFileProtection( windowsdir, currentpath, &sz, targetpath,&sz2); sz = MAX_PATH; rc = VerInstallFile(0, finddata.cFileName, finddata.cFileName, - (LPSTR) dllcache, targetpath, currentpath, tempfile,&sz); + dllcache, targetpath, currentpath, tempfile,&sz); if (rc != ERROR_SUCCESS) { WINE_ERR("WFP: %s error 0x%x\n",finddata.cFileName,rc);

1 0