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

Alexandre Julliard : ntdll: Use the CPU area to get/set the Wow64 context on x86-64.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 11d6c52f32e4ac31414f1b8580606e61c738c452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d6c52f32e4ac31414f1b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 12:17:29 2021 +0200 ntdll: Use the CPU area to get/set the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 184 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f9e82d72190..56dc640e082 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1614,7 +1614,8 @@ void *get_native_context( CONTEXT *context ) */ void *get_wow_context( CONTEXT *context ) { - return NULL; + if (context->SegCs != cs64_sel) return NULL; + return get_cpu_area( IMAGE_FILE_MACHINE_I386 ); } @@ -1851,10 +1852,97 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) */ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { - BOOL self; + BOOL self = (handle == GetCurrentThread()); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame; + const I386_CONTEXT *context = ctx; + DWORD flags = context->ContextFlags & ~CONTEXT_i386; if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return set_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + /* debug registers require a server call */ + if (self && (flags & CONTEXT_I386_DEBUG_REGISTERS)) + self = (amd64_thread_data()->dr0 == context->Dr0 && + amd64_thread_data()->dr1 == context->Dr1 && + amd64_thread_data()->dr2 == context->Dr2 && + amd64_thread_data()->dr3 == context->Dr3 && + amd64_thread_data()->dr6 == context->Dr6 && + amd64_thread_data()->dr7 == context->Dr7); + + if (!self) + { + NTSTATUS ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (flags & CONTEXT_I386_INTEGER) + { + wow_frame->Eax = context->Eax; + wow_frame->Ebx = context->Ebx; + wow_frame->Ecx = context->Ecx; + wow_frame->Edx = context->Edx; + wow_frame->Esi = context->Esi; + wow_frame->Edi = context->Edi; + } + if (flags & CONTEXT_I386_CONTROL) + { + wow_frame->Esp = context->Esp; + wow_frame->Ebp = context->Ebp; + wow_frame->Eip = context->Eip; + wow_frame->EFlags = context->EFlags; + wow_frame->SegCs = cs32_sel; + wow_frame->SegSs = ds64_sel; + } + if (flags & CONTEXT_I386_SEGMENTS) + { + wow_frame->SegDs = ds64_sel; + wow_frame->SegEs = ds64_sel; + wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegGs = ds64_sel; + } + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + wow_frame->Dr0 = context->Dr0; + wow_frame->Dr1 = context->Dr1; + wow_frame->Dr2 = context->Dr2; + wow_frame->Dr3 = context->Dr3; + wow_frame->Dr6 = context->Dr6; + wow_frame->Dr7 = context->Dr7; + } + if (flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( &frame->xsave, context->ExtendedRegisters, sizeof(frame->xsave) ); + } + else if (flags & CONTEXT_I386_FLOATING_POINT) + { + fpu_to_fpux( &frame->xsave, &context->FloatSave ); + } + if (flags & CONTEXT_I386_XSTATE) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + + if (xs->Mask & XSTATE_MASK_GSSE) + { + frame->xstate.Mask |= XSTATE_MASK_GSSE; + memcpy( &frame->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); + } + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; + frame->restore_flags |= CONTEXT_I386_XSTATE; + } + return STATUS_SUCCESS; } @@ -1863,10 +1951,96 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) */ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) { - BOOL self; + DWORD needed_flags; + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame, *context = ctx; + BOOL self = (handle == GetCurrentThread()); if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return get_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + needed_flags = context->ContextFlags & ~CONTEXT_i386; + + /* debug registers require a server call */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) self = FALSE; + + if (!self) + { + NTSTATUS ret = get_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + /* update the cached version of the debug registers */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(needed_flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (needed_flags & CONTEXT_I386_INTEGER) + { + context->Eax = wow_frame->Eax; + context->Ebx = wow_frame->Ebx; + context->Ecx = wow_frame->Ecx; + context->Edx = wow_frame->Edx; + context->Esi = wow_frame->Esi; + context->Edi = wow_frame->Edi; + context->ContextFlags |= CONTEXT_I386_INTEGER; + } + if (needed_flags & CONTEXT_I386_CONTROL) + { + context->Esp = wow_frame->Esp; + context->Ebp = wow_frame->Ebp; + context->Eip = wow_frame->Eip; + context->EFlags = wow_frame->EFlags; + context->SegCs = wow_frame->SegCs; + context->SegSs = wow_frame->SegSs; + context->ContextFlags |= CONTEXT_I386_CONTROL; + } + if (needed_flags & CONTEXT_I386_SEGMENTS) + { + context->SegDs = wow_frame->SegDs; + context->SegEs = wow_frame->SegEs; + context->SegFs = wow_frame->SegFs; + context->SegGs = wow_frame->SegGs; + context->ContextFlags |= CONTEXT_I386_SEGMENTS; + } + if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( context->ExtendedRegisters, &frame->xsave, sizeof(context->ExtendedRegisters) ); + context->ContextFlags |= CONTEXT_I386_EXTENDED_REGISTERS; + } + if (needed_flags & CONTEXT_I386_FLOATING_POINT) + { + fpux_to_fpu( &context->FloatSave, &frame->xsave ); + context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; + } + if ((needed_flags & CONTEXT_I386_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) || + context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = frame->xstate.Mask & mask; + xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; + memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) ); + } + } + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : kernel32: Fix the DLL check in GetBinaryTypeW().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 02268cb290493c899b56996405ca7c65a8046e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02268cb290493c899b569964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 10:47:08 2021 +0200 kernel32: Fix the DLL check in GetBinaryTypeW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51375 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index adf6b3c9a60..415f7f65714 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -190,7 +190,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); CloseHandle( mapping ); if (status) return FALSE; - if (!(info.ImageCharacteristics & IMAGE_FILE_DLL)) return FALSE; + if (info.ImageCharacteristics & IMAGE_FILE_DLL) return FALSE; switch (info.Machine) { case IMAGE_FILE_MACHINE_I386:

1 0

Jacek Caban : gdi32: Introduce gdi_obj_header and use it to store gdi_obj_funcs.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: a96fcf21b083157d53c90add9a85db16d4028483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96fcf21b083157d53c90add… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:36:19 2021 +0200 gdi32: Introduce gdi_obj_header and use it to store gdi_obj_funcs. 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/bitmap.c | 2 +- dlls/gdi32/brush.c | 3 ++- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmetafile.c | 7 ++++--- dlls/gdi32/font.c | 5 +++-- dlls/gdi32/gdi_private.h | 17 +++++++++++++---- dlls/gdi32/gdiobj.c | 20 ++++++++++++-------- dlls/gdi32/metafile.c | 40 ++++++++++++++++++++++++++-------------- dlls/gdi32/palette.c | 11 ++++++----- dlls/gdi32/pen.c | 9 +++++---- dlls/gdi32/region.c | 8 ++++---- 12 files changed, 79 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a96fcf21b083157d53c9…

1 0

Jacek Caban : gdi32: Move more fields from gdi_handle_entry to gdi_obj_header.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: d02eb26413381dbde6d12db50a4cdf80a4fe8a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02eb26413381dbde6d12db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:36:30 2021 +0200 gdi32: Move more fields from gdi_handle_entry to gdi_obj_header. 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/gdi_private.h | 10 ++++++++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++--------------------------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9ad99db394b..8a753c0820f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,9 +57,19 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; +struct hdc_list +{ + HDC hdc; + struct hdc_list *next; +}; + struct gdi_obj_header { const struct gdi_obj_funcs *funcs; /* type-specific functions */ + struct hdc_list *hdcs; /* list of HDCs interested in this object */ + WORD selcount; /* number of times the object is selected in a DC */ + WORD system : 1; /* system object flag */ + WORD deleted : 1; /* whether DeleteObject has been called on this object */ }; typedef struct tagDC diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cfad39a6923..3e6b268ad72 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -39,21 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 -struct hdc_list -{ - HDC hdc; - struct hdc_list *next; -}; - struct gdi_handle_entry { void *obj; /* pointer to the object-specific data */ - struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD generation; /* generation count for reusing handle values */ WORD type; /* object type (one of the OBJ_* constants) */ - WORD selcount; /* number of times the object is selected in a DC */ - WORD system : 1; /* system object flag */ - WORD deleted : 1; /* whether DeleteObject has been called on this object */ }; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; @@ -436,7 +426,7 @@ void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) entry->system = !!set; + if ((entry = handle_entry( handle ))) entry_obj( entry )->system = !!set; LeaveCriticalSection( &gdi_section ); } @@ -492,7 +482,7 @@ UINT GDI_get_ref_count( HGDIOBJ handle ) UINT ret = 0; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) ret = entry->selcount; + if ((entry = handle_entry( handle ))) ret = entry_obj( entry )->selcount; LeaveCriticalSection( &gdi_section ); return ret; } @@ -508,7 +498,7 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) entry->selcount++; + if ((entry = handle_entry( handle ))) entry_obj( entry )->selcount++; else handle = 0; LeaveCriticalSection( &gdi_section ); return handle; @@ -527,11 +517,11 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) EnterCriticalSection( &gdi_section ); if ((entry = handle_entry( handle ))) { - assert( entry->selcount ); - if (!--entry->selcount && entry->deleted) + assert( entry_obj( entry )->selcount ); + if (!--entry_obj( entry )->selcount && entry_obj( entry )->deleted) { /* handle delayed DeleteObject*/ - entry->deleted = 0; + entry_obj( entry )->deleted = 0; LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); @@ -725,7 +715,7 @@ static void dump_gdi_objects( void ) else TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), - entry->selcount, entry->deleted ); + entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -757,12 +747,12 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gd return 0; } obj->funcs = funcs; + obj->hdcs = NULL; + obj->selcount = 0; + obj->system = 0; + obj->deleted = 0; entry->obj = obj; - entry->hdcs = NULL; entry->type = type; - entry->selcount = 0; - entry->system = 0; - entry->deleted = 0; if (++entry->generation == 0xffff) entry->generation = 1; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -900,6 +890,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; const struct gdi_obj_funcs *funcs = NULL; + struct gdi_obj_header *header; EnterCriticalSection( &gdi_section ); if (!(entry = handle_entry( obj ))) @@ -908,7 +899,8 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return FALSE; } - if (entry->system) + header = entry_obj( entry ); + if (header->system) { TRACE("Preserving system object %p\n", obj); LeaveCriticalSection( &gdi_section ); @@ -917,15 +909,15 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) obj = entry_to_handle( entry ); /* make it a full handle */ - hdcs_head = entry->hdcs; - entry->hdcs = NULL; + hdcs_head = header->hdcs; + header->hdcs = NULL; - if (entry->selcount) + if (header->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); - entry->deleted = 1; /* mark for delete */ + TRACE("delayed for %p because object in use, count %u\n", obj, header->selcount ); + header->deleted = 1; /* mark for delete */ } - else funcs = entry_obj( entry )->funcs; + else funcs = header->funcs; LeaveCriticalSection( &gdi_section ); @@ -964,17 +956,18 @@ void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->system) + if ((entry = handle_entry( obj )) && !entry_obj( entry )->system) { - for (phdc = entry->hdcs; phdc; phdc = phdc->next) + struct gdi_obj_header *header = entry_obj( entry ); + for (phdc = header->hdcs; phdc; phdc = phdc->next) if (phdc->hdc == hdc) break; if (!phdc) { phdc = HeapAlloc(GetProcessHeap(), 0, sizeof(*phdc)); phdc->hdc = hdc; - phdc->next = entry->hdcs; - entry->hdcs = phdc; + phdc->next = header->hdcs; + header->hdcs = phdc; } } LeaveCriticalSection( &gdi_section ); @@ -992,9 +985,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->system) + if ((entry = handle_entry( obj )) && !entry_obj( entry )->system) { - for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) + for (pphdc = &entry_obj( entry )->hdcs; *pphdc; pphdc = &(*pphdc)->next) if ((*pphdc)->hdc == hdc) { struct hdc_list *phdc = *pphdc;

1 0

Jacek Caban : include: Add ntgdi.h file.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 0cfbeb5520c9de0381b2f727120adcdb9b5f0d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cfbeb5520c9de0381b2f727… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:37:41 2021 +0200 include: Add ntgdi.h file. 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> --- include/Makefile.in | 1 + include/ntgdi.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0cfbeb5520c9de0381b2…

1 0

Jacek Caban : gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 7f819ea4e955848c8945c2d3ecaeeed54c611f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f819ea4e955848c8945c2d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:37:51 2021 +0200 gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles. 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/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 110 ++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f819ea4e955848c8945…

1 0

Jacek Caban : gdi32: Initialize GdiSharedHandleTable in PEB.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: e82332f2b24b16d4c320a8bd924ed90bab5ded3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82332f2b24b16d4c320a8bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:38:00 2021 +0200 gdi32: Initialize GdiSharedHandleTable in PEB. 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/gdiobj.c | 16 ++++++++++++ dlls/gdi32/tests/gdiobj.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index d0c1f0c8230..b0fad2660ee 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -598,6 +598,21 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) return CreateFontIndirectW( &lf ); } +static void set_gdi_shared(void) +{ +#ifndef _WIN64 + if (NtCurrentTeb()->GdiBatchCount) + { + TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; + PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; + peb64->GdiSharedHandleTable = (UINT_PTR)&gdi_shared; + return; + } +#endif + /* NOTE: Windows uses 32-bit for 32-bit kernel */ + NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; +} + /*********************************************************************** * DllMain * @@ -612,6 +627,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) gdi32_module = inst; DisableThreadLibraryCalls( inst ); + set_gdi_shared(); font_init(); /* create stock objects */ diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 8f3d01c27df..80c8b284c62 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -24,11 +24,14 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "winuser.h" +#include "winternl.h" #include "wine/test.h" +static BOOL is_wow64; + static void test_gdi_objects(void) { BYTE buff[256]; @@ -362,11 +365,68 @@ static void test_handles_on_win64(void) } } +static GDI_SHARED_MEMORY *get_gdi_shared(void) +{ +#ifndef _WIN64 + if (NtCurrentTeb()->GdiBatchCount) + { + TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; + PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; + return (GDI_SHARED_MEMORY *)(UINT_PTR)peb64->GdiSharedHandleTable; + } +#endif + return (GDI_SHARED_MEMORY *)NtCurrentTeb()->Peb->GdiSharedHandleTable; +} + +static void test_shared_handle_table(void) +{ + GDI_SHARED_MEMORY *gdi_shared; + GDI_HANDLE_ENTRY *entry; + unsigned int handle; + HRGN hrgn; + + if (sizeof(void *) == 4 && !is_wow64) + { + skip("Skipping shared memory tests on 32-bit Windows\n"); + return; + } + gdi_shared = get_gdi_shared(); + + hrgn = CreateRectRgn(10, 10, 20, 20); + ok(hrgn != 0, "CreateRectRgn failed\n"); + + handle = (UINT_PTR)hrgn; + entry = &gdi_shared->Handles[handle & 0xffff]; + ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", + entry->Unique, handle >> 16); + todo_wine + ok(entry->Type == 4, "Type = %x\n", entry->Type); + ok(entry->Object, "Object = NULL\n"); + todo_wine + ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", + entry->Owner.ProcessId, GetCurrentProcessId()); + ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + + DeleteObject(hrgn); + ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", + entry->Unique, handle >> 16); + todo_wine + ok(entry->Type == 4, "Type = %x\n", entry->Type); + ok(entry->Object, "Object = NULL\n"); + todo_wine + ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", + entry->Owner.ProcessId, GetCurrentProcessId()); + ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); +} + START_TEST(gdiobj) { + if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + test_gdi_objects(); test_thread_objects(); test_GetCurrentObject(); test_region(); test_handles_on_win64(); + test_shared_handle_table(); }

1 0

Zebediah Figura : server: Use a separate request to retrieve the object name.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: e759da260eb87f464b4964c6f4a00b16226e834f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e759da260eb87f464b4964c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:08 2021 -0500 server: Use a separate request to retrieve the object name. A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/handle.c | 11 ++++++++++- server/protocol.def | 7 +++++++ server/request.h | 7 ++++++- server/trace.c | 14 +++++++++++++- 6 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1a57a112a59..21bcb215385 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6772,7 +6772,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas /* not a file, treat as a generic object */ - SERVER_START_REQ( get_object_info ) + SERVER_START_REQ( get_object_name ) { req->handle = wine_server_obj_handle( handle ); if (len > sizeof(*p)) wine_server_set_reply( req, p + 1, len - sizeof(*p) ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1720eef506e..d73f493edd3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4687,8 +4687,22 @@ struct get_object_info_reply unsigned int access; unsigned int ref_count; unsigned int handle_count; + char __pad_20[4]; +}; + + + +struct get_object_name_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_object_name_reply +{ + struct reply_header __header; data_size_t total; /* VARARG(name,unicode_str); */ + char __pad_12[4]; }; @@ -5626,6 +5640,7 @@ enum request REQ_open_symlink, REQ_query_symlink, REQ_get_object_info, + REQ_get_object_name, REQ_get_object_type, REQ_get_object_types, REQ_allocate_locally_unique_id, @@ -5906,6 +5921,7 @@ union generic_request struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; + struct get_object_name_request get_object_name_request; struct get_object_type_request get_object_type_request; struct get_object_types_request get_object_types_request; struct allocate_locally_unique_id_request allocate_locally_unique_id_request; @@ -6184,6 +6200,7 @@ union generic_reply struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; + struct get_object_name_reply get_object_name_reply; struct get_object_type_reply get_object_type_reply; struct get_object_types_reply get_object_types_reply; struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; @@ -6234,7 +6251,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 719 +#define SERVER_PROTOCOL_VERSION 720 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..6efd82f2ff9 100644 --- a/server/handle.c +++ b/server/handle.c @@ -686,13 +686,22 @@ DECL_HANDLER(dup_handle) DECL_HANDLER(get_object_info) { struct object *obj; - WCHAR *name; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; + release_object( obj ); +} + +DECL_HANDLER(get_object_name) +{ + struct object *obj; + WCHAR *name; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + if ((name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); diff --git a/server/protocol.def b/server/protocol.def index 762be1fa7c0..59ed5632503 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3299,6 +3299,13 @@ struct handle_info unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ unsigned int handle_count; /* object handle count */ +(a)END + + +/* Query the full name of an object */ +(a)REQ(get_object_name) + obj_handle_t handle; /* handle to the object */ +(a)REPLY data_size_t total; /* total needed size for name */ VARARG(name,unicode_str); /* object name */ @END diff --git a/server/request.h b/server/request.h index 1c45ac34cc7..63b09358612 100644 --- a/server/request.h +++ b/server/request.h @@ -346,6 +346,7 @@ DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); +DECL_HANDLER(get_object_name); DECL_HANDLER(get_object_type); DECL_HANDLER(get_object_types); DECL_HANDLER(allocate_locally_unique_id); @@ -625,6 +626,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_symlink, (req_handler)req_query_symlink, (req_handler)req_get_object_info, + (req_handler)req_get_object_name, (req_handler)req_get_object_type, (req_handler)req_get_object_types, (req_handler)req_allocate_locally_unique_id, @@ -2018,8 +2020,11 @@ C_ASSERT( sizeof(struct get_object_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, access) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, ref_count) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, handle_count) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, total) == 20 ); C_ASSERT( sizeof(struct get_object_info_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_object_name_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_object_name_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_object_name_reply, total) == 8 ); +C_ASSERT( sizeof(struct get_object_name_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_type_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_type_request) == 16 ); C_ASSERT( sizeof(struct get_object_type_reply) == 8 ); diff --git a/server/trace.c b/server/trace.c index 55068d1179b..b3eea846453 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4103,7 +4103,16 @@ static void dump_get_object_info_reply( const struct get_object_info_reply *req fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", ref_count=%08x", req->ref_count ); fprintf( stderr, ", handle_count=%08x", req->handle_count ); - fprintf( stderr, ", total=%u", req->total ); +} + +static void dump_get_object_name_request( const struct get_object_name_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_object_name_reply( const struct get_object_name_reply *req ) +{ + fprintf( stderr, " total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); } @@ -4771,6 +4780,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, + (dump_func)dump_get_object_name_request, (dump_func)dump_get_object_type_request, (dump_func)dump_get_object_types_request, (dump_func)dump_allocate_locally_unique_id_request, @@ -5047,6 +5057,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, + (dump_func)dump_get_object_name_reply, (dump_func)dump_get_object_type_reply, (dump_func)dump_get_object_types_reply, (dump_func)dump_allocate_locally_unique_id_reply, @@ -5323,6 +5334,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_symlink", "query_symlink", "get_object_info", + "get_object_name", "get_object_type", "get_object_types", "allocate_locally_unique_id",

1 0

Zebediah Figura : server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 089b2528c2c933e3c9b45a5f559fa4b5f830872a URL: https://source.winehq.org/git/wine.git/?a=commit;h=089b2528c2c933e3c9b45a5f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:09 2021 -0500 server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key. This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index f36760e6cc1..b7971770728 100644 --- a/server/registry.c +++ b/server/registry.c @@ -413,6 +413,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL;

1 0

Zebediah Figura : ntdll/tests: Add more tests for deleted keys.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 151370c4789ae956ec62637340b640af596d0ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151370c4789ae956ec626373… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:10 2021 -0500 ntdll/tests: Add more tests for deleted keys. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 7463f98aa29..91b752ac069 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -125,6 +125,8 @@ static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtOpenKeyEx)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); +static NTSTATUS (WINAPI * pNtEnumerateKey)(HANDLE, ULONG, KEY_INFORMATION_CLASS, void *, DWORD, DWORD *); +static NTSTATUS (WINAPI * pNtEnumerateValueKey)(HANDLE, ULONG, KEY_VALUE_INFORMATION_CLASS, void *, DWORD, DWORD *); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, @@ -132,6 +134,7 @@ static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, con PULONG dispos ); static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,KEY_INFORMATION_CLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pNtQueryLicenseValue)(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); +static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); @@ -181,9 +184,12 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtClose) NTDLL_GET_PROC(NtDeleteValueKey) NTDLL_GET_PROC(NtCreateKey) + NTDLL_GET_PROC(NtEnumerateKey) + NTDLL_GET_PROC(NtEnumerateValueKey) NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) NTDLL_GET_PROC(NtQueryKey) + NTDLL_GET_PROC(NtQueryObject) NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) @@ -844,20 +850,61 @@ static void test_NtQueryValueKey(void) static void test_NtDeleteKey(void) { + UNICODE_STRING string; + char buffer[200]; NTSTATUS status; - HANDLE hkey; + HANDLE hkey, hkey2; OBJECT_ATTRIBUTES attr; - ACCESS_MASK am = KEY_ALL_ACCESS; + DWORD size; status = pNtDeleteKey(NULL); ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status); InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); - status = pNtOpenKey(&hkey, am, &attr); + status = pNtOpenKey(&hkey, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); status = pNtDeleteKey(hkey); ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status); + + status = pNtQueryKey(hkey, KeyNameInformation, buffer, sizeof(buffer), &size); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtEnumerateKey(hkey, 0, KeyFullInformation, buffer, sizeof(buffer), &size); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + pRtlInitUnicodeString(&string, L"value"); + status = pNtQueryValueKey(hkey, &string, KeyValueBasicInformation, buffer, sizeof(buffer), &size); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtEnumerateValueKey(hkey, 0, KeyValuePartialInformation, buffer, sizeof(buffer), &size); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtSetValueKey(hkey, &string, 0, REG_SZ, "test", 5); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtDeleteValueKey(hkey, &string); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtDeleteKey(hkey); + todo_wine ok(!status, "got %#x\n", status); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, hkey, NULL); + status = pNtOpenKey(&hkey2, KEY_READ, &attr); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtCreateKey(&hkey2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtQueryObject(hkey, ObjectNameInformation, buffer, sizeof(buffer), &size); + ok(status == STATUS_KEY_DELETED, "got %#x\n", status); + + status = pNtQueryObject(hkey, ObjectBasicInformation, buffer, sizeof(OBJECT_BASIC_INFORMATION), &size); + ok(!status, "got %#x\n", status); + + status = pNtClose(hkey); + ok(status == STATUS_SUCCESS, "got %#x\n", status); } static void test_NtQueryLicenseKey(void)

1 0