March 2015 - Wine-Commits - list.winehq.org

Piotr Caban : ieframe/tests: Added more OleObject_Close tests.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: da7c766bb5a4fb135cb9610cbf3a74675e315aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c766bb5a4fb135cb9610cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 4 12:29:58 2015 +0100 ieframe/tests: Added more OleObject_Close tests. --- dlls/ieframe/tests/webbrowser.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 7f45182..d86faf8 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3531,6 +3531,24 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) ok(hres == S_OK, "hres = %x\n", hres); ok(!ocs, "ocs != NULL\n"); + SET_EXPECT(GetContainer); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + hres = IOleObject_DoVerb(oo, OLEIVERB_HIDE, NULL, (IOleClientSite*)0xdeadbeef, + 0, (HWND)0xdeadbeef, NULL); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + todo_wine CHECK_CALLED(GetContainer); + todo_wine CHECK_CALLED(Site_GetWindow); + todo_wine CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + todo_wine CHECK_CALLED(Invoke_AMBIENT_SILENT); + + hres = IOleObject_GetClientSite(oo, &ocs); + ok(hres == S_OK, "hres = %x\n", hres); + todo_wine ok(ocs == &ClientSite, "ocs != &ClientSite\n"); + if(ocs) + IOleClientSite_Release(ocs); + hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres);

1 0

Michael Stefaniuc : ws2_32/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 4c36ef1d4e2949264b212f3c54ad484d41063b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c36ef1d4e2949264b212f3c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 10:11:41 2015 +0100 ws2_32/tests: Remove an unused assignment (PVS-Studio). --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 19663c2..6569515 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3702,7 +3702,7 @@ static void test_accept(void) closesocket(accepted); closesocket(connector); - accepted = connector = server_socket = INVALID_SOCKET; + accepted = connector = INVALID_SOCKET; socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen);

1 0

Michael Stefaniuc : shell32/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 725662003abac4b67e43a80b211c541e1e310d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725662003abac4b67e43a80b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:50:59 2015 +0100 shell32/tests: Actually test some return values (PVS-Studio). --- dlls/shell32/tests/shellpath.c | 1 + dlls/shell32/tests/systray.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index e2277ec..af88c6b 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2107,6 +2107,7 @@ static void test_knownFolders(void) ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); hr = IKnownFolder_GetPath(folder, 0, &folderPath); + ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); ok(lstrcmpiW(sWinDir, folderPath)==0, "invalid path returned: \"%s\", expected: \"%s\"\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sWinDir)); CoTaskMemFree(folderPath); diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index cb27866..0d815a6 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -45,6 +45,7 @@ static void test_cbsize(void) nidW.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION); nidW.uCallbackMessage = WM_USER+17; ret = pShell_NotifyIconW(NIM_ADD, &nidW); + ok(ret, "NIM_ADD failed!\n"); /* using an invalid cbSize does work */ nidW.cbSize = 3; nidW.hWnd = hMainWnd;

1 0

Michael Stefaniuc : kernel32/tests: Actually test a return value ( PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: dbe6c5576d6e4b527d493a82c4cae6258e6ed365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe6c5576d6e4b527d493a82c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:39:10 2015 +0100 kernel32/tests: Actually test a return value (PVS-Studio). --- dlls/kernel32/tests/pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf02e15..b115ed8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2111,6 +2111,7 @@ static void test_readfileex_pending(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); + ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes);

1 0

Michael Stefaniuc : d3d9/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 148d6e3c10270206ebd12e98abc79460c2de1290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148d6e3c10270206ebd12e98a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:21:17 2015 +0100 d3d9/tests: Actually test some return values (PVS-Studio). --- dlls/d3d9/tests/d3d9ex.c | 2 ++ dlls/d3d9/tests/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b17ceb5..a3a9226 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -738,6 +738,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, @@ -750,6 +751,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fde2bb6..f1c75e4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1081,6 +1081,7 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); /* Check if the back buffer count was modified */ hr = IDirect3DSwapChain9_GetPresentParameters(swapchain0, &d3dpp); + ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); @@ -8821,6 +8822,7 @@ static void test_volume_blocks(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, formats[i].block_width, formats[i].block_height, 2, 2, 0, formats[i].fmt, D3DPOOL_SCRATCH, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); hr = IDirect3DVolumeTexture9_LockBox(texture, 1, &locked_box, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock volume texture mipmap, hr %#x.\n", hr); @@ -9728,6 +9730,7 @@ static void test_resource_type(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); type = IDirect3DVolumeTexture9_GetType(volume_texture); ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0b1b5..fcafb37 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12095,6 +12095,7 @@ static void loop_index_test(void) ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShaderConstantI returned %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -14793,6 +14794,7 @@ static void multisampled_depth_buffer_test(void) IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); @@ -15074,6 +15076,7 @@ static void resz_test(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &readback, NULL); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr);

1 0

Michael Stefaniuc : winmm/tests: mmioAdvance() returns a MMRESULT and not a size (PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: d1162078eaf662a8d6d93807d1983872e69c3ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1162078eaf662a8d6d93807d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:57:48 2015 +0100 winmm/tests: mmioAdvance() returns a MMRESULT and not a size (PVS-Studio). --- dlls/winmm/tests/mmio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 89146ef..fd5433c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -870,7 +870,8 @@ static void test_mmio_buffer_pointer(void) ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); /* fill the buffer */ - size = mmioAdvance(hmmio, &mmio, MMIO_READ); + res = mmioAdvance(hmmio, &mmio, MMIO_READ); + ok(res == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", res); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer)); /* seeking to the same buffer chunk, the buffer is kept */

1 0

Michael Stefaniuc : windowscodecs/tests: Actually test some return values (PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: c2eb206f99443ecfb29f347e5c753d97944b5b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2eb206f99443ecfb29f347e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:54:53 2015 +0100 windowscodecs/tests: Actually test some return values (PVS-Studio). --- dlls/windowscodecs/tests/info.c | 1 + dlls/windowscodecs/tests/metadata.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 51181ca..8a22970 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -80,6 +80,7 @@ static void test_decoder_info(void) int i; hr = get_component_info(&CLSID_WICBmpDecoder, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index fa9d701..20fe54c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -965,6 +965,7 @@ static void test_metadata_png(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &containerformat); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, "unexpected container format\n"); @@ -1109,6 +1110,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen Descriptor */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1157,6 +1159,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1210,6 +1213,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen Descriptor */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1228,6 +1232,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), /* Application Extension */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1246,6 +1251,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1264,6 +1270,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1312,6 +1319,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1330,6 +1338,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1349,6 +1358,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "wrong metadata format %s\n", wine_dbgstr_guid(&format)); @@ -1367,6 +1377,7 @@ static void test_metadata_gif(void) if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ "wrong metadata format %s\n", wine_dbgstr_guid(&format));

1 0

Michael Stefaniuc : shlwapi: Remove two unused assignments (PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: a0e28403d447c2a78ce70ccbb915efe2e863b840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e28403d447c2a78ce70ccbb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:52:59 2015 +0100 shlwapi: Remove two unused assignments (PVS-Studio). --- dlls/shlwapi/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ba2f241..1a53252 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -688,11 +688,11 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, /* Canonicalize the base input prior to looking for the scheme */ myflags = dwFlags & (URL_DONT_SIMPLIFY | URL_UNESCAPE); len = INTERNET_MAX_URL_LENGTH; - ret = UrlCanonicalizeW(pszBase, mbase, &len, myflags); + UrlCanonicalizeW(pszBase, mbase, &len, myflags); /* Canonicalize the relative input prior to looking for the scheme */ len = INTERNET_MAX_URL_LENGTH; - ret = UrlCanonicalizeW(pszRelative, mrelative, &len, myflags); + UrlCanonicalizeW(pszRelative, mrelative, &len, myflags); /* See if the base has a scheme */ res1 = ParseURLW(mbase, &base);

1 0

Michael Stefaniuc : ddraw/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: bd9d41080f0f43edbc9a9eddc2c9621a65f46500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9d41080f0f43edbc9a9eddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:34:39 2015 +0100 ddraw/tests: Actually test some return values (PVS-Studio). --- dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 090f731..f448455 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -972,6 +972,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3733,6 +3734,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e5c808a..49f6de7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1180,6 +1180,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface4_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -4090,6 +4091,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c558385..084fbd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1090,6 +1090,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface7_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3854,6 +3855,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);

1 0

Michael Stefaniuc : oledb32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: e87857a5219aa8dd0cf600431945594e8df7a16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87857a5219aa8dd0cf600431… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:42:44 2015 +0100 oledb32/tests: Remove an unused assignment (PVS-Studio). --- dlls/oledb32/tests/convert.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index f7558da..f679b5c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2683,7 +2683,6 @@ static void test_converttovar(void) VariantClear(&dst); V_VT(&dst) = VT_EMPTY; - dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; i8.QuadPart = 12345; dst_len = 0x1234;

1 0