March 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : wow64: Create the WOW64INFO structure.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 3e3af62be980ff2ed5d2bdce21f78feeedd973ed URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3af62be980ff2ed5d2bdce21f78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:25:07 2023 +0100 wow64: Create the WOW64INFO structure. --- dlls/wow64/syscall.c | 8 ++++++++ dlls/wow64cpu/cpu.c | 3 +++ include/winternl.h | 14 ++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index d2bb054b6d0..17cfe337532 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -97,6 +97,7 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ static const SYSTEM_SERVICE_TABLE *psdwhwin32; static HMODULE win32u_module; +static WOW64INFO *wow64info; /* cpu backend dll functions */ static void * (WINAPI *pBTCpuGetBopCode)(void); @@ -783,6 +784,7 @@ static const WCHAR *get_cpu_dll_name(void) */ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); HMODULE module; UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; @@ -793,6 +795,11 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); highest_user_address = (ULONG_PTR)info.HighestUserAddress; default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + wow64info = (WOW64INFO *)((PEB32 *)ULongToPtr( teb32->Peb ) + 1); + wow64info->NativeSystemPageSize = 0x1000; + wow64info->NativeMachineType = native_machine; + wow64info->EmulatedMachineType = current_machine; + NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO] = wow64info; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) @@ -836,6 +843,7 @@ static void thread_init(void) void *cpu_area_ctx; RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); + NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO] = wow64info; if (pBTCpuThreadInit) pBTCpuThreadInit(); /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 5bcaf9d1c45..7911f7e8b72 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -290,6 +290,7 @@ NTSTATUS WINAPI BTCpuProcessInit(void) HMODULE module; UNICODE_STRING str; void **p__wine_unix_call_dispatcher; + WOW64INFO *wow64info = NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO]; if ((ULONG_PTR)syscall_32to64 >> 32) { @@ -297,6 +298,8 @@ NTSTATUS WINAPI BTCpuProcessInit(void) return STATUS_INVALID_ADDRESS; } + wow64info->CpuFlags |= WOW64_CPUFLAGS_MSFT64; + RtlInitUnicodeString( &str, L"ntdll.dll" ); LdrGetDllHandle( NULL, 0, &str, &module ); p__wine_unix_call_dispatcher = RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ); diff --git a/include/winternl.h b/include/winternl.h index 5a21f167d61..6fd0694b4ce 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1085,6 +1085,7 @@ typedef struct _TEB64 #define WOW64_TLS_USERCALLBACKDATA 5 #define WOW64_TLS_APCLIST 7 #define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_WOW64INFO 10 #define WOW64_TLS_MAX_NUMBER 19 @@ -3855,6 +3856,19 @@ typedef struct _WOW64_CPU_AREA_INFO USHORT Machine; } WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; +typedef struct _WOW64INFO +{ + ULONG NativeSystemPageSize; + ULONG CpuFlags; + ULONG Wow64ExecuteFlags; + ULONG unknown[5]; + USHORT NativeMachineType; + USHORT EmulatedMachineType; +} WOW64INFO; + +#define WOW64_CPUFLAGS_MSFT64 0x01 +#define WOW64_CPUFLAGS_SOFTWARE 0x02 + /* wow64.dll functions */ void * WINAPI Wow64AllocateTemp(SIZE_T); void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*);

1 0

Alexandre Julliard : wow64: Fixup Eip for breakpoint exceptions.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: ce737601d54f42123c3cd56c2f923d7fe50756c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce737601d54f42123c3cd56c2f923d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:26:24 2023 +0100 wow64: Fixup Eip for breakpoint exceptions. Matching the 32-bit setup_raise_exception(). --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 17cfe337532..69f2f6c50a5 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -215,6 +215,9 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 context = RtlLocateLegacyContext( context_ex, NULL ); *context = ctx; context->ContextFlags = flags; + /* adjust Eip for breakpoints in software emulation (hardware exceptions already adjust Rip) */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE)) + context->Eip--; stack->context_ptr = PtrToUlong( context ); if (src_ex)

1 0

Alexandre Julliard : wow64: Don't update the exception address in raise_exception().
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: c7fcbea4571f98cdc851ed299bf0e3346a79b8b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7fcbea4571f98cdc851ed299bf0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:27:21 2023 +0100 wow64: Don't update the exception address in raise_exception(). --- dlls/wow64/syscall.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 69f2f6c50a5..b6b3c0c2830 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -325,7 +325,6 @@ __ASM_GLOBAL_FUNC( raise_exception, "movq (%rsp),%rcx\n\t" /* original first parameter */ "movq 0x28(%rsp),%rax\n\t" /* return address */ "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ - "movq %rax,0x10(%rcx)\n\t" /* rec->ExceptionAddress */ "call " __ASM_NAME("NtRaiseException") ) #elif defined(__aarch64__) __ASM_GLOBAL_FUNC( raise_exception, @@ -344,7 +343,6 @@ __ASM_GLOBAL_FUNC( raise_exception, "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "add x4, sp, #32\n\t" /* orig stack pointer */ "stp x4, x5, [x1, #0x100]\n\t" /* context->Sp, Pc */ - "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ "bl " __ASM_NAME("NtRaiseException") ) #endif

1 0

Alexandre Julliard : wow64: Implement Wow64RaiseException().
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 37628a77324f4393e92e8fbd007e5a2e132a9bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/37628a77324f4393e92e8fbd007e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:28:12 2023 +0100 wow64: Implement Wow64RaiseException(). --- dlls/wow64/syscall.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++---- dlls/wow64/wow64.spec | 2 +- include/winternl.h | 1 + 3 files changed, 117 insertions(+), 11 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index b6b3c0c2830..d1c7421fabd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -151,6 +151,20 @@ static EXCEPTION_RECORD *exception_record_32to64( const EXCEPTION_RECORD32 *rec3 } +static void exception_record_64to32( EXCEPTION_RECORD32 *rec32, const EXCEPTION_RECORD *rec ) +{ + unsigned int 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]; +} + + static NTSTATUS get_context_return_value( void *wow_context ) { switch (current_machine) @@ -1185,17 +1199,108 @@ void WINAPI Wow64PrepareForException( EXCEPTION_RECORD *rec, CONTEXT *context ) */ 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]; + exception_record_64to32( &rec32, ptrs->ExceptionRecord ); call_user_exception_dispatcher( &rec32, NULL, ptrs->ContextRecord ); } + + +/********************************************************************** + * Wow64RaiseException (wow64.@) + */ +NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) +{ + EXCEPTION_RECORD32 rec32; + CONTEXT context; + BOOL first_chance = TRUE; + union + { + I386_CONTEXT i386; + ARM_CONTEXT arm; + } ctx32 = { 0 }; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + EXCEPTION_RECORD int_rec = { 0 }; + + ctx32.i386.ContextFlags = CONTEXT_I386_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + if (code == -1) break; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + switch (code) + { + case 0x00: /* division by zero */ + int_rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + break; + case 0x01: /* single-step */ + int_rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + break; + case 0x03: /* breakpoint */ + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip + 1); + int_rec.NumberParameters = 1; + break; + case 0x04: /* overflow */ + int_rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + break; + case 0x05: /* array bounds */ + int_rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + break; + case 0x06: /* invalid opcode */ + int_rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + case 0x09: /* coprocessor segment overrun */ + int_rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + break; + case 0x0c: /* stack fault */ + int_rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; + break; + case 0x29: /* __fastfail */ + int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + int_rec.ExceptionFlags = EH_NONCONTINUABLE; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Ecx; + first_chance = FALSE; + break; + case 0x2d: /* debug service */ + ctx32.i386.Eip++; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Eax; + break; + default: + ctx32.i386.Eip -= 2; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 2; + int_rec.ExceptionInformation[1] = 0xffffffff; + break; + } + *rec = int_rec; + break; + } + + case IMAGE_FILE_MACHINE_ARMNT: + ctx32.arm.ContextFlags = CONTEXT_ARM_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.arm ); + break; + } + + exception_record_64to32( &rec32, rec ); + __TRY + { + raise_exception( rec, &context, first_chance ); + } + __EXCEPT_ALL + { + call_user_exception_dispatcher( &rec32, &ctx32, NULL ); + } + __ENDTRY + return STATUS_SUCCESS; +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index e05a608d319..1f09e1411bb 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -16,7 +16,7 @@ @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stdcall Wow64PrepareForException(ptr ptr) -@ stub Wow64RaiseException +@ stdcall Wow64RaiseException(long ptr) @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC @ stub Wow64ShallowThunkSIZE_T32TO64 diff --git a/include/winternl.h b/include/winternl.h index 6fd0694b4ce..f59fcec05dd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3875,6 +3875,7 @@ void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*); NTSTATUS WINAPI Wow64KiUserCallbackDispatcher(ULONG,void*,ULONG,void**,ULONG*); void WINAPI Wow64PassExceptionToGuest(EXCEPTION_POINTERS*); void WINAPI Wow64PrepareForException(EXCEPTION_RECORD*,CONTEXT*); +NTSTATUS WINAPI Wow64RaiseException(int,EXCEPTION_RECORD*); NTSTATUS WINAPI Wow64SystemServiceEx(UINT,UINT*); #ifdef __WINESRC__

1 0

Piotr Caban : gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 065fbd206df31a2fd975460d0da4923645c43049 URL: https://gitlab.winehq.org/wine/wine/-/commit/065fbd206df31a2fd975460d0da492… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 9 14:34:58 2023 +0100 gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback. It makes the lbHatch data available after PlayEnhMetaFileRecord returns. --- dlls/gdi32/enhmetafile.c | 20 +++----------------- dlls/gdi32/tests/metafile.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 336f2d389fd..178f7b0e132 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1825,7 +1825,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_CREATEDIBPATTERNBRUSHPT: { const EMRCREATEDIBPATTERNBRUSHPT *lpCreate = (const EMRCREATEDIBPATTERNBRUSHPT *)mr; - LPVOID lpPackedStruct; /* Check that offsets and data are contained within the record * (including checking for wrap-arounds). @@ -1839,28 +1838,15 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } - /* This is a BITMAPINFO struct followed directly by bitmap bits */ - lpPackedStruct = HeapAlloc( GetProcessHeap(), 0, - lpCreate->cbBmi + lpCreate->cbBits ); - if(!lpPackedStruct) + if (lpCreate->offBmi + lpCreate->cbBmi != lpCreate->offBits) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("Invalid data in EMR_CREATEDIBPATTERNBRUSHPT record\n"); break; } - /* Now pack this structure */ - memcpy( lpPackedStruct, - ((const BYTE *)lpCreate) + lpCreate->offBmi, - lpCreate->cbBmi ); - memcpy( ((BYTE*)lpPackedStruct) + lpCreate->cbBmi, - ((const BYTE *)lpCreate) + lpCreate->offBits, - lpCreate->cbBits ); - (handletable->objectHandle)[lpCreate->ihBrush] = - CreateDIBPatternBrushPt( lpPackedStruct, + CreateDIBPatternBrushPt( (const BYTE *)lpCreate + lpCreate->offBmi, (UINT)lpCreate->iUsage ); - - HeapFree(GetProcessHeap(), 0, lpPackedStruct); break; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 004ad98d949..2b7e53b2529 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4183,6 +4183,38 @@ static void test_mf_PatternBrush(void) HeapFree (GetProcessHeap(), 0, orig_lb); } +static int CALLBACK pattern_brush_emf_enum_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + LOGBRUSH brush; + BOOL ret; + + switch (rec->iType) + { + case EMR_HEADER: + case EMR_SELECTOBJECT: + case EMR_EOF: + case EMR_CREATEMONOBRUSH: + return 1; + case EMR_CREATEDIBPATTERNBRUSHPT: + ok(!htable->objectHandle[2], "objectHandle[2] already used\n"); + ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + ok(ret, "PlayEnhMetaFileRecord failed\n"); + ok(htable->objectHandle[2] != NULL, "objectHandle[2] not created\n"); + + ret = GetObjectW(htable->objectHandle[2], sizeof(brush), &brush); + ok(ret, "GetObjectW failed\n"); + ok(brush.lbStyle == BS_DIBPATTERN, "brush.lbStyle = %d\n", brush.lbStyle); + ok(brush.lbHatch > (ULONG_PTR)rec && brush.lbHatch < (ULONG_PTR)rec + rec->nSize, + "brush.lbHatch = %p, not in %p-%p range\n", + (void *)brush.lbHatch, rec, (const BYTE *)rec + rec->nSize); + return 1; + default: + ok(0, "unexpected record %lu\n", rec->iType); + return 0; + } +} + static void test_emf_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; @@ -4237,8 +4269,6 @@ static void test_emf_pattern_brush(void) dump_emf_records(emf, "emf_pattern_brush"); } - ret = DeleteEnhMetaFile(emf); - ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); ret = DeleteObject(bitmap_brush); ok(ret, "DeleteObject failed\n"); ret = DeleteObject(dib_brush); @@ -4246,6 +4276,11 @@ static void test_emf_pattern_brush(void) ret = DeleteObject((HBITMAP)orig_lb->lbHatch); ok(ret, "DeleteObject failed\n"); HeapFree(GetProcessHeap(), 0, orig_lb); + + ret = EnumEnhMetaFile(NULL, emf, pattern_brush_emf_enum_proc, NULL, NULL); + ok(ret, "EnumEnhMetaFile error %ld\n", GetLastError()); + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); } static void test_mf_palette_brush(void)

1 0

Gabriel Ivăncescu : mshtml: Hold ref to HTMLDocumentObj when calling external code.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: a62be201c87b02680d752753c2388d1d123711e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a62be201c87b02680d752753c2388d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Hold ref to HTMLDocumentObj when calling external code. It's possible for it (and the GeckoBrowser) to get detached and destroyed while processing an external callback notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 +++- dlls/mshtml/mutation.c | 10 +++++-- dlls/mshtml/navigate.c | 75 ++++++++++++++++++++++++++++++++++---------------- dlls/mshtml/nsevents.c | 15 ++++++---- dlls/mshtml/nsio.c | 11 ++++++-- dlls/mshtml/olecmd.c | 9 +++++- dlls/mshtml/persist.c | 18 ++++++++---- dlls/mshtml/view.c | 3 ++ 8 files changed, 105 insertions(+), 42 deletions(-)

1 0

Zebediah Figura : winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: f605add4fde2d94f029145573b72ee87fdc65bea URL: https://gitlab.winehq.org/wine/wine/-/commit/f605add4fde2d94f029145573b72ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 18:09:03 2023 -0600 winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/winemac.drv/opengl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 6f3c3b88155..55e5704724b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1525,7 +1525,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns * * Implementation of wglSetPixelFormat and wglSetPixelFormatWINE. */ -static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) +static BOOL set_pixel_format(HDC hdc, int fmt, BOOL internal) { struct macdrv_win_data *data; const pixel_format *pf; @@ -1540,16 +1540,19 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) return FALSE; } - if (!(data = get_win_data(hwnd))) + if (!internal) { - FIXME("DC for window %p of other process: not implemented\n", hwnd); - return FALSE; + /* cannot change it if already set */ + int prev = win32u_get_window_pixel_format( hwnd ); + + if (prev) + return prev == fmt; } - if (!allow_reset && data->pixel_format) /* cannot change it if already set */ + if (!(data = get_win_data(hwnd))) { - ret = (data->pixel_format == fmt); - goto done; + FIXME("DC for window %p of other process: not implemented\n", hwnd); + return FALSE; } /* Check if fmt is in our list of supported formats to see if it is supported. */ @@ -1588,7 +1591,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); if (ret && gl_surface_mode == GL_SURFACE_BEHIND) - win32u_set_window_pixel_format(hwnd, fmt, FALSE); + win32u_set_window_pixel_format(hwnd, fmt, internal); return ret; }

1 0

Zebediah Figura : wineandroid: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: ff64d67f765d819769fbd4c49a605a406a6e450a URL: https://gitlab.winehq.org/wine/wine/-/commit/ff64d67f765d819769fbd4c49a605a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 18:12:31 2023 -0600 wineandroid: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/wineandroid.drv/opengl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index c8b7bf85cfb..5146fdf4df9 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -208,11 +208,10 @@ void update_gl_drawable( HWND hwnd ) } } -static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) +static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) { struct gl_drawable *gl; HWND hwnd = NtUserWindowFromDC( hdc ); - int prev = 0; if (!hwnd || hwnd == NtUserGetDesktopWindow()) { @@ -226,10 +225,18 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) } TRACE( "%p/%p format %d\n", hdc, hwnd, format ); + if (!internal) + { + /* cannot change it if already set */ + int prev = win32u_get_window_pixel_format( hwnd ); + + if (prev) + return prev == format; + } + if ((gl = get_gl_drawable( hwnd, 0 ))) { - prev = gl->format; - if (allow_change) + if (internal) { EGLint pf; p_eglGetConfigAttrib( display, pixel_formats[format - 1].config, EGL_NATIVE_VISUAL_ID, &pf ); @@ -241,8 +248,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); - if (prev && prev != format && !allow_change) return FALSE; - if (win32u_set_window_pixel_format( hwnd, format, FALSE )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format, internal )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; }

1 0

Zebediah Figura : win32u: Make NtUserSetWindowPixelFormat() into a proper export.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: b545ca0f9b0cdc5f814d41d892bbc5f8e7dc4fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b545ca0f9b0cdc5f814d41d892bbc5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 20:10:29 2023 -0600 win32u: Make NtUserSetWindowPixelFormat() into a proper export. This is simpler in general, given that this function is no longer used from user-space. In this particular case, the secondary purpose is to allow easily adding arguments to the function. --- dlls/win32u/window.c | 5 +---- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/ntuser.h | 6 ------ include/wine/gdi_driver.h | 2 ++ 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3ff0647dcd..cd8b6583249 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -static BOOL set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) { WND *win = get_win_ptr( hwnd ); @@ -5555,9 +5555,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); - case NtUserCallHwndParam_SetWindowPixelFormat: - return set_window_pixel_format( hwnd, param ); - case NtUserCallHwndParam_ShowOwnedPopups: return show_owned_popups( hwnd, param ); diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index a930e249ba5..41df3d3c09c 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ff78b183360..7251745258a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1588,7 +1588,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c44e9579cb6..783ac5f3a9d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - NtUserSetWindowPixelFormat( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/ntuser.h b/include/ntuser.h index 3b821f0c9fe..35ead9750c6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1331,7 +1331,6 @@ enum NtUserCallHwndParam_SetDialogInfo, NtUserCallHwndParam_SetMDIClientInfo, NtUserCallHwndParam_SetWindowContextHelpId, - NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserSetWindowStyle, @@ -1498,11 +1497,6 @@ static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId ); } -static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) -{ - return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat ); -} - static inline BOOL NtUserShowOwnedPopups( HWND hwnd, BOOL show ) { return NtUserCallHwndParam( hwnd, show, NtUserCallHwndParam_ShowOwnedPopups ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index dca03934a44..5ecd54c70f3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,6 +339,8 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); + #endif /* WINE_UNIX_LIB */ #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Zebediah Figura : win32u: Introduce a win32u_get_window_pixel_format() helper.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 463a11379bc19beb566fd86ea1617b54a8f8381a URL: https://gitlab.winehq.org/wine/wine/-/commit/463a11379bc19beb566fd86ea1617b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:01:54 2023 -0600 win32u: Introduce a win32u_get_window_pixel_format() helper. --- dlls/win32u/window.c | 17 +++++++++++++++++ include/wine/gdi_driver.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index cd8b6583249..a3c46dfdf31 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1457,6 +1457,23 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) return TRUE; } +int win32u_get_window_pixel_format( HWND hwnd ) +{ + WND *win = get_win_ptr( hwnd ); + int ret; + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "getting format on win %p not supported\n", hwnd ); + return 0; + } + + ret = win->pixel_format; + release_win_ptr( win ); + + return ret; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ecd54c70f3..eefefce695b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0