June 2011 - Wine-commits - list.winehq.org

Marcus Meissner : krnl386.exe16: pSeg might be NULL (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5574b64ede474cd63915a6b7708086446a4355b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5574b64ede474cd63915a6b77… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:16:02 2011 +0200 krnl386.exe16: pSeg might be NULL (Coverity). --- dlls/krnl386.exe16/dosmem.c | 2 +- dlls/krnl386.exe16/global.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index 1f1815b..3a06d8a 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -480,7 +480,7 @@ LPVOID DOSMEM_AllocBlock(UINT size, UINT16* pseg) curr = DOSMEM_root_block; if (!(psp = DOSVM_psp)) psp = MCB_PSP_DOS; - *pseg = 0; + if (pseg) *pseg = 0; TRACE( "(%04xh)\n", size ); diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 7f3807e..d9dcb1b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -362,7 +362,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( newptr = 0; else { - newptr = DOSMEM_AllocBlock( size, 0 ); + newptr = DOSMEM_AllocBlock( size, NULL ); if (newptr) { memcpy( newptr, ptr, oldsize );

1 0

Marcus Meissner : msi: Removed useless NULL check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 59f8cfeb22c0b1e900df0ccf3fa41fcb833a3545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f8cfeb22c0b1e900df0ccf3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:17:38 2011 +0200 msi: Removed useless NULL check (Coverity). --- dlls/msi/suminfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index ccde725..e0c99b8 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -516,9 +516,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, msiobj_release( &si->hdr ); } - if( db ) - msiobj_release( &db->hdr ); - + msiobj_release( &db->hdr ); return ret; }

1 0

Marcus Meissner : msi: Remove superflous NULL check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 90970651d3b20ea88018080bec81a65a4fb3b8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=90970651d3b20ea88018080be… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:24:25 2011 +0200 msi: Remove superflous NULL check (Coverity). --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2eb7983..f49feda 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -283,7 +283,7 @@ static LPWSTR msi_dialog_get_style( LPCWSTR p, LPCWSTR *rest ) return NULL; } - if (!p || !q) + if (!q) return NULL; *rest = ++q;

1 0

Huw Davies : gdi32: Simplify colour table generation.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 163dfd148b3e5972a4e2c3d2ef82b3107c2533f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163dfd148b3e5972a4e2c3d2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 27 13:26:41 2011 +0100 gdi32: Simplify colour table generation. --- dlls/gdi32/dib.c | 266 ++++++++++++++++++------------------------------------ 1 files changed, 89 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=163dfd148b3e5972a4e2c…

1 0

Jacek Caban : mshtml: Make sure we always create nsWineURI with valid IUri.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 69f4a1bf7653f0f604ef23faba088850ea36cfdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f4a1bf7653f0f604ef23fab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:19 2011 +0200 mshtml: Make sure we always create nsWineURI with valid IUri. --- dlls/mshtml/nsio.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b47a643..3222522 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -95,7 +95,7 @@ static BOOL ensure_uri(nsWineURI *This) return TRUE; } -static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -2111,14 +2111,12 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) } } - nsres = create_uri(nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); if(NS_FAILED(nsres)) { - WARN("create_uri failed: %08x\n", nsres); + WARN("create_nsuri failed: %08x\n", nsres); return nsres; } - wine_uri->uri = This->uri; - IUri_AddRef(wine_uri->uri); sync_wine_url(wine_uri); *_retval = (nsIURI*)&wine_uri->nsIURL_iface; @@ -2515,7 +2513,7 @@ static const nsIURLVtbl nsURLVtbl = { nsURL_GetRelativeSpec }; -static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) { nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); @@ -2526,6 +2524,9 @@ static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *conta set_uri_nscontainer(ret, container); set_uri_window(ret, window); + IUri_AddRef(iuri); + ret->uri = iuri; + if(nsuri) nsIURI_QueryInterface(nsuri, &IID_nsIURL, (void**)&ret->nsurl); @@ -2537,9 +2538,16 @@ static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *conta HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) { nsWineURI *uri; + IUri *iuri; nsresult nsres; + HRESULT hres; + + hres = CreateUri(url, 0, 0, &iuri); + if(FAILED(hres)) + return hres; - nsres = create_uri(NULL, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, NULL, window, window->doc_obj->nscontainer, &uri); + IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2586,22 +2594,24 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC HTMLWindow *window = NULL; nsChannel *channel; nsWineURI *uri; + IUri *iuri; nsresult nsres; HRESULT hres; + hres = CreateUri(url, 0, 0, &iuri); + if(FAILED(hres)) + return hres; + if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_uri(NULL, window, NULL, &uri); + nsres = create_nsuri(iuri, NULL, window, NULL, &uri); + IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; - hres = CreateUri(url, 0, 0, &uri->uri); - if(SUCCEEDED(hres)) - nsres = create_nschannel(uri, &channel); sync_wine_url(uri); + nsres = create_nschannel(uri, &channel); nsIURL_Release(&uri->nsIURL_iface); - if(FAILED(hres)) - return hres; if(NS_FAILED(nsres)) return E_FAIL; @@ -2918,14 +2928,13 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * return nsres; } - nsres = create_uri(uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, uri, window, NULL, &wine_uri); + IUri_Release(urlmon_uri); if(base_wine_uri) nsIURI_Release(&base_wine_uri->nsIURL_iface); if(NS_FAILED(nsres)) return nsres; - wine_uri->uri = urlmon_uri; - sync_wine_url(wine_uri); *_retval = (nsIURI*)wine_uri; return nsres;

1 0

Jacek Caban : mshtml: Added IUri-based nsIURI::SetPort implementation.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8f3c3ca35c795c3ed708cac87c936f14840e6bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3c3ca35c795c3ed708cac87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:51 2011 +0200 mshtml: Added IUri-based nsIURI::SetPort implementation. --- dlls/mshtml/nsio.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c87f8e2..875abe9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1925,9 +1925,6 @@ static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) TRACE("(%p)->(%p)\n", This, aPort); - if(This->nsuri) - return nsIURI_GetPort(This->nsuri, aPort); - if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; @@ -1944,16 +1941,15 @@ static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort) { nsWineURI *This = impl_from_nsIURL(iface); + HRESULT hres; TRACE("(%p)->(%d)\n", This, aPort); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetPort(This->nsuri, aPort); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUriBuilder_SetPort(This->uri_builder, aPort != -1, aPort); + return SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE; } static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath)

1 0

Jacek Caban : mshtml: Get rid of wine_url in nsWineURI object.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 25a40601faec93e314ff4c12ce9002d21a635d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a40601faec93e314ff4c12c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:38 2011 +0200 mshtml: Get rid of wine_url in nsWineURI object. --- dlls/mshtml/nsio.c | 85 ++++++++-------------------------------------------- 1 files changed, 13 insertions(+), 72 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3222522..c87f8e2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -63,7 +64,6 @@ struct nsWineURI { NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; - BSTR wine_url; IUri *uri; IUriBuilder *uri_builder; BOOL is_doc_uri; @@ -73,23 +73,14 @@ static BOOL ensure_uri(nsWineURI *This) { HRESULT hres; - if(This->uri) - return TRUE; + assert(This->uri || This->uri_builder); - if(This->uri_builder) { + if(!This->uri) { hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); if(FAILED(hres)) { WARN("CreateUriSimple failed: %08x\n", hres); return FALSE; } - - return TRUE; - } - - hres = CreateUri(This->wine_url, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); - return FALSE; } return TRUE; @@ -155,6 +146,7 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url) static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel) { HTMLDocumentObj *doc = container->doc; + BSTR display_uri; DWORD hlnf = 0; HRESULT hres; @@ -172,23 +164,23 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO return NS_OK; } + hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + if(!hlnf) { - BSTR display_uri; BOOL b; - hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); - if(FAILED(hres)) - return NS_ERROR_FAILURE; - b = !exec_shldocvw_67(doc, display_uri); - SysFreeString(display_uri); if(b) { + SysFreeString(display_uri); *cancel = FALSE; return NS_OK; } } - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, cancel); + hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, hlnf, cancel); + SysFreeString(display_uri); if(FAILED(hres)) *cancel = TRUE; return NS_OK; @@ -230,26 +222,6 @@ HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, return S_OK; } -static HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) -{ - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - - if(url) { - BSTR new_url; - - new_url = SysAllocString(url); - if(!new_url) - return E_OUTOFMEMORY; - SysFreeString(This->wine_url); - This->wine_url = new_url; - }else { - heap_free(This->wine_url); - This->wine_url = NULL; - } - - return S_OK; -} - static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) { if(This->container) { @@ -966,7 +938,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen BOOL cancel = FALSE; nsresult nsres = NS_OK; - TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); + TRACE("(%p)->(%p %p)\n", This, aListener, aContext); if(!ensure_uri(This->uri)) return NS_ERROR_FAILURE; @@ -1574,23 +1546,6 @@ static BOOL ensure_uri_builder(nsWineURI *This) return TRUE; } -/* Temporary helper */ -static void sync_wine_url(nsWineURI *This) -{ - BSTR new_url; - HRESULT hres; - - if(!ensure_uri(This)) - return; - - hres = IUri_GetDisplayUri(This->uri, &new_url); - if(FAILED(hres)) - return; - - SysFreeString(This->wine_url); - This->wine_url = new_url; -} - static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *ret) { char *vala; @@ -1679,7 +1634,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) nsIURI_Release(This->nsuri); if(This->uri) IUri_Release(This->uri); - SysFreeString(This->wine_url); heap_free(This); } @@ -1724,7 +1678,6 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) } This->uri = uri; - sync_wine_url(This); return NS_OK; } @@ -1788,7 +1741,6 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1850,7 +1802,6 @@ static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUserna if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1885,7 +1836,6 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1964,7 +1914,6 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2038,7 +1987,6 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2117,8 +2065,6 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return nsres; } - sync_wine_url(wine_uri); - *_retval = (nsIURI*)&wine_uri->nsIURL_iface; return NS_OK; } @@ -2274,7 +2220,6 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2326,7 +2271,6 @@ static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2551,7 +2495,6 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) if(NS_FAILED(nsres)) return E_FAIL; - set_wine_url(uri, url); uri->is_doc_uri = TRUE; *ret = uri; @@ -2609,7 +2552,6 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(NS_FAILED(nsres)) return E_FAIL; - sync_wine_url(uri); nsres = create_nschannel(uri, &channel); nsIURL_Release(&uri->nsIURL_iface); if(NS_FAILED(nsres)) @@ -2935,8 +2877,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(NS_FAILED(nsres)) return nsres; - sync_wine_url(wine_uri); - *_retval = (nsIURI*)wine_uri; + *_retval = (nsIURI*)&wine_uri->nsIURL_iface; return nsres; }

1 0

Jacek Caban : urlmon: Use CoInternetParseIUri instead of IUri:: GetPath in file protocol handler implementation.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7ccbbd86ba5bf46615bf75a6149279e682f124d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccbbd86ba5bf46615bf75a61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:04:16 2011 +0200 urlmon: Use CoInternetParseIUri instead of IUri::GetPath in file protocol handler implementation. --- dlls/urlmon/file.c | 11 ++++++----- dlls/urlmon/tests/protocol.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 418b708..8dce0bf 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -245,12 +245,13 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr DWORD grfPI, HANDLE *dwReserved) { FileProtocol *This = impl_from_IInternetProtocolEx(iface); + WCHAR path[MAX_PATH]; BINDINFO bindinfo; DWORD grfBINDF = 0; - DWORD scheme; + DWORD scheme, size; LPWSTR mime = NULL; WCHAR null_char = 0; - BSTR path, url; + BSTR url; HRESULT hres; TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, @@ -288,14 +289,14 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - hres = IUri_GetPath(pUri, &path); + size = 0; + hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); if(FAILED(hres)) { - ERR("GetPath failed: %08x\n", hres); + WARN("CoInternetParseIUri failed: %08x\n", hres); return report_result(pOIProtSink, hres, 0); } hres = open_file(This, path, pOIProtSink); - SysFreeString(path); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b547ad8..0cc14f5 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2447,6 +2447,24 @@ static void test_file_protocol_url(LPCWSTR url) IUri_Release(uri); IInternetProtocolEx_Release(protocolex); + + hres = pCreateUri(url, 0, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocolEx, (void**)&protocolex); + ok(hres == S_OK, "Could not get IInternetProtocolEx: %08x\n", hres); + + if(file_protocol_start(NULL, NULL, protocolex, uri, TRUE)) { + hres = IInternetProtocolEx_Read(protocolex, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + hres = IInternetProtocolEx_LockRequest(protocolex, 0); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + hres = IInternetProtocolEx_UnlockRequest(protocolex); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + } + + IUri_Release(uri); + IInternetProtocolEx_Release(protocolex); }else { win_skip("Skipping file protocol StartEx tests\n"); }

1 0

Marcus Meissner : oleaut32: Unshadow cmp to make code work (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 5b80d1beeaa3c592680caab444fda7a0f2e1c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b80d1beeaa3c592680caab44… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 22:14:21 2011 +0200 oleaut32: Unshadow cmp to make code work (Coverity). --- dlls/oleaut32/vartype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2b1307e..3dd65d8 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4562,6 +4562,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI /* Our decimals now have the same scale, we can add them as 96 bit integers */ ULONG overflow = 0; BYTE sign = DECIMAL_POS; + int cmp; /* Correct for the sign of the result */ if (DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) @@ -4572,7 +4573,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI } else if (DEC_SIGN(pDecLeft) && !DEC_SIGN(pDecRight)) { - int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); + cmp = VARIANT_DecCmp(pDecLeft, pDecRight); /* -x + y : Negative if x > y */ if (cmp > 0) @@ -4593,7 +4594,7 @@ VarDecAdd_AsInvertedNegative: } else if (!DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) { - int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); + cmp = VARIANT_DecCmp(pDecLeft, pDecRight); /* x + -y : Negative if x <= y */ if (cmp <= 0)

1 0

Marcus Meissner : shell32: Remove superflous NULL check (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8279e753b82d022cefd21831bf5e99fcad05900c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8279e753b82d022cefd21831b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:30:55 2011 +0200 shell32: Remove superflous NULL check (Coverity). --- dlls/shell32/tests/brsfolder.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index b7f920d..c3e9d3c 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -149,7 +149,7 @@ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, */ static void test_click_make_new_folder_button(void) { - HRESULT resCoInit; + HRESULT resCoInit, hr; BROWSEINFO bi; LPITEMIDLIST pidl = NULL; LPITEMIDLIST test_folder_pidl; @@ -202,7 +202,12 @@ static void test_click_make_new_folder_button(void) /* Use test folder as the root folder for dialog box */ MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, test_folder_pathW, MAX_PATH); - SHGetDesktopFolder(&test_folder_object); + hr = SHGetDesktopFolder(&test_folder_object); + ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); + if (!SUCCEEDED(hr)) { + skip("SHGetDesktopFolder failed - skipping\n"); + return; + } test_folder_object->lpVtbl->ParseDisplayName(test_folder_object, NULL, NULL, test_folder_pathW, 0UL, &test_folder_pidl, 0UL); bi.pidlRoot = test_folder_pidl; @@ -243,8 +248,7 @@ static void test_click_make_new_folder_button(void) CoTaskMemFree(pidl); if (test_folder_pidl) CoTaskMemFree(test_folder_pidl); - if (test_folder_object) - test_folder_object->lpVtbl->Release(test_folder_object); + test_folder_object->lpVtbl->Release(test_folder_object); CoUninitialize(); } @@ -300,7 +304,7 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR static void test_selection(void) { - HRESULT resCoInit; + HRESULT resCoInit, hr; BROWSEINFO bi; LPITEMIDLIST pidl = NULL; IShellFolder *desktop_object; @@ -325,7 +329,12 @@ static void test_selection(void) bi.lpszTitle = (LPTSTR) title; bi.lpfn = selection_callback; - SHGetDesktopFolder(&desktop_object); + hr = SHGetDesktopFolder(&desktop_object); + ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); + if (!SUCCEEDED(hr)) { + skip("SHGetDesktopFolder failed - skipping\n"); + return; + } desktop_object->lpVtbl->ParseDisplayName(desktop_object, NULL, NULL, selected_folderW, 0UL, &selected_folder_pidl, 0UL); bi.pidlRoot = selected_folder_pidl; @@ -344,6 +353,8 @@ static void test_selection(void) if (pidl) CoTaskMemFree(pidl); + desktop_object->lpVtbl->Release(desktop_object); + CoUninitialize(); }

1 0