May 2021 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_set_render_state().
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 308dd8bd32f7a575d790d012e7e6bd429b9e1ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308dd8bd32f7a575d790d012… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:36:36 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_set_render_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 21aaa2e54b6..14076defaa9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1767,16 +1767,17 @@ static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void * device_invalidate_state(cs->c.device, STATE_RENDER(op->state)); } -void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) +void wined3d_device_context_emit_set_render_state(struct wined3d_device_context *context, + enum wined3d_render_state state, unsigned int value) { struct wined3d_cs_set_render_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; op->state = state; op->value = value; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2cd0ac6bb38..7e1297f8896 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1675,7 +1675,7 @@ static void wined3d_device_set_render_state(struct wined3d_device *device, else { device->cs->c.state->render_states[state] = value; - wined3d_cs_emit_set_render_state(device->cs, state, value); + wined3d_device_context_emit_set_render_state(&device->cs->c, state, value); } if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) @@ -1854,7 +1854,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) { - wined3d_cs_emit_set_render_state(device->cs, i, state->render_states[i]); + wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); } wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 079b60e4a7a..4c308d2ac05 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4808,6 +4808,8 @@ void wined3d_device_context_emit_set_predication(struct wined3d_device_context * struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_render_state(struct wined3d_device_context *context, + enum wined3d_render_state state, unsigned int value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_sampler(struct wined3d_device_context *context, enum wined3d_shader_type type,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_set_state().
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: b069e48c13b9d765c836bf8c92205ed4ead74973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b069e48c13b9d765c836bf8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:36:37 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_set_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/wined3d/device.c | 7 +++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0819918b2a1..6b3ff22055f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2839,7 +2839,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 state_impl = impl_from_ID3DDeviceContextState(state); if (!(wined3d_state = d3d_device_context_state_get_wined3d_state(state_impl, device))) ERR("Failed to get wined3d state for device context state %p.\n", state_impl); - wined3d_device_set_state(device->wined3d_device, wined3d_state); + wined3d_device_context_set_state(context->wined3d_context, wined3d_state); if (prev) ID3DDeviceContextState_AddRef(*prev = &prev_impl->ID3DDeviceContextState_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e1297f8896..a8383a89617 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1737,15 +1737,14 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_ *rect_count = state->scissor_rect_count; } -void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state) +void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) { - struct wined3d_device_context *context = &device->cs->c; const struct wined3d_light_info *light; unsigned int i, j; - TRACE("device %p, state %p.\n", device, state); + TRACE("context %p, state %p.\n", context, state); - device->cs->c.state = state; + context->state = state; wined3d_device_context_emit_set_feature_level(context, state->feature_level); for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2879e1653d3..f339d91ee5c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,7 +129,6 @@ @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) -@ cdecl wined3d_device_set_state(ptr ptr) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long) @@ -189,6 +188,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_state(ptr ptr) @ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dd1c15f14ed..d4762b79e6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2489,7 +2489,6 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); -void __cdecl wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, @@ -2609,6 +2608,7 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state); void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context,

1 0

Zhiyi Zhang : user32/tests: Do not change adapters to every available modes.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: cad102465ddb1151cdac4ec073e734dfaee0d85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad102465ddb1151cdac4ec0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:21 2021 +0800 user32/tests: Do not change adapters to every available modes. This reduce the time to run the monitor test from 6 minutes to 25 seconds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50086 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b233970ace..4510e15b79b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -333,6 +333,7 @@ static void test_ChangeDisplaySettingsEx(void) DISPLAY_DEVICEA dd; POINTL position; DEVMODEW dmW; + BOOL found; LONG res; int i; @@ -732,7 +733,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } - /* Test changing each adapter to every available mode */ + /* Test changing each adapter to different width, height, frequency and depth */ position.x = 0; position.y = 0; for (device = 0; device < device_count; ++device) @@ -741,6 +742,42 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + if (mode == 0) + { + dm2 = dm; + } + else + { + found = FALSE; + if (dm2.dmPelsWidth && dm.dmPelsWidth != dm2.dmPelsWidth) + { + dm2.dmPelsWidth = 0; + found = TRUE; + } + if (dm2.dmPelsHeight && dm.dmPelsHeight != dm2.dmPelsHeight) + { + dm2.dmPelsHeight = 0; + found = TRUE; + } + if (dm2.dmDisplayFrequency && dm.dmDisplayFrequency != dm2.dmDisplayFrequency) + { + dm2.dmDisplayFrequency = 0; + found = TRUE; + } + if (dm2.dmBitsPerPel && dm.dmBitsPerPel != dm2.dmBitsPerPel) + { + dm2.dmBitsPerPel = 0; + found = TRUE; + } + + if (!dm2.dmPelsWidth && !dm2.dmPelsHeight && !dm2.dmDisplayFrequency + && !dm2.dmBitsPerPel) + break; + + if (!found) + continue; + } + dm.dmPosition = position; dm.dmFields |= DM_POSITION; /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */

1 0

Zhiyi Zhang : winex11.drv: Support reporting emulated display depth.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: a92ab08688b1e425c887ccb77196bbf681f24be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a92ab08688b1e425c887ccb7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:33 2021 +0800 winex11.drv: Support reporting emulated display depth. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 ++--- dlls/user32/tests/monitor.c | 3 --- dlls/winex11.drv/settings.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d854ebcc56d..f1d48639c14 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4061,7 +4061,7 @@ static void test_create_device_from_clipper1(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4240,7 +4240,7 @@ static void test_create_device_from_clipper2(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4418,7 +4418,7 @@ static void test_create_device_from_clipper3(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4510e15b79b..1daf677a815 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -297,8 +297,6 @@ static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, D ok_(__FILE__, line)((dm.dmFields & expected->dmFields) == expected->dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected->dmFields, dm.dmFields); - /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected->dmFields & DM_BITSPERPEL && expected->dmBitsPerPel != 32 && expected->dmBitsPerPel != 24) ok_(__FILE__, line)(!(expected->dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected->dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected->dmBitsPerPel, dm.dmBitsPerPel); ok_(__FILE__, line)(!(expected->dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected->dmPelsWidth, @@ -696,7 +694,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine_if(depths[test] != 32) ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", devices[device].name, depths[test], dm.dmBitsPerPel); /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9a43231f34d..cea7ebbc6b7 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,6 +45,16 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; +struct x11drv_display_depth +{ + struct list entry; + ULONG_PTR display_id; + DWORD depth; +}; + +/* Display device emulated depth list, protected by modes_section */ +static struct list x11drv_display_depth_list = LIST_INIT(x11drv_display_depth_list); + /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -405,6 +415,54 @@ static int mode_compare(const void *p1, const void *p2) return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } +static void set_display_depth(ULONG_PTR display_id, DWORD depth) +{ + struct x11drv_display_depth *display_depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + display_depth->depth = depth; + LeaveCriticalSection(&modes_section); + return; + } + } + + display_depth = heap_alloc(sizeof(*display_depth)); + if (!display_depth) + { + ERR("Failed to allocate memory.\n"); + LeaveCriticalSection(&modes_section); + return; + } + + display_depth->display_id = display_id; + display_depth->depth = depth; + list_add_head(&x11drv_display_depth_list, &display_depth->entry); + LeaveCriticalSection(&modes_section); +} + +static DWORD get_display_depth(ULONG_PTR display_id) +{ + struct x11drv_display_depth *display_depth; + DWORD depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + depth = display_depth->depth; + LeaveCriticalSection(&modes_section); + return depth; + } + } + LeaveCriticalSection(&modes_section); + return screen_bpp; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -434,6 +492,10 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } + + if (!is_detached_mode(devmode)) + devmode->dmBitsPerPel = get_display_depth(id); + goto done; } @@ -842,6 +904,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); + if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL) + set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret;

1 0

Zhiyi Zhang : user32/tests: Add display DC color depth tests.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: c5ed4893b3b6f8be71126e231744dae4743d89f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ed4893b3b6f8be71126e23… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:42 2021 +0800 user32/tests: Add display DC color depth tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 1daf677a815..ab03837f5e6 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -2030,7 +2035,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2058,6 +2066,35 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + value = GetDeviceCaps(hdc, BITSPIXEL); + todo_wine_if(dm->dmBitsPerPel != 32) + ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", + dm->dmBitsPerPel, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + /* GetObjectA fails on Win7 and older */ + ok_(__FILE__, line)(ret || broken(!ret), "GetObjectA failed, error %d.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == 32, "Expected bmBitsPixel %d, got %d.\n", 32, + bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) @@ -2081,7 +2118,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) @@ -2103,6 +2140,33 @@ static void test_display_dc(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + DeleteDC(hdc); /* Test DCs covering a specific monitor */ @@ -2122,7 +2186,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) @@ -2145,7 +2209,33 @@ static void test_display_dc(void) check_display_dc(hdc, &dm2, FALSE); + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + /* Tests after monitor detach */ + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm2); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) { old_count = GetSystemMetrics(SM_CMONITORS);

1 0

Rémi Bernon : user32: Factor IsRectEmpty driver check in ShowWindow.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 07b9f3f609e6c6d6d4b9af4c223392479ba99afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b9f3f609e6c6d6d4b9af4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:04 2021 +0200 user32: Factor IsRectEmpty driver check in ShowWindow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 6 ++++-- dlls/wineandroid.drv/window.c | 1 - dlls/winemac.drv/window.c | 1 - dlls/winex11.drv/window.c | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c6f806f7beb..cf7e7914869 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1044,7 +1044,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; RECT newPos = {0, 0, 0, 0}; - UINT swp = 0; + UINT new_swp, swp = 0; TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); @@ -1117,7 +1117,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (!IsWindow( hwnd )) goto done; } - swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + if (IsRectEmpty( &newPos )) new_swp = swp; + else new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + swp = new_swp; parent = GetAncestor( hwnd, GA_PARENT ); if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 1cb1bbbadc9..1c61d4eb76e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1385,7 +1385,6 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag */ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - if (IsRectEmpty( rect )) return swp; if (!IsIconic( hwnd )) return swp; /* always hide icons off-screen */ if (rect->left != -32000 || rect->top != -32000) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7f5327fcdc..4e60189ead9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1798,7 +1798,6 @@ UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) hwnd, data ? data->cocoa_window : NULL, cmd, wine_dbgstr_rect(rect), swp); if (!data || !data->cocoa_window) goto done; - if (IsRectEmpty(rect)) goto done; if (GetWindowLongW(hwnd, GWL_STYLE) & WS_MINIMIZE) { if (rect->left != -32000 || rect->top != -32000) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b3ae5c54408..c30fe6d39b0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2560,7 +2560,6 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) struct x11drv_win_data *data = get_win_data( hwnd ); if (!data || !data->whole_window) goto done; - if (IsRectEmpty( rect )) goto done; if (style & WS_MINIMIZE) { if (((rect->left != -32000 || rect->top != -32000)) && hide_icon( data ))

1 0

Rémi Bernon : user32: Add a default ShowWindow implementation.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 60f6a37f954e88c16fdee81bac255737dd52e449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f6a37f954e88c16fdee81b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:05 2021 +0200 user32: Add a default ShowWindow implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/winpos.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 87c8cd621b3..f769677d30d 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -356,7 +356,7 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) static UINT CDECL nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - return swp; + return ~0; /* use default implementation */ } static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index cf7e7914869..de5d50d4c3a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1118,7 +1118,16 @@ static BOOL show_window( HWND hwnd, INT cmd ) } if (IsRectEmpty( &newPos )) new_swp = swp; - else new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + else if ((new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0) + { + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp; + else if (IsIconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000)) + { + OffsetRect( &newPos, -32000 - newPos.left, -32000 - newPos.top ); + new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + else new_swp = swp; + } swp = new_swp; parent = GetAncestor( hwnd, GA_PARENT );

1 0

Rémi Bernon : user32: Return WAIT_TIMEOUT in nulldrv_MsgWaitForMultipleObjectsEx.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 702b52fe13fa08040bdd94400b3f4e5eec049d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=702b52fe13fa08040bdd9440… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:06 2021 +0200 user32: Return WAIT_TIMEOUT in nulldrv_MsgWaitForMultipleObjectsEx. When there's nothing to wait for. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index f769677d30d..54a888b16d9 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -305,6 +305,7 @@ static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *w static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { + if (!count && !timeout) return WAIT_TIMEOUT; return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); }

1 0

Rémi Bernon : user32: Duplicate klid to HKL high word in LoadKeyboardLayoutW.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 50ca64fcdf00e782213a541c7d128fdf5815a9e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50ca64fcdf00e782213a541c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:07 2021 +0200 user32: Duplicate klid to HKL high word in LoadKeyboardLayoutW. When high word is 0, and unless it has an explicit layout id. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 5d9bbe14cd6..ba0292c8f88 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1548,7 +1548,8 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags ); tmp = wcstoul( name, NULL, 16 ); - layout = UlongToHandle( tmp ); + if (HIWORD( tmp )) layout = UlongToHandle( tmp ); + else layout = UlongToHandle( MAKELONG( LOWORD( tmp ), LOWORD( tmp ) ) ); wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" ); wcscat( layout_path, name );

1 0

Rémi Bernon : explorer: Create systray for the null graphics driver.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 2027c8ee1fb9c47d11995ac842cb924e938589b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2027c8ee1fb9c47d11995ac8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:08 2021 +0200 explorer: Create systray for the null graphics driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 20 ++++++++------------ programs/explorer/systray.c | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 51d1535aea6..2ba276f52cb 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -959,6 +959,7 @@ void manage_desktop( WCHAR *arg ) const WCHAR *name = NULL; BOOL enable_shell = FALSE; void (WINAPI *pShellDDEInit)( BOOL ) = NULL; + HMODULE shell32; /* get the rest of the command line (if any) */ while (*p && !is_whitespace(*p)) p++; @@ -1028,20 +1029,15 @@ void manage_desktop( WCHAR *arg ) initialize_display_settings(); initialize_appbar(); - if (graphics_driver) - { - HMODULE shell32; - - if (using_root) enable_shell = FALSE; + if (using_root) enable_shell = FALSE; - initialize_systray( graphics_driver, using_root, enable_shell ); - if (!using_root) initialize_launchers( hwnd ); + initialize_systray( graphics_driver, using_root, enable_shell ); + if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryW( L"shell32.dll" )) && - (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) - { - pShellDDEInit( TRUE ); - } + if ((shell32 = LoadLibraryW( L"shell32.dll" )) && + (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) + { + pShellDDEInit( TRUE ); } } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 161b4b57e58..0c978451151 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -900,7 +900,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root && graphics_driver) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0