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

Alexandre Julliard : ntdll: Fix floating point exception codes in Wow64 mode.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 6da06c15417d7cf08b21d0e327471e7fd702c4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da06c15417d7cf08b21d0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:33:46 2021 +0200 ntdll: Fix floating point exception codes in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f541306d950..e6971b4629a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2694,7 +2694,10 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case FPE_FLTINV: default: - rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + if (FPU_sig(ucontext) && FPU_sig(ucontext)->StatusWord & 0x40) + rec.ExceptionCode = EXCEPTION_FLT_STACK_CHECK; + else + rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } @@ -2703,6 +2706,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; rec.ExceptionInformation[1] = FPU_sig(ucontext) ? FPU_sig(ucontext)->MxCsr : 0; + if (CS_sig(ucontext) != cs64_sel) rec.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; } setup_exception( sigcontext, &rec ); }

1 0

Alexandre Julliard : ntdll: Always send a Wow context to the server for Wow64 processes.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: ee99bd4bc1b7ef4c18d5254a76d72d3bd38f41e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee99bd4bc1b7ef4c18d5254a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:34:49 2021 +0200 ntdll: Always send a Wow context to the server for Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index e47dfc645a2..e88a935ca31 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1025,6 +1025,9 @@ static void contexts_to_server( context_t server_contexts[2], CONTEXT *context ) context_to_server( &server_contexts[count++], native_machine, native_context, native_machine ); if (wow_context) context_to_server( &server_contexts[count++], main_image_info.Machine, wow_context, main_image_info.Machine ); + else if (native_machine != main_image_info.Machine) + context_to_server( &server_contexts[count++], main_image_info.Machine, + native_context, native_machine ); } else context_to_server( &server_contexts[count++], native_machine,

1 0

Alexandre Julliard : wow64: Add a thunk for the NtRaiseException syscall.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: e30b56b1a3af4fb001a7db4643bc358801856cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30b56b1a3af4fb001a7db46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 15:02:25 2021 +0200 wow64: Add a thunk for the NtRaiseException syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 191 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.c | 5 +- dlls/wow64/syscall.h | 1 + dlls/wow64/wow64_private.h | 1 + 4 files changed, 195 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e30b56b1a3af4fb001a7…

1 0

Alexandre Julliard : wow64: Forward 64-bit invalid handle exceptions to the 32-bit guest.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 23081203348ee9b93e6deb1bd986697807450219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23081203348ee9b93e6deb1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 15:07:06 2021 +0200 wow64: Forward 64-bit invalid handle exceptions to the 32-bit guest. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 21 +++++++++++++++++++++ dlls/wow64/syscall.c | 17 ++++++++++++++++- dlls/wow64/wow64.spec | 2 +- dlls/wow64/wow64_private.h | 5 +++-- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 5e0fedd136f..d66b973385b 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1251,3 +1251,24 @@ NTSTATUS WINAPI wow64_NtTerminateThread( UINT *args ) return NtTerminateThread( handle, exit_code ); } + + +/********************************************************************** + * Wow64PassExceptionToGuest (wow64.@) + */ +void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ) +{ + EXCEPTION_RECORD *rec = ptrs->ExceptionRecord; + EXCEPTION_RECORD32 rec32; + ULONG i; + + rec32.ExceptionCode = rec->ExceptionCode; + rec32.ExceptionFlags = rec->ExceptionFlags; + rec32.ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); + rec32.ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); + rec32.NumberParameters = rec->NumberParameters; + for (i = 0; i < rec->NumberParameters; i++) + rec32.ExceptionInformation[i] = rec->ExceptionInformation[i]; + + call_user_exception_dispatcher( &rec32, NULL, ptrs->ContextRecord ); +} diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 62399225042..91f2a029e4b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -519,6 +519,21 @@ static void free_temp_data(void) } +/********************************************************************** + * syscall_filter + */ +static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) +{ + switch (ptrs->ExceptionRecord->ExceptionCode) + { + case STATUS_INVALID_HANDLE: + Wow64PassExceptionToGuest( ptrs ); + break; + } + return EXCEPTION_EXECUTE_HANDLER; +} + + /********************************************************************** * Wow64SystemServiceEx (NTDLL.@) */ @@ -536,7 +551,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) syscall_thunk thunk = syscall_thunks[syscall_map[num]]; status = thunk( args ); } - __EXCEPT_ALL + __EXCEPT( syscall_filter ) { status = GetExceptionCode(); } diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 4ed20af0f29..69275b2580f 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -13,7 +13,7 @@ @ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete -@ stub Wow64PassExceptionToGuest +@ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stub Wow64PrepareForException @ stub Wow64RaiseException diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 3b44c513fa3..370ae76a0c4 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,8 +28,9 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY -void * WINAPI Wow64AllocateTemp( SIZE_T size ) DECLSPEC_HIDDEN; -void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; +void * WINAPI Wow64AllocateTemp( SIZE_T size ); +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ); +void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ); extern void init_file_redirects(void) DECLSPEC_HIDDEN; extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wow64: Fix function comments.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 4f4ddb57c2b964faf35b223217a22aecc313ff14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4ddb57c2b964faf35b2232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 17:34:36 2021 +0200 wow64: Fix function comments. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 91f2a029e4b..0df1dfc143b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -535,7 +535,7 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) /********************************************************************** - * Wow64SystemServiceEx (NTDLL.@) + * Wow64SystemServiceEx (wow64.@) */ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { @@ -562,7 +562,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) /********************************************************************** - * Wow64AllocateTemp + * Wow64AllocateTemp (wow64.@) * * FIXME: probably not 100% compatible. */ @@ -579,7 +579,7 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ) /********************************************************************** - * Wow64ApcRoutine (NTDLL.@) + * Wow64ApcRoutine (wow64.@) */ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) { @@ -652,7 +652,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON /********************************************************************** - * Wow64LdrpInitialize (NTDLL.@) + * Wow64LdrpInitialize (wow64.@) */ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) {

1 0

Gerald Pfeifer : nsiproxy: Include sys/types.h from udp.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 070185c3412d3e1802248e9aa1a600863a85ae7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=070185c3412d3e1802248e9a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 08:39:27 2021 +0200 nsiproxy: Include sys/types.h from udp.c. This addresses failures like In file included from dlls/nsiproxy.sys/udp.c:34: In file included from /usr/include/sys/socketvar.h:38: In file included from /usr/include/sys/selinfo.h:36: /usr/include/sys/event.h:77:2: error: unknown type name 'u_short' on non-Linux platforms. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index b6109ef9592..9f9966815c2 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -22,6 +22,10 @@ #include <stdarg.h> #include <stddef.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: c5d9f2f7c665700f183b81201151ab2096594841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d9f2f7c665700f183b8120… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 11:09:00 2021 +0200 nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS. We try to use libprocstat on non-Linux platforms and detect its presence in the configure phase. Make sure we actually link this library in that case by adding $(PROCSTAT_LIBS) to EXTRALIBS. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index cee4b72c33f..183a6374144 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,5 +1,6 @@ MODULE = nsiproxy.sys IMPORTS = ntoskrnl uuid +EXTRALIBS = $(PROCSTAT_LIBS) EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \

1 0

Jacek Caban : gdi32: Move ExtTextOutW wrappers to text.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: cd60db086a4c96df797fb81b7e5461f286b99531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd60db086a4c96df797fb81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:01 2021 +0200 gdi32: Move ExtTextOutW wrappers to text.c. 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/gdi32/font.c | 111 ---------------------------------------------- dlls/gdi32/text.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 111 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 359ebfbc0bd..6905d21751b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5748,66 +5748,6 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT return TRUE; } - -/*********************************************************************** - * ExtTextOutA (GDI32.@) - * - * See ExtTextOutW. - */ -BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, - const RECT *lprect, LPCSTR str, UINT count, const INT *lpDx ) -{ - INT wlen; - UINT codepage; - LPWSTR p; - BOOL ret; - LPINT lpDxW = NULL; - - if (count > INT_MAX) return FALSE; - - if (flags & ETO_GLYPH_INDEX) - return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); - - p = FONT_mbtowc(hdc, str, count, &wlen, &codepage); - - if (lpDx) { - unsigned int i = 0, j = 0; - - /* allocate enough for a ETO_PDY */ - lpDxW = HeapAlloc( GetProcessHeap(), 0, 2*wlen*sizeof(INT)); - while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) - { - if(flags & ETO_PDY) - { - lpDxW[j++] = lpDx[i * 2] + lpDx[(i + 1) * 2]; - lpDxW[j++] = lpDx[i * 2 + 1] + lpDx[(i + 1) * 2 + 1]; - } - else - lpDxW[j++] = lpDx[i] + lpDx[i + 1]; - i = i + 2; - } - else - { - if(flags & ETO_PDY) - { - lpDxW[j++] = lpDx[i * 2]; - lpDxW[j++] = lpDx[i * 2 + 1]; - } - else - lpDxW[j++] = lpDx[i]; - i = i + 1; - } - } - } - - ret = ExtTextOutW( hdc, x, y, flags, lprect, p, wlen, lpDxW ); - - HeapFree( GetProcessHeap(), 0, p ); - HeapFree( GetProcessHeap(), 0, lpDxW ); - return ret; -} - /*********************************************************************** * get_line_width * @@ -6213,57 +6153,6 @@ done: } -/*********************************************************************** - * TextOutA (GDI32.@) - */ -BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count ) -{ - return ExtTextOutA( hdc, x, y, 0, NULL, str, count, NULL ); -} - - -/*********************************************************************** - * TextOutW (GDI32.@) - */ -BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count) -{ - return ExtTextOutW( hdc, x, y, 0, NULL, str, count, NULL ); -} - - -/*********************************************************************** - * PolyTextOutA (GDI32.@) - * - * See PolyTextOutW. - */ -BOOL WINAPI PolyTextOutA( HDC hdc, const POLYTEXTA *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutA( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - - -/*********************************************************************** - * PolyTextOutW (GDI32.@) - * - * Draw several Strings - * - * RETURNS - * TRUE: Success. - * FALSE: Failure. - */ -BOOL WINAPI PolyTextOutW( HDC hdc, const POLYTEXTW *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutW( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - /*********************************************************************** * GetAspectRatioFilterEx (GDI32.@) */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 156cb3986aa..66a51e89817 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -669,6 +669,36 @@ cleanup: return ret; } +/*********************************************************************** + * text_mbtowc + * + * Returns a Unicode translation of str using the charset of the + * currently selected font in hdc. If count is -1 then str is assumed + * to be '\0' terminated, otherwise it contains the number of bytes to + * convert. If plenW is non-NULL, on return it will point to the + * number of WCHARs that have been written. If ret_cp is non-NULL, on + * return it will point to the codepage used in the conversion. The + * caller should free the returned string from the process heap + * itself. + */ +static WCHAR *text_mbtowc( HDC hdc, const char *str, INT count, INT *plenW, UINT *ret_cp ) +{ + UINT cp; + INT lenW; + LPWSTR strW; + + cp = GdiGetCodePage( hdc ); + + if (count == -1) count = strlen( str ); + lenW = MultiByteToWideChar( cp, 0, str, count, NULL, 0 ); + strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); + MultiByteToWideChar( cp, 0, str, count, strW, lenW ); + TRACE( "mapped %s -> %s\n", debugstr_an(str, count), debugstr_wn(strW, lenW) ); + if (plenW) *plenW = lenW; + if (ret_cp) *ret_cp = cp; + return strW; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ @@ -711,6 +741,104 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return ret; } +/*********************************************************************** + * ExtTextOutA (GDI32.@) + */ +BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, + const char *str, UINT count, const INT *dx ) +{ + INT wlen; + UINT codepage; + WCHAR *p; + BOOL ret; + INT *dxW = NULL; + + if (count > INT_MAX) return FALSE; + + if (flags & ETO_GLYPH_INDEX) + return ExtTextOutW( hdc, x, y, flags, rect, (const WCHAR *)str, count, dx ); + + p = text_mbtowc( hdc, str, count, &wlen, &codepage ); + + if (dx) + { + unsigned int i = 0, j = 0; + + /* allocate enough for a ETO_PDY */ + dxW = HeapAlloc( GetProcessHeap(), 0, 2 * wlen * sizeof(INT) ); + while (i < count) + { + if (IsDBCSLeadByteEx( codepage, str[i] )) + { + if (flags & ETO_PDY) + { + dxW[j++] = dx[i * 2] + dx[(i + 1) * 2]; + dxW[j++] = dx[i * 2 + 1] + dx[(i + 1) * 2 + 1]; + } + else + dxW[j++] = dx[i] + dx[i + 1]; + i = i + 2; + } + else + { + if (flags & ETO_PDY) + { + dxW[j++] = dx[i * 2]; + dxW[j++] = dx[i * 2 + 1]; + } + else + dxW[j++] = dx[i]; + i = i + 1; + } + } + } + + ret = ExtTextOutW( hdc, x, y, flags, rect, p, wlen, dxW ); + + HeapFree( GetProcessHeap(), 0, p ); + HeapFree( GetProcessHeap(), 0, dxW ); + return ret; +} + +/*********************************************************************** + * TextOutA (GDI32.@) + */ +BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, const char *str, INT count ) +{ + return ExtTextOutA( hdc, x, y, 0, NULL, str, count, NULL ); +} + +/*********************************************************************** + * TextOutW (GDI32.@) + */ +BOOL WINAPI TextOutW( HDC hdc, INT x, INT y, const WCHAR *str, INT count ) +{ + return ExtTextOutW( hdc, x, y, 0, NULL, str, count, NULL ); +} + + +/*********************************************************************** + * PolyTextOutA (GDI32.@) + */ +BOOL WINAPI PolyTextOutA( HDC hdc, const POLYTEXTA *pt, INT count ) +{ + for (; count>0; count--, pt++) + if (!ExtTextOutA( hdc, pt->x, pt->y, pt->uiFlags, &pt->rcl, pt->lpstr, pt->n, pt->pdx )) + return FALSE; + return TRUE; +} + +/*********************************************************************** + * PolyTextOutW (GDI32.@) + */ +BOOL WINAPI PolyTextOutW( HDC hdc, const POLYTEXTW *pt, INT count ) +{ + for (; count>0; count--, pt++) + if (!ExtTextOutW( hdc, pt->x, pt->y, pt->uiFlags, &pt->rcl, pt->lpstr, pt->n, pt->pdx )) + return FALSE; + return TRUE; +} + static int kern_pair( const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2 ) { int i;

1 0

Jacek Caban : gdi32: Move GetCharacterPlacementA to text.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: e27c61be21a5abca5520b3e539a1f9bf112c69be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27c61be21a5abca5520b3e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:13 2021 +0200 gdi32: Move GetCharacterPlacementA to text.c. 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/gdi32/font.c | 53 ----------------------------------------------------- dlls/gdi32/text.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6905d21751b..4d6f11d5080 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6937,59 +6937,6 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count, return ret; } -/************************************************************************* - * GetCharacterPlacementA [GDI32.@] - * - * See GetCharacterPlacementW. - * - * NOTES: - * the web browser control of ie4 calls this with dwFlags=0 - */ -DWORD WINAPI -GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, - INT nMaxExtent, GCP_RESULTSA *lpResults, - DWORD dwFlags) -{ - WCHAR *lpStringW; - INT uCountW; - GCP_RESULTSW resultsW; - DWORD ret; - UINT font_cp; - - TRACE("%s, %d, %d, 0x%08x\n", - debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); - - lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); - - if (!lpResults) - { - ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, NULL, dwFlags); - HeapFree(GetProcessHeap(), 0, lpStringW); - return ret; - } - - /* both structs are equal in size */ - memcpy(&resultsW, lpResults, sizeof(resultsW)); - - if(lpResults->lpOutString) - resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); - - ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); - - lpResults->nGlyphs = resultsW.nGlyphs; - lpResults->nMaxFit = resultsW.nMaxFit; - - if(lpResults->lpOutString) { - WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, - lpResults->lpOutString, uCount, NULL, NULL ); - } - - HeapFree(GetProcessHeap(), 0, lpStringW); - HeapFree(GetProcessHeap(), 0, resultsW.lpOutString); - - return ret; -} - /************************************************************************* * GetCharABCWidthsFloatA [GDI32.@] * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 66a51e89817..82bf709fe19 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1009,3 +1009,46 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m HeapFree( GetProcessHeap(), 0, kern ); return ret; } + +/************************************************************************* + * GetCharacterPlacementA (GDI32.@) + */ +DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT max_extent, + GCP_RESULTSA *result, DWORD flags ) +{ + GCP_RESULTSW resultsW; + WCHAR *strW; + INT countW; + DWORD ret; + UINT font_cp; + + TRACE( "%s, %d, %d, 0x%08x\n", debugstr_an(str, count), count, max_extent, flags ); + + strW = text_mbtowc( hdc, str, count, &countW, &font_cp ); + + if (!result) + { + ret = GetCharacterPlacementW( hdc, strW, countW, max_extent, NULL, flags ); + HeapFree( GetProcessHeap(), 0, strW ); + return ret; + } + + /* both structs are equal in size */ + memcpy( &resultsW, result, sizeof(resultsW) ); + + if (result->lpOutString) + resultsW.lpOutString = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * countW ); + + ret = GetCharacterPlacementW( hdc, strW, countW, max_extent, &resultsW, flags ); + + result->nGlyphs = resultsW.nGlyphs; + result->nMaxFit = resultsW.nMaxFit; + + if (result->lpOutString) + WideCharToMultiByte( font_cp, 0, resultsW.lpOutString, countW, + result->lpOutString, count, NULL, NULL ); + + HeapFree( GetProcessHeap(), 0, strW ); + HeapFree( GetProcessHeap(), 0, resultsW.lpOutString ); + return ret; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetTextFaceW for GetTextFace.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: ff36618c969d46e6203ce66d053224b11dc6ee4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff36618c969d46e6203ce66d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:32 2021 +0200 gdi32: Use NtGdiGetTextFaceW for GetTextFace. 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/gdi32/font.c | 33 ++------------------------------- dlls/gdi32/text.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 2 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4d6f11d5080..ba1da3b11a9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4743,38 +4743,9 @@ BOOL WINAPI NtGdiSetTextJustification( HDC hdc, INT extra, INT breaks ) /*********************************************************************** - * GetTextFaceA (GDI32.@) + * NtGdiGetTextFaceW (win32u.@) */ -INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) -{ - INT res = GetTextFaceW(hdc, 0, NULL); - LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); - GetTextFaceW( hdc, res, nameW ); - - if (name) - { - if (count) - { - res = WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, count, NULL, NULL); - if (res == 0) - res = count; - name[count-1] = 0; - /* GetTextFaceA does NOT include the nul byte in the return count. */ - res--; - } - else - res = 0; - } - else - res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL); - HeapFree( GetProcessHeap(), 0, nameW ); - return res; -} - -/*********************************************************************** - * GetTextFaceW (GDI32.@) - */ -INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name ) +INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name, BOOL alias_name ) { PHYSDEV dev; INT ret; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 82bf709fe19..d8cd4fb0dda 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1052,3 +1052,39 @@ DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT ma HeapFree( GetProcessHeap(), 0, resultsW.lpOutString ); return ret; } + +/*********************************************************************** + * GetTextFaceA (GDI32.@) + */ +INT WINAPI GetTextFaceA( HDC hdc, INT count, char *name ) +{ + INT res = GetTextFaceW( hdc, 0, NULL ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, res * sizeof(WCHAR) ); + + GetTextFaceW( hdc, res, nameW ); + if (name) + { + if (count) + { + res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, count, NULL, NULL ); + if (res == 0) res = count; + name[count - 1] = 0; + /* GetTextFaceA does NOT include the nul byte in the return count. */ + res--; + } + else + res = 0; + } + else + res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, nameW ); + return res; +} + +/*********************************************************************** + * GetTextFaceW (GDI32.@) + */ +INT WINAPI GetTextFaceW( HDC hdc, INT count, WCHAR *name ) +{ + return NtGdiGetTextFaceW( hdc, count, name, FALSE ); +} diff --git a/include/ntgdi.h b/include/ntgdi.h index cfcbce43fed..fd552cfa26d 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -238,7 +238,7 @@ DWORD WINAPI NtGdiGetRegionData( HRGN hrgn, DWORD count, RGNDATA *data ); INT WINAPI NtGdiGetRgnBox( HRGN hrgn, RECT *rect ); UINT WINAPI NtGdiGetSystemPaletteUse( HDC hdc ); UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags ); -INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name ); +INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name, BOOL alias_name ); BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ); BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ); BOOL WINAPI NtGdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert,

1 0