October 2015 - Wine-Commits

Michael Stefaniuc : winspool.drv/tests: Remove always true sub-condition ( PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: c62a95d2dfaae05cd457582433b0b1da2c2dcd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62a95d2dfaae05cd45758243… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 09:34:10 2015 +0200 winspool.drv/tests: Remove always true sub-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 71bf54b..ffa31ed 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -721,8 +721,7 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, invalid_env, winetest); - ok( res || - (!res && GetLastError() == ERROR_INVALID_ENVIRONMENT) /* Vista/W2K8 */, + ok( res || GetLastError() == ERROR_INVALID_ENVIRONMENT /* Vista/W2K8 */, "returned %d with %d\n", res, GetLastError()); /* the monitor-name */ @@ -1012,7 +1011,7 @@ static void test_EnumMonitors(void) pcbNeeded = MAGIC_DEAD; pcReturned = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%d) returned %d with %d (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1020,7 +1019,7 @@ static void test_EnumMonitors(void) pcReturned = MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%d) returned %d with %d (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1230,7 +1229,7 @@ static void test_EnumPrinterDrivers(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%u) got %u with %u (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1238,7 +1237,7 @@ static void test_EnumPrinterDrivers(void) pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%u) got %u with %u (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1790,7 +1789,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinterA(NULL, &hprinter, NULL); if (is_spooler_deactivated(res, GetLastError())) return; - ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), + ok(res || GetLastError() == ERROR_INVALID_PARAMETER, "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) { @@ -1824,7 +1823,7 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = OpenPrinterA(local_server, &hprinter, NULL); - ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), + ok(res || GetLastError() == ERROR_INVALID_PARAMETER, "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1965,21 +1964,21 @@ static void test_SetDefaultPrinter(void) WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(""); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(NULL); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -2000,7 +1999,7 @@ static void test_SetDefaultPrinter(void) goto restore_old_printer; /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -2008,14 +2007,14 @@ static void test_SetDefaultPrinter(void) SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(NULL); /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", NULL); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());

1 0

Austin English : newdev: Update spec file.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: e0a7021e7ad3a63e8437fa091eaa284954909301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a7021e7ad3a63e8437fa091… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 13 06:57:00 2015 -0500 newdev: Update spec file. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/newdev.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index ff15edd..cef0abb 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,4 +1,18 @@ +@ stub DeviceInternetSettingUiW +@ stub DiInstallDevice +@ stub DiInstallDriverA +@ stub DiInstallDriverW +@ stub DiRollbackDriver +@ stub DiShowUpdateDevice +@ stub DiUninstallDevice @ stdcall InstallNewDevice(long ptr ptr) @ stdcall InstallSelectedDriver(long ptr wstr long ptr) +@ stub InstallWindowsUpdateDriver +@ stub SetInternetPolicies @ stdcall UpdateDriverForPlugAndPlayDevicesA(long str str long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesW(long wstr wstr long ptr) +@ stub pDiDeviceInstallActionW +@ stub pDiDeviceInstallNotificationW +@ stub pDiDoDeviceInstallAsAdmin +@ stub pDiDoFinishInstallAsAdmin +@ stub pDiDoNullDriverInstall

1 0

Hans Leidekker : webservices: Add a stub implementation of WsGetErrorString.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 935e9eb8bb4c0a2c26c501d263e4727386919367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e9eb8bb4c0a2c26c501d26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:02 2015 +0200 webservices: Add a stub implementation of WsGetErrorString. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bfa16ec..a8990d8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -513,6 +513,15 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo } /************************************************************************** + * WsGetErrorString [webservices.@] + */ +HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) +{ + FIXME( "%p %u %p: stub\n", handle, index, str ); + return E_NOTIMPL; +} + +/************************************************************************** * WsGetHeapProperty [webservices.@] */ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 508645b..85014bf 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -63,7 +63,7 @@ @ stub WsGetCustomHeader @ stub WsGetDictionary @ stdcall WsGetErrorProperty(ptr long ptr long) -@ stub WsGetErrorString +@ stdcall WsGetErrorString(ptr long ptr) @ stub WsGetFaultErrorDetail @ stub WsGetFaultErrorProperty @ stub WsGetHeader diff --git a/include/webservices.h b/include/webservices.h index 0a8b206..d9d1052 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -360,7 +360,7 @@ void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); void WINAPI WsFreeReader(WS_XML_READER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); -HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING**); +HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*);

1 0

Huw Davies : ole32: Release interfaces as part of Stop.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 5ae2b5ae93ac196b07e731c16be46877b00c9eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae2b5ae93ac196b07e731c16… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:52 2015 +0100 ole32: Release interfaces as part of Stop. This can now be done as Stop will no longer be called from within an object call. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index e3f13a6..3200f4b 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -502,6 +502,7 @@ static void DefaultHandler_Stop(DefaultHandler *This) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); This->object_state = object_state_not_running; + release_delegates( This ); } /************************************************************************ @@ -529,7 +530,6 @@ static HRESULT WINAPI DefaultHandler_Close( end_object_call( This ); DefaultHandler_Stop(This); - release_delegates(This); return hr; } @@ -1517,7 +1517,6 @@ static HRESULT WINAPI DefaultHandler_Run( fail: DefaultHandler_Stop(This); - release_delegates(This); return hr; } @@ -2180,7 +2179,6 @@ static void DefaultHandler_Destroy( /* release delegates */ DefaultHandler_Stop(This); - release_delegates(This); HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL;

1 0

Huw Davies : ole32: Defer calling Stop in an OnClose notification during an object call.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 719c479a362d26b920ab32d6a1524031f1550283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719c479a362d26b920ab32d6a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:51 2015 +0100 ole32: Defer calling Stop in an OnClose notification during an object call. The OnClose notification may arrive during a call to the object. Releasing the object's interfaces at this point would be bad, so delay this until after the object call returns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 202 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 173 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=719c479a362d26b920ab3…

1 0

Frédéric Delanoy : cmd/tests: Simplify boolean expressions (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: e6042cf6a64f12d2414b1e6be9df9687c2733b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6042cf6a64f12d2414b1e6be… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 14 01:58:39 2015 +0200 cmd/tests: Simplify boolean expressions (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/batch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9df0bc5..c1847d6 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -320,13 +320,14 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da /* If we rewind to the beginning of the line, don't increment line number */ line--; } - else if (!is_exp_resync || (is_exp_resync && !err)) + else if (!is_exp_resync || !err) { exp_ptr = exp_nl+1; if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') exp_ptr++; } - if (!is_out_resync || (is_out_resync && !err)) + + if (!is_out_resync || !err) { out_ptr = out_nl+1; if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n')

1 0

Michael Stefaniuc : msacm32/tests: Remove always true condition ( PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: baf0af67ae60cadb5a47f1cd3376514d2d2c32e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf0af67ae60cadb5a47f1cd3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 23:58:37 2015 +0200 msacm32/tests: Remove always true condition (PVS-Studio). dd.szShortName is an array of CHAR and not an arbitrary pointer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 0defb33..4c9dca0 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -145,7 +145,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); for (iter = expected_ids; iter->shortname; ++iter) { - if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { + if (!strcmp(iter->shortname, dd.szShortName)) { /* try alternative product id on mismatch */ if (iter->pid_alt && iter->pid != dd.wPid) ok(iter->mid == dd.wMid && iter->pid_alt == dd.wPid,

1 0

Nikolay Sivov : wmiutils: Don't return HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: afd1e40e824a3f2d49531b4fcf47375e943b7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1e40e824a3f2d49531b4fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:44:46 2015 +0300 wmiutils: Don't return HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7977416..61386d9 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -1211,7 +1211,7 @@ static BOOL WINAPI path_IsRelative( LPWSTR wszNamespace) { FIXME("%p, %s, %s\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsRelativeOrChild( @@ -1221,7 +1221,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LONG lFlags) { FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsLocal( @@ -1229,7 +1229,7 @@ static BOOL WINAPI path_IsLocal( LPCWSTR wszMachine) { FIXME("%p, %s\n", iface, debugstr_w(wszMachine)); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI path_IsSameClassName( @@ -1237,7 +1237,7 @@ static BOOL WINAPI path_IsSameClassName( LPCWSTR wszClass) { FIXME("%p, %s\n", iface, debugstr_w(wszClass)); - return E_NOTIMPL; + return FALSE; } static const struct IWbemPathVtbl path_vtbl =

1 0

Nikolay Sivov : d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 6410e8a7712315bea07fcbf9325b93f6fb268d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6410e8a7712315bea07fcbf93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d8/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ccc16c6..827f144 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -834,12 +834,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, NULL); @@ -857,12 +857,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice8_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); + ret = IDirect3DDevice8_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice8_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0

Michael Stefaniuc : winemenubuilder: Simplify an if-condition (PVS-Studio) .
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 915bdcbdcada4c3f0b6841e79135375a14c58933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915bdcbdcada4c3f0b6841e79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:00:18 2015 +0200 winemenubuilder: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 76d8f3a..e6fd042 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3427,7 +3427,7 @@ static void cleanup_menus(void) if (data == NULL) break; lret = RegEnumValueW(hkey, i, value, &valueSize, NULL, NULL, (BYTE*)data, &dataSize); - if (lret == ERROR_SUCCESS || lret != ERROR_MORE_DATA) + if (lret != ERROR_MORE_DATA) break; valueSize *= 2; dataSize *= 2;

1 0