December 2017 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] ddraw/tests: Add a helper for getting the device identifier
by Alex Henrie Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Fixed compilation error on old GCC dlls/ddraw/tests/ddraw1.c | 40 ++++++++++++---------------------------- dlls/ddraw/tests/ddraw2.c | 40 ++++++++++++---------------------------- dlls/ddraw/tests/ddraw4.c | 32 ++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++-------------------- 4 files changed, 48 insertions(+), 96 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b820..56916d6568 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -82,14 +82,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -97,42 +99,24 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329..a92e4dc50f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -84,14 +84,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw2 *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -99,42 +101,24 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf0..5a356af4c5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -94,45 +94,37 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d0..a8b1a8ed92 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -104,45 +104,37 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +static DDDEVICEIDENTIFIER2 ddraw_dev_id(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } -- 2.15.1

1 1

[PATCH 2/2] ddraw/tests: Recognize E_NOTIMPL returned from UpdateOverlay on VMware
by Alex Henrie Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 9 ++++++++- dlls/ddraw/tests/ddraw2.c | 9 ++++++++- dlls/ddraw/tests/ddraw4.c | 9 ++++++++- dlls/ddraw/tests/ddraw7.c | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4542f3d4df..2797960321 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -117,6 +117,11 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -8660,7 +8665,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f0fd0fa182..c6d962a235 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -119,6 +119,11 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -9794,7 +9799,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9574331952..8a049e03a6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -125,6 +125,11 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11256,7 +11261,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3693821404..95c5e30900 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -135,6 +135,11 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11217,7 +11222,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.15.1

2 1

[PATCH 1/2] ddraw/tests: Add a helper for getting the device identifier
by Alex Henrie Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 43 ++++++++++++------------------------------- dlls/ddraw/tests/ddraw2.c | 43 ++++++++++++------------------------------- dlls/ddraw/tests/ddraw4.c | 35 ++++++++++++----------------------- dlls/ddraw/tests/ddraw7.c | 35 ++++++++++++----------------------- 4 files changed, 48 insertions(+), 108 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b820..4542f3d4df 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -82,14 +82,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -97,43 +99,22 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +static BOOL ddraw_is_warp(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329..f0fd0fa182 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -84,14 +84,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw2 *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -99,43 +101,22 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf0..9574331952 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -94,46 +94,35 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d0..3693821404 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -104,46 +104,35 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +static DDDEVICEIDENTIFIER2 ddraw_dev_id(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, -- 2.15.1

2 1

[PATCH] ddraw/tests: Recognize E_NOTIMPL returned from UpdateOverlay
by Alex Henrie Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c306c4db1a..27b1b0defc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8679,7 +8679,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801ee3e..56ca6e4cdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9813,7 +9813,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc3..50665af63a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11268,7 +11268,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d5..9bc3c0913d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11229,7 +11229,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.15.1

3 4

[PATCH 1/2] po: Update Norwegian translation.
by Kim Malmo Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/po/nb_NO.po b/po/nb_NO.po index d00e67aebc..f2ef6594e5 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10591,6 +10591,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Opprett en symbolsk lenke.\n" +"\n" +"Syntax: MKLINK [alternativer] lenke_navn mål\n" +"\n" +"Alternativer:\n" +"/d Opprett en symbolsk lenke til en katalog.\n" +"/h Opprett en hard lenke.\n" +"/j Opprett et katalog-knutepunkt.\n" +"lenke_navn er navnet på den nye symbolske lenken.\n" +"mål er stien som lenke_navn peker til.\n" #: cmd.rc:312 msgid "" -- 2.14.1

1 1

[PATCH 2/2] po: Update Simplified Chinese translation.
by Kim Malmo Dec. 22, 2017

Dec. 22, 2017

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e1e92d261d..d3baf01035 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10402,7 +10402,7 @@ msgstr "" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" -"link_nam 为符号链接的名称。\n" +"link_name 为符号链接的名称。\n" "target 为 link_name 指向的路径。\n" #: cmd.rc:312 -- 2.14.1

2 1

[PATCH 1/3] testbot: Add a history Record when the Engine starts or stops.
by Francois Gouget Dec. 22, 2017

Dec. 22, 2017

A missing stop record will show that the TestBot Engine crashed (or was stopped abruptly). The gap between the stop and start records will also allow identifying the downtime. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 36a18ade..827879cf 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -749,6 +749,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); + SaveRecord('engine', 'start'); Cleanup(1); # Check for patches that arrived while the server was off. @@ -871,6 +872,7 @@ sub main() } } } + SaveRecord('engine', 'stop'); LogMsg "Normal WineTestBot Engine shutdown\n"; return 0; -- 2.15.1

1 2

[PATCH 1/2] testbot/web: Make the title class a bit more generic.
by Francois Gouget Dec. 22, 2017

Dec. 22, 2017

Instead of hardcoding the text color it now inherits it from the normal non-link text. This makes it usable on white backgrounds too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 8c03a914..e58a4d80 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -340,7 +340,7 @@ pre .boterror { color: #e55600; } .canceled { color: black; } -a.title { color:white; text-decoration: none; } +a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } -- 2.15.1

1 1

wine-2.0.4-rc1 Available
by Michael Stefaniuc Dec. 21, 2017

Dec. 21, 2017

Hello guys, I have pushed wine-2.0.4-rc1 (with tag) to https://github.com/mstefani/wine-stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Commit wise, the documentation / man page patches for http ==> https dominate this release. Other than "what's new" I have pulled some small fixes to the Wine programs. The interesting parts from the ANNOUNCE file are: What's new in this release (see below for details): - Various bug fixes - Updates to the National Language Support files - Documentation updates ---------------------------------------------------------------- Bugs fixed in 2.0.4 (total 31): 7369 eISLP -help doesn't display, 'text controller' error message 14530 EM_PASTESPECIAL unimplemented in richedit 26046 comctl32/monthcal tests show some invalid reads under valgrind 28741 Odd coordinate in hit test causes uninitialized value references in MONTHCAL_CalculateDayOfWeek()? 37160 If D3D_DISABLE_9EX is defined, d3d9.h can't be compiled 37321 foobar2000 'Scheduler' plugin crashes on unimplemented function shell32.dll.ShellExec_RunDLLW 40025 Winrar installer fails to start 42256 PhotoFiltre 6 and 7 don't erase the mouse selection when dragging it 42715 Cxbx (Xbox emulator) doesn`t start (wine: Invalid address) 43044 League of Legends needs function msvcp140.dll.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z 43046 Multiple apps need api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vfprintf_s (Civilization VI, Mafia 3, SketchBook) 43163 Mixcraft 8 crashes when adding a video track ('IAMTimelineGroup', '{9eed4f00-b8a6-11d2-8023-00c0df10d434}' not implemented, 'qedit.dll') 43290 MyLifeOrganized crashes when mousing over tabs 43293 strange behavior- Eudora scrambles email addresses 43324 Beamng.drive requires msvcr120.dll.vsscanf 43453 Magic Online (Magic The Gathering: Online) Crashes due to race condition in secur32 43475 XM6 TypeG crashes on startup. 43503 FUJITSU Software ATLAS: unimplemented function msvcr80.dll._ismbcl0 called in 32-bit code 43527 Magic Online (Magic The Gathering: Online) Crashes due to LOCALE_SNAN returning empty string 43536 WIC can't encode to GUID_WICPixelFormat32bppPBGRA PNG 43603 clipboard PIXMAP regression after upgrading from 1.8.x to 2.x 43658 Text in Deletion Confirmation MsgBox has wrong background colour 43668 Terris Universal Remote UFB 234 - update database does not work 43707 [GdiPlus] HatchStyle is incorrectly named in Wine. Should be GpHatchStyle 43714 ImageMagick crashes with msvcr120.dll._vfprintf_l 43770 Fidibo installer crashes very early in win7 mode 43774 Chromium-based browser engine (CEFv3) used by several games randomly crashes on shutdown (World of Warships 0.6.x) 43779 In ole32/storage32.c , miss check for the result of HeapAlloc 43877 "Cannot allocate DOS memory" error with 16-bit Windows applications 43912 wine-2.0.3/programs/wineboot/wineboot.c:684]: (style) Suspicious condition 44085 winecfg: Use more secure HTTPS URL in about ---------------------------------------------------------------- Changes since 2.0.3: Akihiro Sagawa (5): msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings. msvcrt: Fix mbstowcs with empty strings. readme: Update Japanese translation. explorer: Use neutral language for the version resource. regsvr32: Use neutral language for the version resource. Alex Henrie (5): msvcrt: Note that __stdio_common functions are for ucrtbase. ucrtbase: Add __stdio_common_vfprintf_s. shell32: Implement ShellExec_RunDLL. include: Add D3D_DISABLE_9EX checks to d3d9.h. user32: Implement IDI_SHIELD. Alexandre Julliard (10): winex11: If importing an X11 clipboard format fails, try other candidate formats for the target. ntdll: Support loading binaries that start inside the DOS area. ntdll: Ignore the preload start address if it is zero. README: Remove references to removed Wiki pages. readme: Patches should now be sent to wine-devel. configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage. wineconsole: Avoid some fatal errors. wineconsole: Remove duplicate line feeds. wordpad: New high resolution cursor generated from SVG. explorer: Don't forward the system tray to the display driver in desktop mode. Alistair Leslie-Hughes (3): ole32: Add pointer check. qedit/tests: Add test for the IAMTimelineGroup interface. qedit: Support IAMTimelineGroup interface in IAMTimelineObj. Andrew Eikum (2): kernel32: Use different default sublangs for Spanish and Chinese. explorer: Don't leak PIDL. Andrey Semakin (4): winemine: Mine random placing fix. winemine: Added Shift+LClick hotkey to uncover multiple cells. winemine: Add WM_RBUTTONUP to cases of TestMines(). winemine: Save board without need to correctly finish the app. André Hentschel (1): ntdll: Bump Win 10 version to 15063. Anton Romanov (3): windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default. secur32: Fix race between schan_(Encrypt|Decrypt)Message. secur32: Protect SSLRead/Write with cs on OSX. Austin English (30): readme: Document that wine can be run from the build directory. readme: Clarify the wording a bit. announce: Move WineHQ URLs to https. readme: Move WineHQ URLs to https. configure: Move WineHQ URLs to https. loader: Move WineHQ URLs to https. server: Move WineHQ URLs to https. widl: Move WineHQ URLs to https. winegcc: Move WineHQ URLs to https. wrc: Move WineHQ URLs to https. winemaker: Move WineHQ URLs to https. wmc: Move WineHQ URLs to https. winebuild: Move WineHQ URLs to https. winedump: Move WineHQ URLs to https. c2man.pl: Move WineHQ URLs to https. msiexec: Move WineHQ URLs to https. notepad: Move WineHQ URLs to https. regedit: Move WineHQ URLs to https. winemine: Move WineHQ URLs to https. winepath: Move WineHQ URLs to https. wineconsole: Move WineHQ URLs to https. regsvr32: Move WineHQ URLs to https. wineboot: Move WineHQ URLs to https. winecfg: Move WineHQ URLs to https. winefile: Move WineHQ URLs to https. winedbg: Move WineHQ URLs to https. iexplore: Move WineHQ URLs to https. appwiz.cpl: Move WineHQ URLs to https. maintainers: Move WineHQ URLs to https. loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Bas Weelinck (1): start: Ignore multiple quoted arguments as title. Daniel Lehman (2): msvcrt: Add __ExceptionPtrAssign. server: Fix copy & paste for number of subkeys. Dmitry Timoshkov (3): user32/tests: Test DialogBoxParam using a dialog template with invalid control class. user32: DialogBoxParam should return -1 when dialog control creation fails. cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Fabian Maurer (5): shell32: Draw text on message boxes without background. gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. wineboot: In ProcessRunKeys use correct parentheses in condition. ole32: Don't redefine htole32/htole16. winecfg: Remove processorArchitecture from manifest. Gijs Vermeulen (1): msvcrt: Add _vfprintf_l. Henri Verbeet (1): wordpad: Fall back to the default position if the saved position is off-screen. Hugh Bellamy (1): gdiplus: Define GpHatchStyle. Huw D. M. Davies (6): gdi32: Add a helper to fill rectangles with a given pixel. gdi32: Respect the rop mode in SetPixel. ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2. riched20: Add support for EM_PASTESPECIAL. winefile: Initialize length before calling GetWindowPlacement(). winedbg: Return after raising an exception. Jacek Caban (1): services: Call RpcMgmtWaitServerListen in RPC_Stop. Lauri Kenttä (5): readme: Fix word order. readme: Update Finnish translation. readme: Update Finnish translation. readme: Use UTF-8 consistently in all translations. readme: Move WineHQ URLs to https in translations. Li Keqing (1): wined3d: Add Intel HD Graphics 5000 to the GPU list. Nikolay Sivov (15): msvcrt: Added _ismbcl0(). kernel32/nls: Added genitive month names for Polish. kernel32/nls: Added genitive month names for Belarusian. kernel32/nls: Added genitive month names for Armenian. kernel32/nls: Added genitive month names for Croatian. kernel32/nls: Added genitive month names for Czech. kernel32/nls: Added Nepali locale data. kernel32/nls: Added Bangla (India) locale data. kernel32/nls: Added LOCALE_SNAN entries. comctl32/monthcal: Make sure set today date is valid before using it (Valgrind). comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind). msxml3/httpreq: Support HEAD request. msvcr120: Added vsscanf() and vswscanf(). readme: Update Russian translation. msi: Avoid uninitialized pointer access on error path (Coverity). Piotr Caban (4): msvcrt: Fix strcpy implementation so it works on overlapping buffers. msvcr120: Add wctype implementation. wine.inf: Add Windows Messaging Subsystem MAPI registry key. vbscript: Don't leak IEnumVARIANT in interp_enumnext. Stefan Dösinger (2): ntdll: Do not queue a completion status if pipe ops fail synchronously. d3dx9/tests: Use float bit patterns in test_D3DXFloat_Array. Vincent Povirk (2): loader/wine.inf: Put 32-bit .ds fakedlls in windows/twain_32. wine.inf: Put 64-bit .ds fakedlls in windows/twain_64. Zebediah Figura (1): d3dcompiler: Fix a buffer size computation. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] quartz: Wait for the PullPin thread to terminate.
by Zebediah Figura Dec. 21, 2017

Dec. 21, 2017

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes an intermittent failure in the filtergraph tests where the source file was not being freed before IFilterGraph2_Release() returned. dlls/quartz/pin.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..a17d256 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -540,13 +540,7 @@ static void PullPin_Thread_Stop(PullPin *This) { TRACE("(%p)->()\n", This); - EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } - LeaveCriticalSection(This->pin.pCritSec); + SetEvent(This->hEventStateChanged); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -706,6 +700,11 @@ static HRESULT PullPin_StopProcessing(PullPin * This) assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); + + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return S_OK; } -- 2.7.4

1 0

[PATCH 3/3] server: Add support for querying FileNameInformation on named pipes.
by Jacek Caban Dec. 21, 2017

Dec. 21, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 3 --- server/named_pipe.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-)

1 0

[PATCH 2/3] server: Introduce get_file_info request for server-side NtQueryInformationFile implementation.
by Jacek Caban Dec. 21, 2017

Dec. 21, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I made it more general than needed by the next patch. We will probably need it in such form for calls on files backed by drivers, but it will also be useful for other info classes (eg. FILE_PIPE_INFORMATION and FILE_PIPE_LOCAL_INFORMATION won't need a separated request) as well as other object types for which client-side fd-based implementation may not be right. This series keeps changes to minimum (due to code freeze). dlls/ntdll/file.c | 21 ++++++++++++++++++++- server/change.c | 1 + server/console.c | 1 + server/device.c | 1 + server/fd.c | 18 ++++++++++++++++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/protocol.def | 8 ++++++++ server/serial.c | 1 + server/sock.c | 2 ++ 13 files changed, 63 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] ntdll/tests: Add NtQueryInformationFile(FileNameInformation) on named pipes tests.
by Jacek Caban Dec. 21, 2017

Dec. 21, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)

1 0

[PATCH] ddraw: Validate the surface descriptor size in GetDisplayMode.
by Alexandre Julliard Dec. 21, 2017

Dec. 21, 2017

For bug 44180. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 27 +++++++++++++-------------- dlls/ddraw/tests/ddraw1.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 5 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3e491c3e8bb..27be401a2e57 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1627,17 +1627,14 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_display_mode mode; HRESULT hr; - DWORD Size; TRACE("iface %p, surface_desc %p.\n", iface, DDSD); - wined3d_mutex_lock(); /* This seems sane */ - if (!DDSD) - { - wined3d_mutex_unlock(); + if (!DDSD || (DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2))) return DDERR_INVALIDPARAMS; - } + + wined3d_mutex_lock(); if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { @@ -1646,10 +1643,8 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 return hr; } - Size = DDSD->dwSize; - memset(DDSD, 0, Size); - - DDSD->dwSize = Size; + memset(DDSD, 0, DDSD->dwSize); + DDSD->dwSize = sizeof(*DDSD); DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; @@ -1682,21 +1677,25 @@ static HRESULT WINAPI ddraw4_GetDisplayMode(IDirectDraw4 *iface, DDSURFACEDESC2 static HRESULT WINAPI ddraw2_GetDisplayMode(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw2(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c306c4db1a32..b8ac74919f89 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10132,6 +10132,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801ee3e57..716103335f1b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -11643,6 +11643,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc39d..46362e5c1dc0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13247,6 +13247,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d54f..c7a2b138e97b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12547,6 +12547,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } -- 2.15.0 -- Alexandre Julliard julliard(a)winehq.org

3 2

[PATCH] wined3d: Consider CPU blitter when clearing discarded textures.
by Józef Kucia Dec. 21, 2017

Dec. 21, 2017

In order to avoid invalidating system memory for "converted" surfaces. Fixes a regression introduced by commit 56128d18d4df ("wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt()."). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 9 ++++----- dlls/ddraw/tests/ddraw7.c | 9 ++++----- dlls/wined3d/surface.c | 4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc39d..fb42f85b0048 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9960,11 +9960,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface4_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface4_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d54f..2fb845378c42 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9911,11 +9911,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02e0c70382d8..da22c7ad9aaf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2698,13 +2698,15 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) { struct wined3d_resource *resource; struct wined3d_texture *texture; + DWORD locations; resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) return resource->pool == WINED3D_POOL_SYSTEM_MEM; texture = texture_from_resource(resource); - if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding) + locations = texture->sub_resources[view->sub_resource_idx].locations; + if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); -- 2.13.6

2 1

[PATCH 1/2] d3d9/tests: Work around focus-follows-mouse test failures.
by Stefan Dösinger Dec. 21, 2017

Dec. 21, 2017

Removing WS_VISIBLE without updating the window state with SWP_FRAMECHANGED is enough to trigger d3d9's hidden window codepath (native and in Wine), but doesn't actually hide the window. This prevents unpredictable focus changes on focus follows mouse WMs. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 6 +++++- dlls/d3d9/tests/device.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c965af7264..702fea001d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2952,7 +2952,11 @@ static void test_wndproc(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); - ShowWindow(device_window, SW_HIDE); + /* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden + * window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED) + * call. This way we avoid focus changes and random failures on focus follows mouse WMs. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); flush_events(); expect_messages = focus_loss_messages_hidden; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3bf9c10f20..790e98ae4d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3907,7 +3907,11 @@ static void test_wndproc(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); - ShowWindow(device_window, SW_HIDE); + /* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden + * window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED) + * call. This way we avoid focus changes and random failures on focus follows mouse WMs. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); flush_events(); expect_messages = focus_loss_messages_hidden; -- 2.13.6

2 3

[PATCH] testbot/web: Use a white background for Collection tables.
by Francois Gouget Dec. 21, 2017

Dec. 21, 2017

This makes the table more readable when it is wide and goes off the edge of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index bb80e7f2..8c03a914 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -221,6 +221,7 @@ h2 margin-right: auto; padding: 4px; border: 1px solid #601919; + background-color: white; } .CollectionBlock th @@ -347,7 +348,7 @@ td.Record { text-align: center; } .RecordJob { font-size: smaller; } .RecordDuration { } -.Record-start { background-color: white; } +.Record-start { } .Record-off { color: #c0c0c0; } .Record-unknown { background-color: #c0c0c0; } .Record-offline { background-color: red; } -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles between Collections.
by Francois Gouget Dec. 21, 2017

Dec. 21, 2017

Specifically when the Collection is used for a Detailref property (e.g. Jobs->Steps), it should not keep a reference to the parent's ScopeItems. Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index c3bc438c..a9ec9958 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -43,6 +43,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(&new &ComputeMasterKey); +use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Item; use ObjectModel::PropertyDescriptor; @@ -96,6 +97,14 @@ sub new($$$$$;$$@) Filters => {}, AllScopeItems => $AllScopeItems || {}, Items => undef}; + if ($AllScopeItems) + { + # Avoid memory cycles in case Items have Detailref properties: + # ParentCollection{AllScopeItems} --> ParentItem + # ParentItem --DetailrefProperty--> DetailCollection + # DetailCollection{AllScopeItems} == ParentCollection{AllScopeItems} + weaken($self->{AllScopeItems}); + } $self = bless $self, $class; $self->_initialize(@_); return $self; -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles between Items and their Collection.
by Francois Gouget Dec. 21, 2017

Dec. 21, 2017

Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Item.pm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c27e40cf..88c9d1ae 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,6 +26,7 @@ ObjectModel::Item - Base class for items =cut +use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; use ObjectModel::PropertyDescriptor; @@ -68,6 +69,9 @@ sub new($$@) $self->{TableName} = $Collection->{TableName}; $self->{ScopeItems} = $Collection->{AllScopeItems}->{ref($Collection)}; $self->{AllScopeItems} = $Collection->{AllScopeItems}; + # Avoid memory cycles + weaken($self->{ScopeItems}); + weaken($self->{AllScopeItems}); $self->{PropertyDescriptors} = $Collection->{PropertyDescriptors}; $self->{MasterColNames} = $Collection->{MasterColNames}; $self->{MasterColValues} = $Collection->{MasterColValues}; @@ -509,14 +513,21 @@ sub MasterKeyChanged($$) { my ($self, $MasterColValues) = @_; - my $Key = $self->GetKey(); - my $FullKey = $self->GetFullKey($Key); - delete($self->{ScopeItems}->{$FullKey}) if (defined $FullKey); + my $Key; + if ($self->{ScopeItems}) + { + $Key = $self->GetKey(); + my $FullKey = $self->GetFullKey($Key); + delete($self->{ScopeItems}->{$FullKey}) if (defined $FullKey); + } $self->{MasterColValues} = $MasterColValues; $self->{MasterKey} = ObjectModel::Collection::ComputeMasterKey($MasterColValues); - $FullKey = $self->GetFullKey($Key); - $self->{ScopeItems}->{$FullKey} = $self if (defined $FullKey); + if ($self->{ScopeItems}) + { + my $FullKey = $self->GetFullKey($Key); + $self->{ScopeItems}->{$FullKey} = $self if (defined $FullKey); + } $self->KeyChanged(); } -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles in the activity report.
by Francois Gouget Dec. 21, 2017

Dec. 21, 2017

Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 3a9081a3..dcc58956 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,6 +25,7 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -112,6 +113,7 @@ sub GetActivity($) $VMStatus->{host} = $RecordHost; $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles $VMStatus->{start} = $Group->{start}; my ($Status, @Extra) = split / /, $Record->Value; $VMStatus->{status} = $Status; @@ -176,6 +178,7 @@ sub GetActivity($) status => "unknown", rows => 1}; $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles } $LastStatusVMs{$VM->Name} = $StatusVMs; } -- 2.15.1

1 0

[PATCH 1/3] comctl32/tests: Use CreateWindowEx() to create UpDown controls
by Nikolay Sivov Dec. 21, 2017

Dec. 21, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/updown.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 3076285e33..d6dbde01aa 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -293,11 +293,16 @@ static HWND create_updown_control(DWORD style, HWND buddy) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | style, - 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), buddy, - 100, 0, 50); + updown = CreateWindowExA(0, UPDOWN_CLASSA, NULL, WS_CHILD | WS_BORDER | WS_VISIBLE | style, + 0, 0, rect.right, rect.bottom, + parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(updown != NULL, "Failed to create UpDown control.\n"); if (!updown) return NULL; + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)buddy, 0); + SendMessageA(updown, UDM_SETRANGE, 0, MAKELONG(100, 0)); + SendMessageA(updown, UDM_SETPOS, 0, MAKELONG(50, 0)); + oldproc = (WNDPROC)SetWindowLongPtrA(updown, GWLP_WNDPROC, (LONG_PTR)updown_subclass_proc); SetWindowLongPtrA(updown, GWLP_USERDATA, (LONG_PTR)oldproc); -- 2.15.1

1 2

[PATCH] comctl32/tooltips: Reset window subclass data when removing tools
by Nikolay Sivov Dec. 20, 2017

Dec. 20, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Similar to b68dbf4ea1294a98ca653f32e88b07be632a5bae, intentionally separated because it's not essential to fix original bug. dlls/comctl32/tooltips.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 405b1e9f5c..1c8cb66422 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1142,6 +1142,13 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) return TRUE; } +static void TOOLTIPS_ResetSubclass (const TTTOOL_INFO *toolPtr) +{ + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); +} static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) @@ -1174,15 +1181,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) Free (toolPtr->lpszText); } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } - } + TOOLTIPS_ResetSubclass (toolPtr); /* delete tool from tool list */ if (infoPtr->uNumTools == 1) { @@ -1888,10 +1887,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* Reset subclassing data. */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) - SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, - TOOLTIPS_SubclassProc, 1, 0); + TOOLTIPS_ResetSubclass (toolPtr); } Free (infoPtr->tools); -- 2.15.1

1 0

[PATCH] netapi32/tests: Print NetWkstaTransportEnum error code on test failure
by Alex Henrie Dec. 20, 2017

Dec. 20, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This will help us figure out why this test fails intermittently on Windows 10. --- dlls/netapi32/tests/wksta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index ee3004e17c..418a1ad626 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -168,7 +168,8 @@ static void run_wkstatransportenum_tests(void) /* 4th check: is param 6 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); - ok(apiReturn == RPC_X_NULL_REF_POINTER, "null pointer\n"); + ok(apiReturn == RPC_X_NULL_REF_POINTER, + "NetWkstaTransportEnum returned %d\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, -- 2.15.1

2 2

[PATCH] jscript: Use WARN for exception traces instead of separated debug channel.
by Jacek Caban Dec. 20, 2017

Dec. 20, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)

1 0

[PATCH] mfplat: Implement MFGetService()
by Nikolay Sivov Dec. 20, 2017

Dec. 20, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44201 dlls/mf/main.c | 23 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 153 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2ad2e5d37b..73cd6aa3f1 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "mfidl.h" @@ -51,3 +53,24 @@ HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) return E_NOTIMPL; } + +/*********************************************************************** + * MFGetService (mf.@) + */ +HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID riid, void **obj) +{ + IMFGetService *gs; + HRESULT hr; + + TRACE("(%p, %s, %s, %p)\n", object, debugstr_guid(service), debugstr_guid(riid), obj); + + if (!object) + return E_POINTER; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFGetService, (void **)&gs))) + return hr; + + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 54fa1f3dbe..deb9057153 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -72,7 +72,7 @@ @ stub MFCreateWMVEncoderActivate @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders -@ stub MFGetService +@ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f28c6e048d..76e092aa80 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfidl.h" #include "wine/test.h" @@ -43,7 +44,134 @@ static void test_topology(void) IMFTopology_Release(topology); } +static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFGetService) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_getservice_AddRef(IMFGetService *iface) +{ + return 2; +} + +static ULONG WINAPI test_getservice_Release(IMFGetService *iface) +{ + return 1; +} + +static HRESULT WINAPI test_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + *obj = (void *)0xdeadbeef; + return 0x83eddead; +} + +static const IMFGetServiceVtbl testmfgetservicevtbl = +{ + test_getservice_QI, + test_getservice_AddRef, + test_getservice_Release, + test_getservice_GetService, +}; + +static IMFGetService test_getservice = { &testmfgetservicevtbl }; + +static HRESULT WINAPI testservice_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IMFGetService)) + return 0x82eddead; + + return E_NOINTERFACE; +} + +static HRESULT WINAPI testservice2_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &test_getservice; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testservice_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI testservice_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testservicevtbl = +{ + testservice_QI, + testservice_AddRef, + testservice_Release, +}; + +static const IUnknownVtbl testservice2vtbl = +{ + testservice2_QI, + testservice_AddRef, + testservice_Release, +}; + +static IUnknown testservice = { &testservicevtbl }; +static IUnknown testservice2 = { &testservice2vtbl }; + +static void test_MFGetService(void) +{ + IUnknown *unk; + HRESULT hr; + + hr = MFGetService(NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(NULL, NULL, NULL, (void **)&unk); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + hr = MFGetService(&testservice, NULL, NULL, NULL); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(&testservice, NULL, NULL, (void **)&unk); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + unk = NULL; + hr = MFGetService(&testservice2, NULL, NULL, (void **)&unk); + ok(hr == 0x83eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); +} + START_TEST(mf) { test_topology(); + test_MFGetService(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 2792d383db..12b351d87b 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -256,3 +256,4 @@ cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMedi cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") -- 2.15.1

1 0