wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : gdi32: Rename METAFILEDRV_PDEVICE to metadc.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 851060a3a0550b0cd3804132f7d09be774675162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=851060a3a0550b0cd3804132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:53 2021 +0200 gdi32: Rename METAFILEDRV_PDEVICE to metadc. 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/mfdrv/graphics.c | 10 +++++----- dlls/gdi32/mfdrv/init.c | 36 ++++++++++++++++++------------------ dlls/gdi32/mfdrv/metafiledrv.h | 6 +++--- dlls/gdi32/mfdrv/objects.c | 16 ++++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=851060a3a0550b0cd380…

1 0

Jacek Caban : gdi32: Use NtGdiRestoreDC for RestoreDC.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 561b25c4de1b721f18288133a89bf0318c7e61ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=561b25c4de1b721f18288133… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:39 2021 +0200 gdi32: Use NtGdiRestoreDC for RestoreDC. 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/dc.c | 200 ++++++++++++++++++----------------- dlls/gdi32/enhmfdrv/dc.c | 19 +--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 - dlls/gdi32/enhmfdrv/init.c | 3 +- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 13 +++ dlls/gdi32/mfdrv/dc.c | 4 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 125 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=561b25c4de1b721f1828…

1 0

Jacek Caban : gdi32: Store save level in DC_ATTR.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 8eab13f397db05cae95fc7a44e9183c37dd14ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eab13f397db05cae95fc7a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:21 2021 +0200 gdi32: Store save level in DC_ATTR. 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/dc.c | 12 ++++++------ dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5a62320ed79..c8e1e63e274 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -404,10 +404,10 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) /* find the state level to restore */ - if (abs(level) > dc->saveLevel || level == 0) return FALSE; - if (level < 0) level = dc->saveLevel + level + 1; + if (abs(level) > dc->attr->save_level || level == 0) return FALSE; + if (level < 0) level = dc->attr->save_level + level + 1; first_dcs = dc->saved_dc; - for (dcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + for (dcs = first_dcs, save_level = dc->attr->save_level; save_level > level; save_level--) dcs = dcs->saved_dc; /* restore the state */ @@ -478,7 +478,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->saved_dc = dcs->saved_dc; dcs->saved_dc = 0; - dc->saveLevel = save_level - 1; + dc->attr->save_level = save_level - 1; /* now destroy all the saved DCs */ @@ -524,7 +524,7 @@ static BOOL reset_dc_state( HDC hdc ) free_dc_state( dcs ); } dc->saved_dc = NULL; - dc->saveLevel = 0; + dc->attr->save_level = 0; release_dc_ptr( dc ); return TRUE; } @@ -587,7 +587,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->saved_dc = dc->saved_dc; dc->saved_dc = newdc; - ret = ++dc->saveLevel; + ret = ++dc->attr->save_level; release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index bc5c25145ef..867fb3e1380 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -44,7 +44,7 @@ BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) if (level < 0) emr.iRelative = level; else - emr.iRelative = level - dc->saveLevel - 1; + emr.iRelative = level - dc->attr->save_level - 1; physDev->restoring++; ret = next->funcs->pRestoreDC( next, level ); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 2623d9b4445..5db96df4f16 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -439,8 +439,8 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ } physDev = get_emf_physdev( find_dc_driver( dc, &emfdrv_driver )); - if(dc->saveLevel) - RestoreDC(hdc, 1); + if (dc->attr->save_level) + RestoreDC( hdc, 1 ); if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6b3efea3ddb..978a9a42cd3 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -72,7 +72,6 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ - INT saveLevel; DC_ATTR *attr; /* DC attributes accessible by client */ struct tagDC *saved_dc; DWORD_PTR dwHookData; diff --git a/include/ntgdi.h b/include/ntgdi.h index 16df2d39957..5fb3ac76c04 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -127,6 +127,7 @@ typedef struct DC_ATTR { HDC hdc; /* handle to self */ LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ + int save_level; COLORREF background_color; COLORREF brush_color; COLORREF pen_color;

1 0

Francois Gouget : d2d1/tests: Some languages need a longer buffer for property display names.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: a3efdeeb176fc3cd91b4e584b713ca0ea124d6a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3efdeeb176fc3cd91b4e584… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 09:20:20 2021 +0200 d2d1/tests: Some languages need a longer buffer for property display names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cd58d642ce1..3e2eda8a4a4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9690,7 +9690,7 @@ static void test_effect(BOOL d3d11) ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; - BYTE buffer[64]; + BYTE buffer[256]; BOOL cached; CLSID clsid; HRESULT hr;

1 0

Alexandre Julliard : server: Set YMM registers from the native context even in Wow64 mode.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 6c478c304c07cf54ef031a5809788b4afed2d4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c478c304c07cf54ef031a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 17:45:43 2021 +0200 server: Set YMM registers from the native context even in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/server/thread.c b/server/thread.c index e23412c6033..c1fa80f1ad8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -126,6 +126,11 @@ struct context #define CTX_WOW 1 /* context if thread is inside WoW */ #define CTX_PENDING 2 /* pending native context when we don't know whether thread is inside WoW */ +/* flags for registers that always need to be set from the server side */ +static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; +/* flags for registers that are set from the native context even in WoW mode */ +static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_YMM_REGISTERS; + static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry ); @@ -1304,20 +1309,6 @@ static void copy_context( context_t *to, const context_t *from, unsigned int fla if (flags & SERVER_CTX_YMM_REGISTERS) to->ymm = from->ymm; } -/* return the context flags that correspond to system regs */ -/* (system regs are the ones we can't access on the client side) */ -static unsigned int get_context_system_regs( unsigned short machine ) -{ - switch (machine) - { - case IMAGE_FILE_MACHINE_I386: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_AMD64: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_ARMNT: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_ARM64: return SERVER_CTX_DEBUG_REGISTERS; - } - return 0; -} - /* gets the current impersonation token */ struct token *thread_get_impersonation_token( struct thread *thread ) { @@ -1597,7 +1588,6 @@ DECL_HANDLER(select) { const context_t *native_context = (const context_t *)((const char *)(result + 1) + req->size); const context_t *wow_context = (ctx_count > 1) ? native_context + 1 : NULL; - unsigned int system_flags = get_context_system_regs( native_machine ); if (current->context && current->context->status != STATUS_PENDING) goto invalid_param; @@ -1691,8 +1681,8 @@ DECL_HANDLER(select) if (ctx->regs[CTX_NATIVE].flags || ctx->regs[CTX_WOW].flags) { data_size_t size = (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); - unsigned int system_flags = get_context_system_regs( native_machine ) & ctx->regs[CTX_NATIVE].flags; - if (system_flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], system_flags ); + unsigned int flags = system_flags & ctx->regs[CTX_NATIVE].flags; + if (flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], flags ); set_reply_data( ctx->regs, min( size, get_reply_max_size() )); } release_object( ctx ); @@ -1846,7 +1836,6 @@ DECL_HANDLER(get_thread_context) set_error( STATUS_UNSUCCESSFUL ); else { - unsigned int system_flags = get_context_system_regs( native_machine ); reply->self = (thread == current); if (thread != current) stop_thread( thread ); if (thread->context) @@ -1870,13 +1859,12 @@ DECL_HANDLER(get_thread_context) if (!thread_context->status) { - unsigned int system_flags = get_context_system_regs( native_machine ); unsigned int native_flags = req->flags, wow_flags = 0; if (req->machine == thread_context->regs[CTX_WOW].machine) { - native_flags = req->flags & system_flags; - wow_flags = req->flags & ~system_flags; + native_flags = req->flags & always_native_flags; + wow_flags = req->flags & ~always_native_flags; } if ((context = set_reply_data_size( (!!native_flags + !!wow_flags) * sizeof(context_t) ))) { @@ -1928,12 +1916,13 @@ DECL_HANDLER(set_thread_context) set_error( STATUS_INVALID_PARAMETER ); else if (thread->state != TERMINATED) { - unsigned int flags, ctx = CTX_NATIVE; + unsigned int ctx = CTX_NATIVE; const context_t *context = &contexts[CTX_NATIVE]; - unsigned int system_flags = get_context_system_regs( native_machine ) & context->flags; + unsigned int flags = system_flags & context->flags; + unsigned int native_flags = always_native_flags & context->flags; if (thread != current) stop_thread( thread ); - else if (system_flags) set_thread_context( thread, context, system_flags ); + else if (flags) set_thread_context( thread, context, flags ); if (thread->context && !get_error()) { if (ctx_count == 2) @@ -1949,11 +1938,11 @@ DECL_HANDLER(set_thread_context) else ctx = CTX_PENDING; } flags = context->flags; - if (system_flags && ctx != CTX_NATIVE) /* system regs are always set from the native context */ + if (native_flags && ctx != CTX_NATIVE) /* some regs are always set from the native context */ { - copy_context( &thread->context->regs[CTX_NATIVE], &contexts[CTX_NATIVE], system_flags ); - thread->context->regs[CTX_NATIVE].flags |= system_flags; - flags &= ~system_flags; + copy_context( &thread->context->regs[CTX_NATIVE], &contexts[CTX_NATIVE], native_flags ); + thread->context->regs[CTX_NATIVE].flags |= native_flags; + flags &= ~native_flags; } copy_context( &thread->context->regs[ctx], context, flags ); thread->context->regs[ctx].flags |= flags;

1 0

Alexandre Julliard : ntdll: Add support for user callbacks.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 94f63ea23f2610343480d74f10ad9518d4365e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f63ea23f2610343480d74f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 12:16:56 2021 +0200 ntdll: Add support for user callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 94 +++++++++++++++++++++++++++++++---------- dlls/ntdll/unix/signal_arm64.c | 74 +++++++++++++++++++++++++++----- dlls/ntdll/unix/signal_i386.c | 60 ++++++++++++++++++++++++-- dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 3 +- 6 files changed, 253 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94f63ea23f2610343480…

1 0

Alexandre Julliard : ntdll: Implement KiUserCallbackDispatcher().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: b56a4b3efc39ab3c8e6dfced188b5bcc9eb7c2fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56a4b3efc39ab3c8e6dfced… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 11:55:39 2021 +0200 ntdll: Implement KiUserCallbackDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 11 +++++++++++ dlls/ntdll/signal_arm64.c | 11 +++++++++++ dlls/ntdll/signal_i386.c | 11 +++++++++++ dlls/ntdll/signal_x86_64.c | 13 +++++++++++++ dlls/ntdll/tests/wow64.c | 2 +- dlls/ntdll/unix/loader.c | 4 +++- dlls/ntdll/unix/unix_private.h | 3 ++- 10 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f126249c01..48e826fe888 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3767,7 +3767,7 @@ static void init_wow64( CONTEXT *context ) SET_INIT_BLOCK( LdrInitializeThunk ); SET_INIT_BLOCK( LdrSystemDllInitBlock ); SET_INIT_BLOCK( RtlUserThreadStart ); - /* SET_INIT_BLOCK( KiUserCallbackDispatcher ); */ + SET_INIT_BLOCK( KiUserCallbackDispatcher ); /* SET_INIT_BLOCK( RtlpQueryProcessDebugInformationRemote ); */ /* SET_INIT_BLOCK( RtlpFreezeTimeBias ); */ /* LdrSystemDllInitBlock.ntdll_handle */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 46403b3f4a1..1bff52a299d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -68,7 +68,7 @@ # @ stub KiIntSystemCall @ stdcall -norelay KiRaiseUserExceptionDispatcher() @ stdcall -norelay KiUserApcDispatcher(ptr long long long ptr) -@ stub KiUserCallbackDispatcher +@ stdcall -norelay KiUserCallbackDispatcher(long ptr long) @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) # @ stub LdrAccessOutOfProcessResource @ stdcall LdrAccessResource(long ptr ptr ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e93692fe12..ab6fa5bc0ae 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -51,6 +51,7 @@ extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) D extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; +extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG) DECLSPEC_HIDDEN; #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LDR_DATA_TABLE_ENTRY **module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 64870674d1f..0ef210a0331 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -206,6 +206,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index dc18599e4f6..290639b676b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -565,6 +565,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 59d9e1d0df9..479accaf63c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -247,6 +247,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * save_fpu * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index de0eca6c11c..ef32eba68b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -625,6 +625,19 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, "int3") +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + * + * FIXME: not binary compatible + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + static ULONG64 get_int_reg( CONTEXT *context, int reg ) { return *(&context->Rax + reg); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 90692e66c25..be2f2138933 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1043,7 +1043,7 @@ static void test_init_block(void) CHECK_FUNC( block64[3], "LdrInitializeThunk" ); CHECK_FUNC( block64[4], "KiUserExceptionDispatcher" ); CHECK_FUNC( block64[5], "KiUserApcDispatcher" ); - todo_wine CHECK_FUNC( block64[6], "KiUserCallbackDispatcher" ); + CHECK_FUNC( block64[6], "KiUserCallbackDispatcher" ); CHECK_FUNC( block64[7], "RtlUserThreadStart" ); CHECK_FUNC( block64[8], "RtlpQueryProcessDebugInformationRemote" ); todo_wine ok( block64[9] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5edc845009f..a8e145de16e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -105,8 +105,9 @@ static const char so_dir[] = ""; void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; -void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; +void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; +void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; void (WINAPI *p__wine_ctrl_routine)(void*); @@ -832,6 +833,7 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); + GET_FUNC( KiUserCallbackDispatcher ); GET_FUNC( LdrInitializeThunk ); GET_FUNC( LdrSystemDllInitBlock ); GET_FUNC( RtlUserThreadStart ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 18c58a6431e..df5316d2917 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,8 +92,9 @@ static const LONG teb_offset = 0x2000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Add a stub for NtCallbackReturn().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: daa1886a2c676675d0ebf1038e8c9e74cc2d0bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa1886a2c676675d0ebf103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 11:52:35 2021 +0200 ntdll: Add a stub for NtCallbackReturn(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 9 +++++++++ dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 9 +++++++++ dlls/ntdll/unix/signal_i386.c | 9 +++++++++ dlls/ntdll/unix/signal_x86_64.c | 9 +++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 36d997d1762..46403b3f4a1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -145,7 +145,7 @@ @ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) -# @ stub NtCallbackReturn +@ stdcall -syscall NtCallbackReturn(ptr long long) # @ stub NtCancelDeviceWakeupRequest @ stdcall -syscall NtCancelIoFile(long ptr) @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8bede41ee49..f79a302d4aa 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -39,6 +39,7 @@ static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3); +static NTSTATUS (WINAPI *pNtCallbackReturn)( void *ret_ptr, ULONG ret_len, NTSTATUS status ); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); @@ -7252,6 +7253,12 @@ static void test_user_apc(void) ok(test_apc_called, "Test user APC was not called.\n"); } +static void test_user_callback(void) +{ + NTSTATUS status = pNtCallbackReturn( NULL, 0, STATUS_SUCCESS ); + ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %x\n", status ); +} + static DWORD WINAPI suspend_thread_test( void *arg ) { HANDLE event = arg; @@ -9135,6 +9142,7 @@ START_TEST(exception) X(NtGetContextThread); X(NtSetContextThread); X(NtQueueApcThread); + X(NtCallbackReturn); X(NtReadVirtualMemory); X(NtClose); X(RtlUnwind); @@ -9329,6 +9337,7 @@ START_TEST(exception) NtCurrentTeb()->Peb->BeingDebugged = 0; test_user_apc(); + test_user_callback(); test_vectored_continue_handler(); test_suspend_thread(); test_suspend_process(); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a86805b113c..1d9b02fe2a3 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -575,6 +575,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * handle_syscall_fault * diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0ce6206aa9d..4f3dce3d26b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -722,6 +722,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * handle_syscall_fault * diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 72aff4614ca..3f74761fc75 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1579,6 +1579,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /********************************************************************** * get_fpu_code * diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 390121726ad..c2e3c9e1753 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2275,6 +2275,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * is_privileged_instr *

1 0

Zhiyi Zhang : winemac.drv: Use length returned from sprintfW().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 4a6fb0307b31a8597aa7560586c42566587b1d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6fb0307b31a8597aa75605… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:41:47 2021 +0800 winemac.drv: Use length returned from sprintfW(). A minor optimization. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6706c88341c..5a87e2331be 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1630,6 +1630,7 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; WCHAR bufferW[MAX_PATH]; + DWORD length; HKEY hkey; RECT rect; BOOL ret = FALSE; @@ -1677,9 +1678,9 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m (const BYTE *)&rect, sizeof(rect), 0)) goto done; /* Adapter name */ - sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, - (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0)) goto done; ret = TRUE;

1 0

Zhiyi Zhang : winex11.drv: Use length returned from sprintfW().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 975194590a340b207ad64da8f18e46bda837ab0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=975194590a340b207ad64da8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:41:06 2021 +0800 winex11.drv: Use length returned from sprintfW(). A minor optimization. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b647455a01f..b3ff213ae89 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -586,6 +586,7 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR bufferW[MAX_PATH]; + DWORD length; HKEY hkey; BOOL ret = FALSE; @@ -629,9 +630,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) goto done; /* Adapter name */ - sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, - (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0)) goto done; ret = TRUE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021