January 2022 - Wine-Commits

Olivier F. R. Dierick : taskschd: Set count to zero in regtasks_get_Count stub.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: wine Branch: master Commit: bbd9b9bfee41ae2274e9579f418b0b741e29e6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd9b9bfee41ae2274e9579f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 7 00:58:03 2022 +0100 taskschd: Set count to zero in regtasks_get_Count stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52349 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/regtask.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 0b4b5717657..094f34d8f79 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -465,6 +465,7 @@ static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID d static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) { FIXME("%p,%p: stub\n", iface, count); + if (count) *count = 0; return E_NOTIMPL; }

1 0

Zebediah Figura : cryptnet: Open the revocation cache file in binary mode.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: wine Branch: master Commit: c51bf452bacf74db921dc7ea700cde66bd9374d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c51bf452bacf74db921dc7ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 6 18:47:47 2022 -0600 cryptnet: Open the revocation cache file in binary mode. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2f4e2d895f7..e1b32216353 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1578,7 +1578,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1626,7 +1626,7 @@ static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file);

1 0

Gabriel Ivăncescu : mshtml: Fix nsnode leak when cloning.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: wine Branch: master Commit: 059848c5cd7e29ebf181a347c141d8697a9a9a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059848c5cd7e29ebf181a347… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 6 19:10:46 2022 +0200 mshtml: Fix nsnode leak when cloning. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 996c28c1038..23ab7195aca 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -800,6 +800,7 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD } hres = This->vtbl->clone(This, nsnode, &new_node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres;

1 0

Conor McCarthy : vkd3d: Use a binary search for matching a descriptor to an allocation.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 67ee837f2bf82dc17c0753d2aaa7c29b5bc9b105 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67ee837f2bf82dc17c0753d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 5 14:54:50 2022 +1000 vkd3d: Use a binary search for matching a descriptor to an allocation. The performance improvement will be useful for Vulkan-backed heaps, where descriptor heaps must be found more often. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 96ff7ae..7d0922e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2179,6 +2179,33 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca pthread_mutex_destroy(&allocator->mutex); } +/* We could use bsearch() or recursion here, but it probably helps to omit + * all the extra function calls. */ +static struct vkd3d_gpu_descriptor_allocation *vkd3d_gpu_descriptor_allocator_binary_search( + const struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + struct vkd3d_gpu_descriptor_allocation *allocations = allocator->allocations; + const struct d3d12_desc *base; + size_t centre, count; + + for (count = allocator->allocation_count; count > 1; ) + { + centre = count >> 1; + base = allocations[centre].base; + if (base <= desc) + { + allocations += centre; + count -= centre; + } + else + { + count = centre; + } + } + + return allocations; +} + bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *base, size_t count) { @@ -2198,7 +2225,14 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a return false; } - allocation = &allocator->allocations[allocator->allocation_count++]; + if (allocator->allocation_count > 1) + allocation = vkd3d_gpu_descriptor_allocator_binary_search(allocator, base); + else + allocation = allocator->allocations; + allocation += allocator->allocation_count && base > allocation->base; + memmove(&allocation[1], allocation, (allocator->allocation_count++ - (allocation - allocator->allocations)) + * sizeof(*allocation)); + allocation->base = base; allocation->count = count; @@ -2225,8 +2259,8 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( if (allocator->allocations[i].base != base) continue; - if (i != --allocator->allocation_count) - allocator->allocations[i] = allocator->allocations[allocator->allocation_count]; + memmove(&allocator->allocations[i], &allocator->allocations[i + 1], + (--allocator->allocation_count - i) * sizeof(allocator->allocations[0])); found = true; break; @@ -2237,34 +2271,34 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( return found; } +static inline const struct vkd3d_gpu_descriptor_allocation *vkd3d_gpu_descriptor_allocator_allocation_from_descriptor( + const struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + const struct vkd3d_gpu_descriptor_allocation *allocation; + + allocation = vkd3d_gpu_descriptor_allocator_binary_search(allocator, desc); + return (desc >= allocation->base && desc - allocation->base < allocation->count) ? allocation : NULL; +} + /* Return the available size from the specified descriptor to the heap end. */ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) { - struct vkd3d_gpu_descriptor_allocation *allocation; - size_t remaining, offset, i; + const struct vkd3d_gpu_descriptor_allocation *allocation; + size_t remaining; int rc; + assert(allocator->allocation_count); + if ((rc = pthread_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; } - for (i = 0, remaining = 0; i < allocator->allocation_count; ++i) - { - allocation = &allocator->allocations[i]; - - if (desc < allocation->base) - continue; - - offset = desc - allocation->base; - if (offset >= allocation->count) - continue; - - remaining = allocation->count - offset; - break; - } + remaining = 0; + if ((allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc))) + remaining = allocation->count - (desc - allocation->base); pthread_mutex_unlock(&allocator->mutex);

1 0

Conor McCarthy : vkd3d: Do not flag a descriptor table as dirty if it is unchanged.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: c04b6b1765952d3158e8e9b89ddfc2c1fcef7733 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c04b6b1765952d3158e8e9b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 5 14:54:52 2022 +1000 vkd3d: Do not flag a descriptor table as dirty if it is unchanged. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b2565e1..3e252ae 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4185,6 +4185,9 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l assert(index < ARRAY_SIZE(bindings->descriptor_tables)); desc = d3d12_desc_from_gpu_handle(base_descriptor); + if (bindings->descriptor_tables[index] == desc) + return; + if (desc && !vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&list->device->gpu_descriptor_allocator, desc)) {

1 0

Conor McCarthy : vkd3d: Validate the base descriptor handle in d3d12_command_list_set_descriptor_table().
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 711378ea31dd624526466c0b534d00346d024557 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=711378ea31dd624526466c0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 5 14:54:51 2022 +1000 vkd3d: Validate the base descriptor handle in d3d12_command_list_set_descriptor_table(). The availability of allocation info makes it possible to check that the descriptor belongs to a heap of the correct type. This will be more important when Vulkan-backed descriptor heaps are added. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 15 ++++++++++++++- libs/vkd3d/device.c | 23 +++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9fbde80..b2565e1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4178,11 +4178,24 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; + struct d3d12_desc *desc; assert(root_signature_get_descriptor_table(root_signature, index)); assert(index < ARRAY_SIZE(bindings->descriptor_tables)); - bindings->descriptor_tables[index] = d3d12_desc_from_gpu_handle(base_descriptor); + desc = d3d12_desc_from_gpu_handle(base_descriptor); + + if (desc && !vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&list->device->gpu_descriptor_allocator, + desc)) + { + /* Failure to find a heap means the descriptor handle is from + * the wrong heap type or not a handle at all. */ + ERR("Invalid heap for base descriptor %"PRIx64".\n", base_descriptor.ptr); + /* TODO: Mark list as invalid? */ + return; + } + + bindings->descriptor_tables[index] = desc; bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index; bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7d0922e..4a9a0c7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2305,6 +2305,29 @@ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( return remaining; } +struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descriptor( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + const struct vkd3d_gpu_descriptor_allocation *allocation; + int rc; + + if (!allocator->allocation_count) + return NULL; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return NULL; + } + + allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc); + + pthread_mutex_unlock(&allocator->mutex); + + return allocation ? CONTAINING_RECORD(allocation->base, struct d3d12_descriptor_heap, descriptors) + : NULL; +} + static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allocator *allocator) { int rc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1bccb35..454b066 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -260,6 +260,8 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a const struct d3d12_desc *base, size_t count); bool vkd3d_gpu_descriptor_allocator_unregister_range( struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *base); +struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descriptor( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc); struct vkd3d_render_pass_key {

1 0

Giovanni Mascellani : vkd3d-compiler: Properly forward argument validation failures.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 9375950450966d7f097f14c8ba9480d2d7e2fa3a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9375950450966d7f097f14c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 7 11:50:55 2022 +0100 vkd3d-compiler: Properly forward argument validation failures. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8ea3c13..c974c9a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -686,13 +686,13 @@ int main(int argc, char **argv) fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", get_target_type_info(options.target_type)->name, get_source_type_info(options.source_type)->name); - return 0; + return 1; } if (!options.preprocess_only && options.source_type == VKD3D_SHADER_SOURCE_HLSL && !options.profile) { fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); - return 0; + return 1; } if (!options.filename && get_source_type_info(options.source_type)->is_binary && isatty(fileno(input)))

1 0

Conor McCarthy : vkd3d-shader/spirv: Support UAV counter descriptor arrays.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: vkd3d Branch: master Commit: 758b984c41fd34b79a2883349b282a85564a7d97 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=758b984c41fd34b79a28833… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 4 13:32:17 2022 +1000 vkd3d-shader/spirv: Support UAV counter descriptor arrays. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 +-- libs/vkd3d-shader/spirv.c | 90 +++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=758b984c41fd34b79a2…

1 0

Keno Fischer : winemac: Unconditionally link to QuartzCore.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: wine Branch: master Commit: 1f17015cea89cef3083ade0497e5eae5efdcb570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f17015cea89cef3083ade04… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Thu Jan 6 14:26:20 2022 +0000 winemac: Unconditionally link to QuartzCore. This fixes non-Metal builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52216 Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5c3536900d1..c9d4d0c04f6 100755 --- a/configure +++ b/configure @@ -10322,7 +10322,7 @@ fi fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - METAL_LIBS="-framework Metal -framework QuartzCore" + METAL_LIBS="-framework Metal" fi diff --git a/configure.ac b/configure.ac index ddd45b8c241..b42cb8a5346 100644 --- a/configure.ac +++ b/configure.ac @@ -757,7 +757,7 @@ case $host_os in fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") + AC_SUBST(METAL_LIBS,"-framework Metal") fi dnl Check for MTLDevice registryID property diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6329e8e76c8..fc3dddbdae7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 shell32 imm32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 10524e4b3a2..7708157a992 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -25,8 +25,8 @@ #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H #import <Metal/Metal.h> -#import <QuartzCore/QuartzCore.h> #endif +#import <QuartzCore/QuartzCore.h> #import "cocoa_window.h"

1 0

Zhiyi Zhang : user32/tests: Test selecting DDBs of different depth into display compatible DCs.
by Alexandre Julliard Jan. 7, 2022

Jan. 7, 2022

Module: wine Branch: master Commit: bd0603b19d99e0a74517a97d9165ec4e1d06aca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0603b19d99e0a74517a97d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 29 15:32:42 2021 +0800 user32/tests: Test selecting DDBs of different depth into display compatible DCs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 110 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..e745fb9c7b3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2180,13 +2180,17 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { + static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + HBITMAP hbitmap, old_hbitmap; + INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; - INT count, old_count; DISPLAY_DEVICEA dd; + HDC hdc, mem_dc; + DIBSECTION dib; + BITMAP bitmap; BOOL ret; LONG res; - HDC hdc; /* Test DCs covering the entire virtual screen */ hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -2199,6 +2203,51 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); + /* Test that CreateCompatibleBitmap() for display DCs creates DDBs */ + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + ok(!!hbitmap, "CreateCompatibleBitmap failed, error %d.\n", GetLastError()); + count = GetObjectW(hbitmap, sizeof(dib), &dib); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm.dmPelsWidth, dm.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + if (bpps[i] != 1 && bpps[i] != 32) + ok(!old_hbitmap, "Selecting bitmap succeeded.\n"); + else + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test selecting a DDB of the same color depth into a display compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm.dmBitsPerPel, bpp); + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, bitmap.bmBitsPixel); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); @@ -2226,7 +2275,7 @@ static void test_display_dc(void) dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2239,6 +2288,59 @@ static void test_display_dc(void) { check_display_dc(hdc, &dm2, FALSE); + /* Test selecting a compatible bitmap of a different color depth previously created for + * a display DC into a new compatible DC */ + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + + /* Note that hbitmap is of a different color depth and it can be successfully selected + * into the new compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + old_hbitmap = SelectObject(mem_dc, hbitmap); + todo_wine + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different color depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm2.dmPelsWidth, dm2.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + /* On Win7 dual-QXL test bot and XP, only 1-bit DDBs and DDBs with the same color + * depth can be selected to the compatible DC. On newer versions of Windows, only + * 1-bit and 32-bit DDBs can be selected into the compatible DC even if + * GetDeviceCaps(BITSPIXEL) reports a different color depth, for example, 16-bit. + * It's most likely due to the fact that lower color depth are emulated on newer + * versions of Windows as the real color depth is still 32-bit */ + if (bpps[i] != 1 && bpps[i] != 32) + todo_wine_if(bpps[i] == dm2.dmBitsPerPel) + ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Selecting bitmap succeeded.\n"); + else + todo_wine_if(bpps[i] == 32) + ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + hbitmap = NULL; + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } @@ -2248,6 +2350,8 @@ static void test_display_dc(void) win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); } + if (hbitmap) + DeleteObject(hbitmap); DeleteDC(hdc); /* Test DCs covering a specific monitor */

1 0