December 2021 - Wine-commits

Ziqing Hui : user32/tests: Test creating shared icon by CreateIconFromResourceEx().
by Alexandre Julliard 08 Dec '21

08 Dec '21

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

Ziqing Hui : user32/tests: Test CreateIconFromResourceEx() with resource bits.
by Alexandre Julliard 08 Dec '21

08 Dec '21

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

Ziqing Hui : user32: Add an is_shared member to cursoricon_object.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 9e74b207cfd9d1d866bdfbd61a165456430b70db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e74b207cfd9d1d866bdfbd6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 7 18:06:45 2021 +0800 user32: Add an is_shared member to cursoricon_object. It makes sure that shared icon/cursor created by CreateIconFromResourceEx() won't be destroyed by Destroy{Icon,Cursor}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 +++++++++---- dlls/user32/tests/cursoricon.c | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ba5c5d8904c..f107255c8c0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -76,6 +76,7 @@ struct cursoricon_object HMODULE module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ HRSRC rsrc; /* resource for shared icons */ + BOOL is_shared; /* whether this object is shared */ BOOL is_icon; /* whether icon or cursor */ BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ @@ -1224,10 +1225,14 @@ done: } else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); - if (module && (cFlag & LR_SHARED)) + if (cFlag & LR_SHARED) { - info->rsrc = rsrc; - list_add_head( &icon_cache, &info->entry ); + info->is_shared = TRUE; + if (module) + { + info->rsrc = rsrc; + list_add_head( &icon_cache, &info->entry ); + } } release_user_handle_ptr( info ); } @@ -1871,7 +1876,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) if (obj) { - BOOL shared = (obj->rsrc != NULL); + BOOL shared = obj->is_shared; release_user_handle_ptr( obj ); ret = (NtUserGetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index fac330bd7e9..a4bdc4f13cf 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1709,7 +1709,6 @@ static void test_CreateIconFromResource(void) 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. */ @@ -1747,7 +1746,6 @@ static void test_CreateIconFromResource(void) 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. */

1 0

Zhiyi Zhang : comctl32/propsheet: Fix a typo in a comment.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: f68ac2e4c1360fe032776504d9be6c78a1c082f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68ac2e4c1360fe032776504… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 8 15:09:30 2021 +0800 comctl32/propsheet: Fix a typo in a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9309250f65a..82c0a3cc576 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1289,7 +1289,7 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is * visible on property sheet pages if system DPI is set to 192. However, the same bug also - * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + * exists on XP and explains why vista+ don't use gradient tab body background anymore */ hdc = (HDC)wp; GetViewportOrgEx(hdc, &org); SetBrushOrgEx(hdc, org.x, org.y, &old_org);

1 0

Alexandre Julliard : include: Document remaining fields in the SYSTEM_PROCESS_INFORMATION structure.
by Alexandre Julliard 08 Dec '21

08 Dec '21

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

Alexandre Julliard : wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation).
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 09f2896d95256f07f274769b1a297525b6587c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f2896d95256f07f274769b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:20:03 2021 +0100 wow64: Add mapping for NtQuerySystemInformation(SystemExtendedProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 12 +++++ dlls/wow64/system.c | 142 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f2896d95256f07f274…

1 0

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

08 Dec '21

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

Nikolay Sivov : dwrite: Switch to unixlib syscall interface.
by Alexandre Julliard 08 Dec '21

08 Dec '21

Module: wine Branch: master Commit: 275a2d71d69ca3accb83f274be90d3fe76b4ad52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=275a2d71d69ca3accb83f274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 14:10:42 2021 +0300 dwrite: Switch to unixlib syscall interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 23 +-- dlls/dwrite/font.c | 149 ++++++++++++------ dlls/dwrite/freetype.c | 362 ++++++++++++++++++++++--------------------- dlls/dwrite/main.c | 8 +- dlls/dwrite/unixlib.h | 113 ++++++++++++++ 6 files changed, 407 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=275a2d71d69ca3accb83…

1 0

Nikolay Sivov : dwrite: Implement Wow64 entry points for unixlib.
by Alexandre Julliard 08 Dec '21

08 Dec '21

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

Nikolay Sivov : dwrite/layout: Simplify run direction check condition.
by Alexandre Julliard 08 Dec '21

08 Dec '21

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