October 2008 - Wine-Commits

Michael Stefaniuc : winecfg: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 2daee2e4a272bed6fbbafa8f2c702e05088a337f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daee2e4a272bed6fbbafa8f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:18 2008 +0200 winecfg: Use FAILED instead of !SUCCEEDED. --- programs/winecfg/driveui.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 8c313c1..fb37a20 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -591,11 +591,11 @@ BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath) LoadStringW(GetModuleHandle(NULL), IDS_CHOOSE_PATH, pszChoosePath, FILENAME_MAX); hr = SHGetDesktopFolder(&pDesktop); - if (!SUCCEEDED(hr)) return FALSE; + if (FAILED(hr)) return FALSE; hr = IShellFolder_ParseDisplayName(pDesktop, NULL, NULL, wszUnixRootDisplayName, NULL, &pidlUnixRoot, NULL); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { IShellFolder_Release(pDesktop); return FALSE; } @@ -612,14 +612,14 @@ BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath) hr = IShellFolder_GetDisplayNameOf(pDesktop, pidlSelectedPath, SHGDN_FORPARSING, &strSelectedPath); IShellFolder_Release(pDesktop); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { SHFree(pidlSelectedPath); return FALSE; } hr = StrRetToStrW(&strSelectedPath, pidlSelectedPath, &pszSelectedPath); SHFree(pidlSelectedPath); - if (!SUCCEEDED(hr)) return FALSE; + if (FAILED(hr)) return FALSE; lstrcpyW(pszPath, pszSelectedPath);

1 0

Michael Stefaniuc : itss/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: f67256fb2fdbdf96e4bc3ba5113967e08a53656b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67256fb2fdbdf96e4bc3ba51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:35:16 2008 +0200 itss/tests: Use FAILED instead of !SUCCEEDED. --- dlls/itss/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index e0edeb0..f93d131 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -572,7 +572,7 @@ static void test_its_protocol(void) hres = CoGetClassObject(&CLSID_ITSProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&info); @@ -630,7 +630,7 @@ static void test_mk_protocol(void) hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) return; cache_file = cache_file1;

1 0

Michael Stefaniuc : d3dxof: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 9d0a8b34a8aea0ea96d233ddadd4ba94b85a4f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0a8b34a8aea0ea96d233dda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:35:37 2008 +0200 d3dxof: Use FAILED instead of !SUCCEEDED. --- dlls/d3dxof/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index af84ef8..0bd5947 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -245,7 +245,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("Header is correct\n"); hr = IDirectXFileEnumObjectImpl_Create(&object); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) goto error; object->source = dwLoadOptions; @@ -1968,7 +1968,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_NOMOREOBJECTS; hr = IDirectXFileDataImpl_Create(&object); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; This->buf.pxo_globals = &This->xobjects[0][0];

1 0

Michael Stefaniuc : dxdiagn: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 7fe70f2c2b201f311c56b66f9d1c3d037a7031e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe70f2c2b201f311c56b66f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:36:09 2008 +0200 dxdiagn: Use FAILED instead of !SUCCEEDED. --- dlls/dxdiagn/container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index c4278b1..23245ae 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -150,7 +150,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if while (NULL != cur) { *cur = '\0'; /* cut tmp string to '.' */ hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); - if (!SUCCEEDED(hr) || NULL == pContainer) + if (FAILED(hr) || NULL == pContainer) goto on_error; cur++; /* go after '.' (just replaced by \0) */ tmp = cur;

1 0

Michael Stefaniuc : msxml3/tests: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 256ce911be243a21da28f3a03ad8b3f1f3cf143d URL: http://source.winehq.org/git/wine.git/?a=commit;h=256ce911be243a21da28f3a03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:50 2008 +0200 msxml3/tests: Use SUCCEEDED instead of !FAILED. --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f985dfd..03b201b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -283,7 +283,7 @@ static int get_node_position(IXMLDOMNode *node) pos++; r = IXMLDOMNode_get_previousSibling(node, &new_node); - ok(!FAILED(r), "get_previousSibling failed\n"); + ok(SUCCEEDED(r), "get_previousSibling failed\n"); IXMLDOMNode_Release(node); node = new_node; } while (r == S_OK); @@ -341,7 +341,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf) buf += strlen(buf); } - ok(!FAILED(r), "get_parentNode failed (%08x)\n", r); + ok(SUCCEEDED(r), "get_parentNode failed (%08x)\n", r); IXMLDOMNode_Release(node); node = new_node; if (r == S_OK)

1 0

Michael Stefaniuc : winefile: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 163874844b73dae8e0669daf0e545d08fa9f4100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163874844b73dae8e0669daf0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:34:27 2008 +0200 winefile: Use FAILED instead of !SUCCEEDED. --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 93ac0d4..1ae314e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -964,7 +964,7 @@ static Entry* read_tree_shell(Root* root, LPITEMIDLIST pidl, SORT_ORDER sortOrde ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0; hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break; read_directory(entry, NULL, sortOrder, hwnd); @@ -1070,7 +1070,7 @@ static void read_directory_shell(Entry* dir, HWND hwnd) memset(pidls, 0, sizeof(pidls)); hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break; if (hr == S_FALSE)

1 0

Michael Stefaniuc : shdocvw: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 689895702a0c46de4b4e582a1d16acfa81a010fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=689895702a0c46de4b4e582a1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:36:15 2008 +0200 shdocvw: Use FAILED instead of !SUCCEEDED. --- dlls/shdocvw/factory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index ec3e7a6..9111300 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -330,5 +330,5 @@ DWORD register_iexplore(BOOL doregister) return S_OK; } hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); - return !SUCCEEDED(hres); + return FAILED(hres); }

1 0

Michael Stefaniuc : qcap: Use the right FAILED/ SUCCEEDED macro instead of negating the opposite.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 2f6df7c2a5d86a1e1c7f5da5048ae96b6f3d61cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6df7c2a5d86a1e1c7f5da50… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:36:01 2008 +0200 qcap: Use the right FAILED/SUCCEEDED macro instead of negating the opposite. --- dlls/qcap/qcap_main.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index e5c9e3b..8549f42 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -265,7 +265,7 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter if (!punk) { /* No object created, update error if it isn't done already and return */ - if (!FAILED(hres)) + if (SUCCEEDED(hres)) hres = E_OUTOFMEMORY; return hres; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 738e1d2..cfb9487 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -115,7 +115,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) pVfwCapture->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"); hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->lpVtbl, &pVfwCapture->csFilter, &pVfwCapture->pOutputPin); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { CoTaskMemFree(pVfwCapture); return NULL;

1 0

Michael Stefaniuc : dplayx: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 4afe790387415778989fa14984f6205847317c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afe790387415778989fa1498… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:35:48 2008 +0200 dplayx: Use SUCCEEDED instead of !FAILED. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_messages.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b349462..91090cb 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2323,7 +2323,7 @@ static HRESULT WINAPI DP_IF_EnumSessions hr = NS_SendSessionRequestBroadcast( &lpsd->guidApplication, dwFlags, &This->dp2->spData ); - if( !FAILED(hr) ) + if( SUCCEEDED(hr) ) { EnumSessionAsyncCallbackData* lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *lpData ) ); diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index de44443..217bf99 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -233,7 +233,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags, } /* Need to examine the data and extract the new player id */ - if( !FAILED(hr) ) + if( SUCCEEDED(hr) ) { LPCDPMSG_NEWPLAYERIDREPLY lpcReply;

1 0

Michael Stefaniuc : d3d9/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 6a908eb1496de93f8de90e944f2a44195fb52cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a908eb1496de93f8de90e944… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:35:08 2008 +0200 d3d9/tests: Use FAILED instead of !SUCCEEDED. --- dlls/d3d9/tests/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d28da88..cd57772 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1673,13 +1673,13 @@ static void test_null_stream(void) } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed (0x%08x)\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("Vertex declaration handling not possible.\n"); goto cleanup; } hr = IDirect3DDevice9_CreateVertexBuffer(device, 12 * sizeof(float), 0, 0, D3DPOOL_MANAGED, &buffer, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x)\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("Vertex buffer handling not possible.\n"); goto cleanup; }

1 0