December 2021 - Wine-Commits

Alex Henrie : msvcp120/tests: Don't check for handle equality in _Thrd_current tests.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 7cb65f4487b1fa306b75d9638d40298b93a99b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb65f4487b1fa306b75d963… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 7 23:40:56 2021 -0700 msvcp120/tests: Don't check for handle equality in _Thrd_current tests. Fixes an intermittent testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 495ee9dd6fb..6bc636c4b1f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2093,8 +2093,9 @@ static void test_thrd(void) tb = p__Thrd_current(); ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); - /* these can be different if new threads are created at same time */ - ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + /* the handles can be different if new threads are created at same time */ + ok(ta.hnd != NULL, "handle a is NULL\n"); + ok(tb.hnd != NULL, "handle b is NULL\n"); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd);

1 0

Nikolay Sivov : dwrite/layout: Simplify run direction check condition.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 828e7173bcb46378108aefa03bfa494d557ef98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=828e7173bcb46378108aefa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:44 2021 +0300 dwrite/layout: Simplify run direction check condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b7ab855d1f1..51fa6cbfbe6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1594,10 +1594,9 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); memset(&run->bbox, 0, sizeof(run->bbox)); - /* Check if run direction matches paragraph direction, if it doesn't adjust by - run width */ - if (is_run_rtl(run) ^ is_rtl) - run->origin.x = is_rtl ? origin_x - run->width : origin_x + run->width; + /* Adjust by run width if direction differs. */ + if (is_run_rtl(run) != is_rtl) + run->origin.x = origin_x + (is_rtl ? -run->width : run->width); else run->origin.x = origin_x;

1 0

Nikolay Sivov : dwrite: Remove some unused fields.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 98d88f22e20dbd3a5ee804314868503a5c176ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d88f22e20dbd3a5ee80431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:46 2021 +0300 dwrite: Remove some unused fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 -- dlls/dwrite/font.c | 16 ---------------- dlls/dwrite/layout.c | 1 - 3 files changed, 19 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index dd346191662..024741388cf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -445,8 +445,6 @@ struct dwrite_glyphbitmap { DWORD simulations; float emsize; - BOOL nohint; - BOOL aliased; UINT16 glyph; INT pitch; RECT bbox; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ffe012d3029..5815c09e8ae 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5942,19 +5942,6 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) return refcount; } -static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) -{ - switch (mode) - { - case DWRITE_RENDERING_MODE1_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - return TRUE; - default: - return FALSE; - } -} - static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -5971,7 +5958,6 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(analysis->run.fontFace); glyph_bitmap.emsize = analysis->run.fontEmSize; - glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -6051,8 +6037,6 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = fontface->simulations; glyph_bitmap.emsize = analysis->run.fontEmSize; - glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); - glyph_bitmap.aliased = analysis->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; if (!(glyph_bitmap.buf = malloc(analysis->max_glyph_bitmap_size))) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 51fa6cbfbe6..2b5e8433d2d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3946,7 +3946,6 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run.fontFace); glyph_bitmap.emsize = glyph_run.fontEmSize; - glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL; bbox = &glyph_bitmap.bbox;

1 0

Nikolay Sivov : dwrite: Implement Wow64 entry points for unixlib.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: a005d43b986280f13fb0dcce05a8626cc982dce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a005d43b986280f13fb0dcce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:43 2021 +0300 dwrite: Implement Wow64 entry points for unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 02f496f181b..0caf2b03696 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -814,3 +814,231 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_glyph_bitmap, get_design_glyph_metrics, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_create_font_object(void *args) +{ + struct + { + PTR32 data; + UINT64 size; + ULONG index; + PTR32 object; + } const *params32 = args; + struct create_font_object_params params = + { + ULongToPtr(params32->data), + params32->size, + params32->index, + ULongToPtr(params32->object), + }; + + return create_font_object(&params); +} + +static NTSTATUS wow64_release_font_object(void *args) +{ + struct + { + UINT64 object; + } const *params32 = args; + struct release_font_object_params params = + { + params32->object + }; + + return release_font_object(&params); +} + +struct dwrite_outline32 +{ + struct + { + PTR32 values; + ULONG count; + ULONG size; + } tags; + + struct + { + PTR32 values; + ULONG count; + ULONG size; + } points; +}; + +static NTSTATUS wow64_get_glyph_outline(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + float emsize; + PTR32 outline; + } const *params32 = args; + struct dwrite_outline32 *outline32 = ULongToPtr(params32->outline); + struct dwrite_outline outline = + { + .tags.values = ULongToPtr(outline32->tags.values), + .tags.count = outline32->tags.count, + .tags.size = outline32->tags.size, + .points.values = ULongToPtr(outline32->points.values), + .points.count = outline32->points.count, + .points.size = outline32->points.size, + }; + + struct get_glyph_outline_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->emsize, + &outline, + }; + NTSTATUS status; + + status = get_glyph_outline(&params); + outline32->points.count = outline.points.count; + outline32->tags.count = outline.tags.count; + return status; +} + +static NTSTATUS wow64_get_glyph_count(void *args) +{ + struct + { + UINT64 object; + PTR32 count; + } const *params32 = args; + struct get_glyph_count_params params = + { + params32->object, + ULongToPtr(params32->count), + }; + + return get_glyph_count(&params); +} + +static NTSTATUS wow64_get_glyph_advance(void *args) +{ + struct + { + UINT64 object; + ULONG glyph; + ULONG mode; + float emsize; + PTR32 advance; + PTR32 has_contours; + } const *params32 = args; + struct get_glyph_advance_params params = + { + params32->object, + params32->glyph, + params32->mode, + params32->emsize, + ULongToPtr(params32->advance), + ULongToPtr(params32->has_contours), + }; + + return get_glyph_advance(&params); +} + +static NTSTATUS wow64_get_glyph_bbox(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + float emsize; + DWRITE_MATRIX m; + PTR32 bbox; + } const *params32 = args; + struct get_glyph_bbox_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->emsize, + params32->m, + ULongToPtr(params32->bbox), + }; + + return get_glyph_bbox(&params); +} + +static NTSTATUS wow64_get_glyph_bitmap(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + ULONG mode; + float emsize; + DWRITE_MATRIX m; + RECT bbox; + int pitch; + PTR32 bitmap; + PTR32 is_1bpp; + } const *params32 = args; + struct get_glyph_bitmap_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->mode, + params32->emsize, + params32->m, + params32->bbox, + params32->pitch, + ULongToPtr(params32->bitmap), + ULongToPtr(params32->is_1bpp), + }; + + return get_glyph_bitmap(&params); +} + +static NTSTATUS wow64_get_design_glyph_metrics(void *args) +{ + struct + { + UINT64 object; + ULONG simulations; + ULONG glyph; + ULONG upem; + ULONG ascent; + PTR32 metrics; + } const *params32 = args; + struct get_design_glyph_metrics_params params = + { + params32->object, + params32->simulations, + params32->glyph, + params32->upem, + params32->ascent, + ULongToPtr(params32->metrics), + }; + + return get_design_glyph_metrics(&params); +}; + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + wow64_create_font_object, + wow64_release_font_object, + wow64_get_glyph_outline, + wow64_get_glyph_count, + wow64_get_glyph_advance, + wow64_get_glyph_bbox, + wow64_get_glyph_bitmap, + wow64_get_design_glyph_metrics, +}; + +#endif /* _WIN64 */

1 0

Alexandre Julliard : ntdll: Don't restore the %fs register for exceptions happening inside system calls.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 0b3d65f82241aa246e0c8a49c1ec37199f539f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3d65f82241aa246e0c8a49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 15:02:42 2021 +0100 ntdll: Don't restore the %fs register for exceptions happening inside system calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..d32e38875a4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -355,7 +355,7 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } -static BOOL is_inside_syscall( ucontext_t *sigcontext ) +static BOOL is_inside_syscall( const ucontext_t *sigcontext ) { return ((char *)RSP_sig(sigcontext) >= (char *)ntdll_get_thread_data()->kernel_stack && (char *)RSP_sig(sigcontext) <= (char *)amd64_thread_data()->syscall_frame); @@ -1544,7 +1544,7 @@ static inline void init_handler( const ucontext_t *sigcontext ) static inline void leave_handler( const ucontext_t *sigcontext ) { #ifdef __linux__ - if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext ))) + if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext)) __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); #endif }

1 0

Alexandre Julliard : include: Document remaining fields in the SYSTEM_PROCESS_INFORMATION structure.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: cdafebed15118c4b761c13b89536b455e260db14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdafebed15118c4b761c13b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:19:48 2021 +0100 include: Document remaining fields in the SYSTEM_PROCESS_INFORMATION structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 9 ++++++--- dlls/wow64/struct32.h | 7 +++++-- include/winternl.h | 7 +++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c01ee092d4..b16fa4da22f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -454,7 +454,10 @@ static void test_query_process( BOOL extended ) typedef struct _SYSTEM_PROCESS_INFORMATION_PRIVATE { ULONG NextEntryOffset; DWORD dwThreadCount; - DWORD dwUnknown1[6]; + LARGE_INTEGER WorkingSetPrivateSize; + ULONG HardFaultCount; + ULONG NumberOfThreadsHighWatermark; + ULONGLONG CycleTime; FILETIME ftCreationTime; FILETIME ftUserTime; FILETIME ftKernelTime; @@ -463,8 +466,8 @@ static void test_query_process( BOOL extended ) HANDLE UniqueProcessId; HANDLE ParentProcessId; ULONG HandleCount; - DWORD dwUnknown3; - DWORD dwUnknown4; + ULONG SessionId; + ULONG_PTR UniqueProcessKey; VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index ace5929d64d..93739656050 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -619,7 +619,10 @@ typedef struct { ULONG NextEntryOffset; DWORD dwThreadCount; - DWORD dwUnknown1[6]; + LARGE_INTEGER WorkingSetPrivateSize; + ULONG HardFaultCount; + ULONG NumberOfThreadsHighWatermark; + ULONGLONG CycleTime; LARGE_INTEGER CreationTime; LARGE_INTEGER UserTime; LARGE_INTEGER KernelTime; @@ -629,7 +632,7 @@ typedef struct ULONG ParentProcessId; ULONG HandleCount; ULONG SessionId; - DWORD dwUnknown4; + ULONG UniqueProcessKey; VM_COUNTERS_EX32 vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION32 ti[1]; diff --git a/include/winternl.h b/include/winternl.h index 24609e136bf..f8cbcdcbf97 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2578,7 +2578,10 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ DWORD dwThreadCount; /* 04/04 */ - DWORD dwUnknown1[6]; /* 08/08 */ + LARGE_INTEGER WorkingSetPrivateSize; /* 08/08 */ + ULONG HardFaultCount; /* 10/10 */ + ULONG NumberOfThreadsHighWatermark;/* 14/14 */ + ULONGLONG CycleTime; /* 18/18 */ LARGE_INTEGER CreationTime; /* 20/20 */ LARGE_INTEGER UserTime; /* 28/28 */ LARGE_INTEGER KernelTime; /* 30/30 */ @@ -2588,7 +2591,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { HANDLE ParentProcessId; /* 48/58 */ ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ - DWORD dwUnknown4; /* 54/68 */ + ULONG_PTR UniqueProcessKey; /* 54/68 */ VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */

1 0

Ziqing Hui : user32/tests: Test CreateIconFromResourceEx() with resource bits.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 1746ed9c7d5c67c0f695bc78ccc2c01c11663a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1746ed9c7d5c67c0f695bc78… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:44 2021 +0800 user32/tests: Test CreateIconFromResourceEx() with resource bits. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index b1a8c48b35d..fac330bd7e9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1539,6 +1539,13 @@ static void test_LoadImage(void) test_LoadImage_working_directory(); } +static BOOL CALLBACK find_res_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +{ + char **res_name = (char **)param; + *res_name = name; + return FALSE; +} + static void test_CreateIconFromResource(void) { HANDLE handle, old_handle; @@ -1547,6 +1554,13 @@ static void test_CreateIconFromResource(void) BITMAPINFOHEADER *icon_header; INT16 *hotspot; ICONINFO icon_info; + HMODULE user32; + char *res_name; + HRSRC rsrc; + HGLOBAL res; + BYTE *bits; + UINT size; + #define ICON_RES_WIDTH 32 #define ICON_RES_HEIGHT 32 @@ -1706,6 +1720,41 @@ static void test_CreateIconFromResource(void) ok(handle != old_handle, "Expect a different handle.\n"); HeapFree(GetProcessHeap(), 0, hotspot); + + /* Get icon resource bits */ + user32 = GetModuleHandleA("user32.dll"); + EnumResourceNamesA(user32, (const char *)RT_GROUP_ICON, find_res_proc, (LONG_PTR)&res_name); + rsrc = FindResourceA(user32, res_name, (const char *)RT_GROUP_ICON); + ok(rsrc != NULL, "Find resource failed, error %u.\n", GetLastError()); + res = LoadResource(user32, rsrc); + ok(res != NULL, "Load resource failed, error %u.\n", GetLastError()); + bits = LockResource(res); + ok(bits != NULL, "Lock resource failed, error %u.\n", GetLastError()); + + res_name = MAKEINTRESOURCEA(LookupIconIdFromDirectory(bits, TRUE)); + rsrc = FindResourceA(user32, res_name, (const char *)RT_ICON); + ok(rsrc != NULL, "Find resource failed, error %u.\n", GetLastError()); + size = SizeofResource(user32, rsrc); + ok(size != 0, "Get resource size failed, error %u.\n", GetLastError()); + res = LoadResource(user32, rsrc); + ok(res != NULL, "Load resource failed, error %u.\n", GetLastError()); + bits = LockResource(res); + ok(bits != NULL, "Lock resource failed, error %u.\n", GetLastError()); + + /* Test creating and destroying a shared icon from resource bits. */ + handle = CreateIconFromResourceEx(bits, size, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + todo_wine + ok(ret, "Get info failed, error %u.\n", GetLastError()); + + /* Test creating a shared icon from resource bits that has been created before. */ + old_handle = handle; + handle = CreateIconFromResourceEx(bits, size, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ok(handle != old_handle, "Expect a different handle.\n"); } static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length)

1 0

Jacek Caban : win32u: Use user driver for wine_get_vulkan_driver.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 9596e7f2a4e972c35efdca38b01d068bfc055d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9596e7f2a4e972c35efdca38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:30:12 2021 +0100 win32u: Use user driver for wine_get_vulkan_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 6 +----- dlls/dxgi/swapchain.c | 6 +----- dlls/user32/driver.c | 2 ++ dlls/win32u/dibdrv/dc.c | 2 -- dlls/win32u/driver.c | 18 ++++++++++++------ dlls/win32u/emfdrv.c | 1 - dlls/win32u/font.c | 1 - dlls/win32u/path.c | 1 - dlls/win32u/vulkan.c | 15 +++------------ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 4 ++-- dlls/wined3d/adapter_vk.c | 5 +---- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/vulkan.c | 11 ++--------- dlls/wineps.drv/init.c | 1 - dlls/winevulkan/loader.c | 5 +---- dlls/winevulkan/make_vulkan | 2 +- dlls/winex11.drv/init.c | 13 +++---------- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 7 ++++--- include/wine/vulkan_driver.h | 2 +- 23 files changed, 38 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9596e7f2a4e972c35efd…

1 0

Ziqing Hui : user32/tests: Fix cursor state test failures for win10.
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: f1113270958d2ec39730aa7f5fa2c1cdb973f87c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1113270958d2ec39730aa7f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:42 2021 +0800 user32/tests: Fix cursor state test failures for win10. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..267aff70fb5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2505,7 +2505,7 @@ static void test_ShowCursor(void) memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } event_start = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2529,7 +2529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } parent_id = 0; @@ -2582,7 +2582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } count = ShowCursor( TRUE ); @@ -2594,7 +2594,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } }

1 0

Ziqing Hui : user32/tests: Test creating shared icon by CreateIconFromResourceEx().
by Alexandre Julliard Dec. 8, 2021

Dec. 8, 2021

Module: wine Branch: master Commit: 14c28747007d53135d5c47afbd8665d28e03fb31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14c28747007d53135d5c47af… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:43 2021 +0800 user32/tests: Test creating shared icon by CreateIconFromResourceEx(). The tests show that shared icon created by CreateIconFromResourceEx() won't be destroyed by DestroyIcon(). However, a second call to it for the same icon bits will return a different handle. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 267aff70fb5..b1a8c48b35d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1541,7 +1541,7 @@ static void test_LoadImage(void) static void test_CreateIconFromResource(void) { - HANDLE handle; + HANDLE handle, old_handle; BOOL ret; DWORD error; BITMAPINFOHEADER *icon_header; @@ -1646,7 +1646,6 @@ static void test_CreateIconFromResource(void) * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); */ - HeapFree(GetProcessHeap(), 0, hotspot); /* Test creating an animated cursor. */ empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ @@ -1678,6 +1677,35 @@ static void test_CreateIconFromResource(void) ok(ret, "DestroyCursor() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); + + /* Test creating and destroying a non-shared icon. */ + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + ok(!ret, "Get info succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_CURSOR_HANDLE, "Got unexpected error %u.\n", error); + + /* Test creating and destroying a shared icon from heap bits. */ + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); + ret = GetIconInfo(handle, &icon_info); + todo_wine + ok(ret, "Get info failed, error %u.\n", GetLastError()); + + /* Test creating a shared icon from heap bits that has been created before. */ + old_handle = handle; + handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, + 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(handle != NULL, "Create icon failed, error %u.\n", GetLastError()); + ok(handle != old_handle, "Expect a different handle.\n"); + + HeapFree(GetProcessHeap(), 0, hotspot); } static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length)

1 0