March 2019 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Set display mode to a suitable adapter format.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 9fc282d682cfef466a3ee341b901f7081c0959e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fc282d682cfef466a3ee341… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:12 2019 +0100 wined3d: Set display mode to a suitable adapter format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46792 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 16 ++++++++++++++-- dlls/wined3d/utils.c | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7fc05f..724ea16 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -762,6 +762,16 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const swapchain->max_frame_latency = device->max_frame_latency >= 2 ? device->max_frame_latency - 1 : 1; } +static enum wined3d_format_id adapter_format_from_backbuffer_format(struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id) +{ + const struct wined3d_adapter *adapter = swapchain->device->adapter; + const struct wined3d_format *backbuffer_format; + + backbuffer_format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); + return pixelformat_for_depth(backbuffer_format->byte_count * CHAR_BIT); +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -881,7 +891,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 /* Change the display settings */ swapchain->d3d_mode.width = desc->backbuffer_width; swapchain->d3d_mode.height = desc->backbuffer_height; - swapchain->d3d_mode.format_id = desc->backbuffer_format; + swapchain->d3d_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + desc->backbuffer_format); swapchain->d3d_mode.refresh_rate = desc->refresh_rate; swapchain->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; @@ -1414,7 +1425,8 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = swapchain_desc->backbuffer_format; + actual_mode.format_id = adapter_format_from_backbuffer_format(swapchain, + swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 469ce1b..a800527 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5672,7 +5672,6 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, } } -/* DirectDraw stuff */ enum wined3d_format_id pixelformat_for_depth(DWORD depth) { switch (depth)

1 0

Matteo Bruni : d3d9/tests: Add a test for GetDisplayMode().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 3ff53bdad24cecd8f7cff69dc0b0d5c79920b9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff53bdad24cecd8f7cff69d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:13 2019 +0100 d3d9/tests: Add a test for GetDisplayMode(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d119b63..705deab 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13315,6 +13315,82 @@ static void test_vertex_buffer_read_write(void) DestroyWindow(window); } +static void test_get_display_mode(void) +{ + IDirect3DSwapChain9 *swapchain; + IDirect3DDevice9 *device; + struct device_desc desc; + D3DDISPLAYMODE mode; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetDisplayMode(swapchain, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3DSwapChain9_Release(swapchain); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); + ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); + ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetDisplayMode(swapchain, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); + ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3DSwapChain9_Release(swapchain); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13441,6 +13517,7 @@ START_TEST(device) test_resource_access(); test_multiply_transform(); test_vertex_buffer_read_write(); + test_get_display_mode(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : d3d8/tests: Add a test for GetDisplayMode().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: e3957a5627b65fa0c1f8ff238f858f21022bf070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3957a5627b65fa0c1f8ff23… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:14 2019 +0100 d3d8/tests: Add a test for GetDisplayMode(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b9a999e..90b90e9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9630,6 +9630,67 @@ todo_wine { DestroyWindow(window); } +static void test_get_display_mode(void) +{ + IDirect3DDevice8 *device; + struct device_desc desc; + D3DDISPLAYMODE mode; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDisplayMode(device, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDisplayMode(device, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); + ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); + ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); + ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9744,6 +9805,7 @@ START_TEST(device) test_resource_access(); test_multiply_transform(); test_draw_primitive(); + test_get_display_mode(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : wined3d: Remove now unused glsl_version parameter from wined3d_guess_card().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d91cd1ca592b81310c02dc8dada2ae85bd4752d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91cd1ca592b81310c02dc8d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:15 2019 +0100 wined3d: Remove now unused glsl_version parameter from wined3d_guess_card(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 686f4f0..e7dd0da 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1880,7 +1880,7 @@ card_vendor_table[] = }; static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level feature_level, - DWORD glsl_version, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, + const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { /* A Direct3D device object contains the PCI id (vendor + device) of the @@ -3857,8 +3857,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); TRACE("Guessed vendor PCI ID 0x%04x.\n", vendor); - device = wined3d_guess_card(d3d_info->feature_level, gl_info->glsl_version, - gl_renderer_str, &gl_vendor, &vendor); + device = wined3d_guess_card(d3d_info->feature_level, gl_renderer_str, &gl_vendor, &vendor); TRACE("Guessed device PCI ID 0x%04x.\n", device); if (!(gpu_description = wined3d_get_gpu_description(vendor, device)))

1 0

Michael Stefaniuc : mfreadwrite: Remove useless cast to self.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 1d1c038391be7977d864ffb9240513894c9c709a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1c038391be7977d864ffb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 14 20:39:39 2019 +0100 mfreadwrite: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index f3fd3b2..034d5f8 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -318,7 +318,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at return hr; hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, - (IUnknown **)&object); + &object); if (SUCCEEDED(hr)) { switch (obj_type)

1 0

Michael Stefaniuc : cmd: Remove useless cast to self.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 78570747006bf4ab6bd5bdaf3c2a6cd432f792dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=78570747006bf4ab6bd5bdaf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 14 20:39:40 2019 +0100 cmd: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 435e0f3..1576ab7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -337,7 +337,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Work out the number of columns */ WINE_TRACE("%d entries, maxwidth=%d, widest=%d\n", entry_count, max_width, widest); if (wide || orderByCol) { - numCols = max(1, (int)max_width / widest); + numCols = max(1, max_width / widest); numRows = entry_count / numCols; if (entry_count % numCols) numRows++; } else {

1 0

Zebediah Figura : quartz/tests: Fix static link to GetTickCount64().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 3befa57d6a2410746596f414abad35a659b92950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3befa57d6a2410746596f414… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 12:12:18 2019 -0500 quartz/tests: Fix static link to GetTickCount64(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 258e198..9dae754 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -74,7 +74,7 @@ static void test_get_time(void) hr = IReferenceClock_GetTime(clock, &time1); if (pGetTickCount64) - time2 = GetTickCount64() * 10000; + time2 = pGetTickCount64() * 10000; else time2 = GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Add a missing call to ITypeInfo_ReleaseTypeAttr().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 94063ac1f849f6afaefc3fe0bfd52d7dfc137e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94063ac1f849f6afaefc3fe0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 12:12:19 2019 -0500 quartz/tests: Add a missing call to ITypeInfo_ReleaseTypeAttr(). Spotted by Nikolay Sivov. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index dcaedd5..09bd473 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -394,6 +394,7 @@ static void test_basic_audio(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); ok(IsEqualGUID(&typeattr->guid, &IID_IBasicAudio), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo_Release(typeinfo); IBasicAudio_Release(audio);

1 0

Zebediah Figura : quartz/tests: Add some tests for advising from system clock.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: b789c44bea07f5513b56cb52998019cd02fdf956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b789c44bea07f5513b56cb52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 12:12:20 2019 -0500 quartz/tests: Add some tests for advising from system clock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 83 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 9dae754..77e6c63 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -96,6 +96,88 @@ static void test_get_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_advise(void) +{ + IReferenceClock *clock = create_system_clock(); + HANDLE event, semaphore; + REFERENCE_TIME current; + DWORD_PTR cookie; + unsigned int i; + HRESULT hr; + ULONG ref; + + event = CreateEventA(NULL, TRUE, FALSE, NULL); + semaphore = CreateSemaphoreA(NULL, 0, 10, NULL); + + hr = IReferenceClock_GetTime(clock, &current); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdviseTime(clock, -1000 * 10000, 500 * 10000, (HEVENT)event, &cookie); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + + hr = IReferenceClock_Unadvise(clock, cookie); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ResetEvent(event); + hr = IReferenceClock_GetTime(clock, &current); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IReferenceClock_Unadvise(clock, cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(event, 520) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + ResetEvent(event); + hr = IReferenceClock_GetTime(clock, &current); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + hr = IReferenceClock_AdviseTime(clock, current + 500 * 10000, 0, (HEVENT)event, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + + hr = IReferenceClock_GetTime(clock, &current); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, current, 0, (HSEMAPHORE)semaphore, &cookie); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, current, -500 * 10000, (HSEMAPHORE)semaphore, &cookie); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, -500 * 10000, 1000 * 10000, (HSEMAPHORE)semaphore, &cookie); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + for (i = 0; i < 5; ++i) + { + ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 40), "Semaphore should be signaled.\n"); + } + + hr = IReferenceClock_Unadvise(clock, cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(WaitForSingleObject(semaphore, 520) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + + CloseHandle(event); + CloseHandle(semaphore); + + ref = IReferenceClock_Release(clock); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(systemclock) { CoInitialize(NULL); @@ -104,6 +186,7 @@ START_TEST(systemclock) test_interfaces(); test_get_time(); + test_advise(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/systemclock: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: fa262317480e52eb3420c4e0ba9bae9e17db4457 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa262317480e52eb3420c4e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 12:12:21 2019 -0500 quartz/systemclock: Use the global HeapAlloc() wrappers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + dlls/quartz/systemclock.c | 47 ++++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index be31c92..2104f80 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -31,6 +31,7 @@ #include "winuser.h" #include "dshow.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/list.h" diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index c809ce4..e9f13b5 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -122,7 +122,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { SetEvent(it->hEvent); /** ... and Release it */ QUARTZ_RemoveAviseEntryFromQueue(This, it); - CoTaskMemFree(it); + heap_free(it); it = nextit; } if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; @@ -234,7 +234,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { } This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); - CoTaskMemFree(This); + heap_free(This); } return ref; } @@ -279,11 +279,9 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFEREN if (NULL == pdwAdviseCookie) { return E_POINTER; } - pEntry = CoTaskMemAlloc(sizeof(SystemClockAdviseEntry)); - if (NULL == pEntry) { + + if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) return E_OUTOFMEMORY; - } - ZeroMemory(pEntry, sizeof(SystemClockAdviseEntry)); pEntry->hEvent = (HANDLE) hEvent; pEntry->rtBaseTime = rtBaseTime + rtStreamTime; @@ -315,11 +313,9 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REF if (NULL == pdwAdviseCookie) { return E_POINTER; } - pEntry = CoTaskMemAlloc(sizeof(SystemClockAdviseEntry)); - if (NULL == pEntry) { + + if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) return E_OUTOFMEMORY; - } - ZeroMemory(pEntry, sizeof(SystemClockAdviseEntry)); pEntry->hEvent = (HANDLE) hSemaphore; pEntry->rtBaseTime = rtStartTime; @@ -355,7 +351,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR } QUARTZ_RemoveAviseEntryFromQueue(This, pEntry); - CoTaskMemFree(pEntry); + heap_free(pEntry); SystemClockPostMessageToAdviseThread(This, ADVISE_REMOVE); @@ -375,23 +371,22 @@ static const IReferenceClockVtbl SystemClock_Vtbl = SystemClockImpl_Unadvise }; -HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) { - SystemClockImpl* obj = NULL; - - TRACE("(%p,%p)\n", ppv, pUnkOuter); +HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) +{ + SystemClockImpl *object; - obj = CoTaskMemAlloc(sizeof(SystemClockImpl)); - if (NULL == obj) { - *ppv = NULL; - return E_OUTOFMEMORY; - } - ZeroMemory(obj, sizeof(SystemClockImpl)); + TRACE("outer %p, out %p.\n", outer, out); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } - obj->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; - obj->ref = 0; /* will be inited by QueryInterface */ + object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; - InitializeCriticalSection(&obj->safe); - obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); + InitializeCriticalSection(&object->safe); + object->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); - return SystemClockImpl_QueryInterface(&obj->IReferenceClock_iface, &IID_IReferenceClock, ppv); + return SystemClockImpl_QueryInterface(&object->IReferenceClock_iface, &IID_IReferenceClock, out); }

1 0