February 2015 - Wine-Commits

Michael Stefaniuc : ole32: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 73019d5e208d8efc8848ad5a67b7af8979966811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73019d5e208d8efc8848ad5a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:09:03 2015 +0100 ole32: Remove an always true conditional subexpression (PVS-Studio). --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 26fc0d8..5e434e0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2969,7 +2969,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = S_OK; /* First check for any conflicting locks. */ - if (SUCCEEDED(hr) && (openFlags & STGM_PRIORITY) == STGM_PRIORITY) + if ((openFlags & STGM_PRIORITY) == STGM_PRIORITY) hr = StorageImpl_CheckLockRange(This, RANGELOCK_COMMIT, RANGELOCK_COMMIT, STG_E_LOCKVIOLATION); if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE))

1 0

Mark Harmstone : comctl32: Do not call HEADER_FillItemFrame twice in a row.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 6a8da85c3bcee29d4c7fcb9f96e4ec20b4e9426c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8da85c3bcee29d4c7fcb9f9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 22:35:27 2015 +0000 comctl32: Do not call HEADER_FillItemFrame twice in a row. --- dlls/comctl32/header.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ac924fd..59f2c12 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -392,10 +392,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (ret) return phdi->rect.right; } else - { - HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); - } if (phdi->bDown) { r.left += 2;

1 0

Michael Stefaniuc : user32: IDI_WINLOGO is already an int resource ( PVS-Studio).
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 63174c2f3616af55449a861cf24557d0ac9ab85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63174c2f3616af55449a861cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:08:39 2015 +0100 user32: IDI_WINLOGO is already an int resource (PVS-Studio). --- dlls/user32/mdi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 8ef7214..11d5679 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -866,7 +866,8 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) if (!hIcon) hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) - hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC;

1 0

Michael Stefaniuc : msvcrt: Avoid identical if and else bodies (PVS-Studio ).
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: e67a65c59e7013f22c3a873874e9552deef3b68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67a65c59e7013f22c3a87387… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:03:50 2015 +0100 msvcrt: Avoid identical if and else bodies (PVS-Studio). --- dlls/msvcrt/scanf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e85f343..9322704 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -423,8 +423,7 @@ _FUNCTION_ { st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(double); - else if (l_prefix) _SET_NUMBER_(double); + if (L_prefix || l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } }

1 0

Mark Harmstone : comctl32: Themed buttons should not draw in System if font unset.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 129862f3694fdd4f0badfc6f046a19b70810cf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=129862f3694fdd4f0badfc6f0… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 23:39:16 2015 +0000 comctl32: Themed buttons should not draw in System if font unset. --- dlls/comctl32/theme_button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 9b0a5cf..5a3b4b4 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -181,8 +181,10 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -243,8 +245,10 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); textRect = bgRect;

1 0

Thomas Faber : wininet: Avoid empty initializer braces.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: d742f6e821e819efcb5fe24f8fe331d98ad47c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d742f6e821e819efcb5fe24f8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:27:12 2015 +0100 wininet: Avoid empty initializer braces. --- dlls/wininet/internet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 65bb434..7eddb2c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -522,11 +522,12 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { static const WCHAR fmt[] = {'%','s',':','%','u',0}; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; URL_COMPONENTSW uc; + hostname[0] = username[0] = password[0] = 0; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.lpszHostName = hostname;

1 0

Stefan Dösinger : ddraw/tests: Create a device in test_surface_discard.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 5408c5ea34e3329c9e6a582c08f19b298de11345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5408c5ea34e3329c9e6a582c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 19:10:42 2015 +0100 ddraw/tests: Create a device in test_surface_discard. --- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3117d51..a26fd65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3951,10 +3951,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw *ddraw; + IDirect3DDevice *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -3974,14 +3975,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4016,7 +4019,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4034,7 +4037,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice_Release(device); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f584971..090f731 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4622,10 +4622,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw2 *ddraw; + IDirect3DDevice2 *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -4645,14 +4646,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice2_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4687,7 +4690,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4705,7 +4708,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice2_Release(device); IDirectDraw2_Release(ddraw); DestroyWindow(window); }

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetPrivateData().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 9bdc1533132be21e90439fd2ce8e9422597ffbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdc1533132be21e90439fd2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:39 2015 +0100 dxgi: Implement dxgi_surface_GetPrivateData(). --- dlls/dxgi/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 5d9dc2a..f961de5 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -133,9 +133,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurfa static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&surface->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_SetPrivateData().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 64b23f6ca7f3674cb55b4d468065f1b377206bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b23f6ca7f3674cb55b4d468… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:37 2015 +0100 dxgi: Implement dxgi_surface_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/surface.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 727a75f..206fce6 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -157,6 +157,7 @@ struct dxgi_surface IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; + struct wined3d_private_store private_store; IDXGIDevice *device; DXGI_SURFACE_DESC desc; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 10daff7..1a6ee7e 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -71,7 +71,10 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u.\n", surface, refcount); if (!refcount) + { + wined3d_private_store_cleanup(&surface->private_store); HeapFree(GetProcessHeap(), 0, surface); + } return refcount; } @@ -110,9 +113,11 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&surface->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, @@ -210,6 +215,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; + wined3d_private_store_init(&surface->private_store); surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; surface->desc = *desc;

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_SetPrivateDataInterface().
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Module: wine Branch: master Commit: 1c9016c70375db79a43565ea2a0503b1f0a8f9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9016c70375db79a43565ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:38 2015 +0100 dxgi: Implement dxgi_surface_SetPrivateDataInterface(). --- dlls/dxgi/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1a6ee7e..5d9dc2a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -123,9 +123,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&surface->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface,

1 0