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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetVector() helper.
by Alexandre Julliard March 15, 2019

March 15, 2019

Module: wine Branch: master Commit: 6eb69d2cf6a9049a3fedc3ec71146b3745f17e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb69d2cf6a9049a3fedc3ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 01:56:24 2019 +0100 d3dx9: Merge the d3dx_effect_SetVector() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 99 +++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ccf9baf..b471c84 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,58 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - set_dirty(param); - if (param->type == D3DXPT_INT && param->bytes == 4) - { - DWORD tmp; - - TRACE("INT fixup\n"); - tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); - tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; - tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; - tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; - - *(INT *)param->data = tmp; - return D3D_OK; - } - if (param->type == D3DXPT_FLOAT) - { - memcpy(param->data, vector, param->columns * sizeof(float)); - return D3D_OK; - } - - set_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2877,10 +2825,55 @@ static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + set_dirty(param); + if (param->type == D3DXPT_INT && param->bytes == 4) + { + DWORD tmp; + + TRACE("INT fixup.\n"); + tmp = max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI; + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(int *)param->data = tmp; + return D3D_OK; + } + if (param->type == D3DXPT_FLOAT) + { + memcpy(param->data, vector, param->columns * sizeof(float)); + return D3D_OK; + } + + set_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)

1 0

Zebediah Figura : quartz/tests: Add some tests for advising from system clock.
by Alexandre Julliard March 14, 2019

March 14, 2019

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/tests: Fix static link to GetTickCount64().
by Alexandre Julliard March 14, 2019

March 14, 2019

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

Matteo Bruni : d3d9/tests: Add a test for GetDisplayMode().
by Alexandre Julliard March 14, 2019

March 14, 2019

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 : wined3d: Set display mode to a suitable adapter format.
by Alexandre Julliard March 14, 2019

March 14, 2019

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: Fix test_window_style() D3D9Ex test on current Windows 10.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: e6169ecfefcdb484dcfff6d3c949898947f71beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6169ecfefcdb484dcfff6d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 14 16:30:11 2019 +0100 d3d9/tests: Fix test_window_style() D3D9Ex test on current Windows 10. 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/d3d9ex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f46ced..306241a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3519,10 +3519,12 @@ static void test_window_style(void) } style = GetWindowLongA(device_window, GWL_STYLE); - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (device_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); style = GetWindowLongA(focus_window, GWL_STYLE); @@ -3540,7 +3542,8 @@ static void test_window_style(void) ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i); GetClientRect(device_window, &r2); - todo_wine ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); + if (!(device_style & WS_OVERLAPPEDWINDOW)) + ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); GetWindowRect(focus_window, &r); ok(EqualRect(&r, &focus_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&focus_rect), wine_dbgstr_rect(&r), i); @@ -3589,11 +3592,14 @@ static void test_window_style(void) ok(!!device, "Failed to create a D3D device.\n"); style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].create2_style; - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (expected_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); expected_style = device_exstyle | tests[i].create2_exstyle; style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (expected_style & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(focus_window, GWL_STYLE);

1 0

Alexandre Julliard : libport: Avoid issues with struct timeval on Windows.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: d45d751d76f18ac25c069bfa787fb3339fb3f073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d751d76f18ac25c069bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 17:48:51 2019 +0100 libport: Avoid issues with struct timeval on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/mkstemps.c | 12 ++++++++---- libs/port/poll.c | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 5c8c7a3..ba92b2a 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -65,7 +65,6 @@ mkstemps ( static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; static unsigned __int64 value; - struct timeval tv; char *XXXXXX; size_t len; int count; @@ -80,9 +79,14 @@ mkstemps ( XXXXXX = &template[len - 6 - suffix_len]; - /* Get some more or less random data. */ - gettimeofday (&tv, NULL); - value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); +#ifndef _WIN32 + { + struct timeval tv; + gettimeofday( &tv, NULL ); + value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec; + } +#endif + value += getpid(); for (count = 0; count < TMP_MAX; ++count) { diff --git a/libs/port/poll.c b/libs/port/poll.c index 7ee5852..c499a96 100644 --- a/libs/port/poll.c +++ b/libs/port/poll.c @@ -35,6 +35,13 @@ #define FD_SETSIZE 64 +struct __ms_timeval +{ + long tv_sec; + long tv_usec; +}; +#define timeval __ms_timeval + typedef struct { unsigned int fd_count;

1 0

Alexandre Julliard : libport: Don't build some functions that aren' t needed on Windows.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: fb4c12770528d5a1614fb75d6a44f2080005140f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4c12770528d5a1614fb75d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 16:13:23 2019 +0100 libport: Don't build some functions that aren't needed on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 48 ++++++++++++++++++++++++------------------------ libs/port/isfinite.c | 2 +- libs/port/isinf.c | 2 +- libs/port/isnan.c | 2 +- libs/port/spawn.c | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index dc97d71..d23e2b0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -86,6 +86,30 @@ typedef int ssize_t; # endif #endif +#ifndef HAVE_ISFINITE +int isfinite(double x); +#endif + +#ifndef HAVE_ISINF +int isinf(double x); +#endif + +#ifndef HAVE_ISNAN +int isnan(double x); +#endif + +/* Process creation flags */ +#ifndef _P_WAIT +# define _P_WAIT 0 +# define _P_NOWAIT 1 +# define _P_OVERLAY 2 +# define _P_NOWAITO 3 +# define _P_DETACH 4 +#endif +#ifndef HAVE__SPAWNVP +extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); +#endif + #endif /* _WIN32 */ /**************************************************************** @@ -237,18 +261,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_ISFINITE -int isfinite(double x); -#endif - -#ifndef HAVE_ISINF -int isinf(double x); -#endif - -#ifndef HAVE_ISNAN -int isnan(double x); -#endif - #ifndef HAVE_LLRINT __int64 llrint(double x); #endif @@ -323,18 +335,6 @@ int usleep (unsigned int useconds); extern int mkstemps(char *template, int suffix_len); -/* Process creation flags */ -#ifndef _P_WAIT -# define _P_WAIT 0 -# define _P_NOWAIT 1 -# define _P_OVERLAY 2 -# define _P_NOWAITO 3 -# define _P_DETACH 4 -#endif -#ifndef HAVE__SPAWNVP -extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); -#endif - /* Interlocked functions */ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/libs/port/isfinite.c b/libs/port/isfinite.c index 26b5a37..b1ce304 100644 --- a/libs/port/isfinite.c +++ b/libs/port/isfinite.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISFINITE +#if !defined(HAVE_ISFINITE) && !defined(isfinite) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/isinf.c b/libs/port/isinf.c index e0c35ad..89f62c9 100644 --- a/libs/port/isinf.c +++ b/libs/port/isinf.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISINF +#if !defined(HAVE_ISINF) && !defined(isinf) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/isnan.c b/libs/port/isnan.c index b2a1be6..e98875c 100644 --- a/libs/port/isnan.c +++ b/libs/port/isnan.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE_ISNAN +#if !defined(HAVE_ISNAN) && !defined(isnan) #ifdef HAVE_IEEEFP_H #include <ieeefp.h> diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 97364e7..9292005 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#ifndef HAVE__SPAWNVP +#if !defined(HAVE__SPAWNVP) && !defined(_WIN32) #include <errno.h> #include <signal.h>

1 0

Zebediah Figura : quartz/systemclock: Use the global HeapAlloc() wrappers.
by Alexandre Julliard March 14, 2019

March 14, 2019

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

Zebediah Figura : quartz/tests: Add a missing call to ITypeInfo_ReleaseTypeAttr().
by Alexandre Julliard March 14, 2019

March 14, 2019

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