July 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Validate vertex shader input signature register indices (AFL).
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: cc16e0d2de47bc6a34039f6cc8d261d94241edf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc16e0d2de47bc6a34039f6cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 25 14:26:00 2017 +0200 wined3d: Validate vertex shader input signature register indices (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9504ef..8ed2cb9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1684,14 +1684,22 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { for (i = 0; i < input_signature->element_count; ++i) { - reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx; - if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX) + { + if (input_signature->elements[i].register_idx >= ARRAY_SIZE(shader->u.vs.attributes)) + { + WARN("Invalid input signature register index %u.\n", input_signature->elements[i].register_idx); + return WINED3DERR_INVALIDCALL; + } + } + else if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { if (input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) reg_maps->vpos = 1; else if (input_signature->elements[i].sysval_semantic == WINED3D_SV_IS_FRONT_FACE) reg_maps->usesfacing = 1; } + reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx; } } else if (!input_signature->elements && reg_maps->input_registers)

1 0

Jacek Caban : wininet: Improved cookie debug traces.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: a24b8267d508d27243a31e582e764949c88ad9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b8267d508d27243a31e582… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 25 13:13:15 2017 +0200 wininet: Improved cookie debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5da9710..60b8335 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -560,18 +560,12 @@ static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t } for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { - TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); - LIST_FOR_EACH_ENTRY(container, &domain->path_list, cookie_container_t, entry) { struct list *cursor, *cursor2; - TRACE("path %s\n", debugstr_wn(container->path.str, container->path.len)); - if(!cookie_match_path(container, path)) continue; - TRACE("found domain %p\n", domain->domain); - LIST_FOR_EACH_SAFE(cursor, cursor2, &container->cookie_list) { cookie_t *cookie_iter = LIST_ENTRY(cursor, cookie_t, entry); @@ -586,7 +580,6 @@ static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if(!res->size) { res->cookies = heap_alloc(4*sizeof(*res->cookies)); if(!res->cookies) @@ -600,6 +593,9 @@ static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t res->size *= 2; } + TRACE("%s = %s domain %s path %s\n", debugstr_w(cookie_iter->name), debugstr_w(cookie_iter->data), + debugstr_w(domain->domain), debugstr_wn(container->path.str, container->path.len)); + if(res->cnt) res->string_len += 2; /* '; ' */ res->cookies[res->cnt++] = cookie_iter;

1 0

Alexandre Julliard : ntoskrnl: Mark function that are only called from assembly as hidden.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: e6ff0e6357fb6a78f868c13dc00355d1c01d94ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ff0e6357fb6a78f868c13dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:48:46 2017 +0200 ntoskrnl: Mark function that are only called from assembly as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8d2c020..6347eb0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1314,7 +1314,7 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) -NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +NTSTATUS WINAPI DECLSPEC_HIDDEN __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) #else NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) #endif @@ -1531,7 +1531,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) -void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +void WINAPI DECLSPEC_HIDDEN __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) #else void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) #endif @@ -1546,7 +1546,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) */ #ifdef DEFINE_FASTCALL3_ENTRYPOINT DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) -LONG WINAPI __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +LONG WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) #else LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) #endif @@ -1560,7 +1560,7 @@ LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedDecrement ) -LONG WINAPI __regs_NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) +LONG WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) #else LONG WINAPI NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) #endif @@ -1574,7 +1574,7 @@ LONG WINAPI NTOSKRNL_InterlockedDecrement( LONG volatile *dest ) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchange ) -LONG WINAPI __regs_NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) +LONG WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) #else LONG WINAPI NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) #endif @@ -1588,7 +1588,7 @@ LONG WINAPI NTOSKRNL_InterlockedExchange( LONG volatile *dest, LONG val ) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedExchangeAdd ) -LONG WINAPI __regs_NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +LONG WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) #else LONG WINAPI NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) #endif @@ -1602,7 +1602,7 @@ LONG WINAPI NTOSKRNL_InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedIncrement ) -LONG WINAPI __regs_NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) +LONG WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) #else LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) #endif @@ -1616,7 +1616,7 @@ LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedPopEntrySList ) -PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) #else PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) #endif @@ -1630,7 +1630,8 @@ PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedPushEntrySList ) -PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, + PSLIST_ENTRY entry ) #else PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) #endif @@ -2272,7 +2273,7 @@ void WINAPI ObDereferenceObject( void *obj ) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ObfReferenceObject ) -void WINAPI __regs_ObfReferenceObject( void *obj ) +void WINAPI DECLSPEC_HIDDEN __regs_ObfReferenceObject( void *obj ) #else void WINAPI ObfReferenceObject( void *obj ) #endif @@ -2286,7 +2287,7 @@ void WINAPI ObfReferenceObject( void *obj ) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ObfDereferenceObject ) -void WINAPI __regs_ObfDereferenceObject( void *obj ) +void WINAPI DECLSPEC_HIDDEN __regs_ObfDereferenceObject( void *obj ) #else void WINAPI ObfDereferenceObject( void *obj ) #endif @@ -2685,7 +2686,7 @@ PLIST_ENTRY WINAPI ExInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK loc */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( ExfInterlockedRemoveHeadList ) -PLIST_ENTRY WINAPI __regs_ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +PLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) #else PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) #endif @@ -3222,7 +3223,8 @@ VOID WINAPI KeClearEvent(PRKEVENT event) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) -void WINAPI __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, + KLOCK_QUEUE_HANDLE *handle ) #else void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) #endif @@ -3235,7 +3237,7 @@ void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HA */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLock ) -void WINAPI __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) +void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) #else void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) #endif

1 0

Vincent Povirk : mscoree: Update for mono profiler api v2.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: c5f72a72da5d88c7670f44319430e875f43824dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f72a72da5d88c7670f44319… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 24 13:22:15 2017 -0500 mscoree: Update for mono profiler api v2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a99880d..4108f55 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -71,6 +71,10 @@ static HMODULE mono_handle; BOOL is_mono_started; static BOOL is_mono_shutdown; +typedef struct _MonoProfilerDesc *MonoProfilerHandle; + +typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *prof); + MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); @@ -95,7 +99,9 @@ MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); MonoMethod* (CDECL *mono_object_get_virtual_method)(MonoObject *obj, MonoMethod *method); MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass); void* (CDECL *mono_object_unbox)(MonoObject *obj); +static MonoProfilerHandle (CDECL *mono_profiler_create)(MonoProfiler *prof); static void (CDECL *mono_profiler_install)(MonoProfiler *prof, MonoProfileFunc shutdown_callback); +static void (CDECL *mono_profiler_set_runtime_shutdown_begin_callback)(MonoProfilerHandle handle, MonoProfilerRuntimeShutdownBeginCallback cb); MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); @@ -199,7 +205,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_object_get_virtual_method); LOAD_MONO_FUNCTION(mono_object_new); LOAD_MONO_FUNCTION(mono_object_unbox); - LOAD_MONO_FUNCTION(mono_profiler_install); LOAD_MONO_FUNCTION(mono_reflection_type_from_name); LOAD_MONO_FUNCTION(mono_runtime_invoke); LOAD_MONO_FUNCTION(mono_runtime_object_init); @@ -222,13 +227,26 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); + LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); + LOAD_OPT_MONO_FUNCTION(mono_profiler_set_runtime_shutdown_begin_callback, NULL); LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); #undef LOAD_OPT_MONO_FUNCTION - mono_profiler_install(NULL, mono_shutdown_callback_fn); + if (mono_profiler_create != NULL) + { + /* Profiler API v2 */ + MonoProfilerHandle handle = mono_profiler_create(NULL); + mono_profiler_set_runtime_shutdown_begin_callback(handle, mono_shutdown_callback_fn); + } + else if (mono_profiler_install != NULL) + { + /* Profiler API v1 */ + mono_profiler_install(NULL, mono_shutdown_callback_fn); + } mono_set_crash_chaining(TRUE);

1 0

Alexandre Julliard : krnl386: Explicitly fetch the service argument in VxDCall.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: c5a35d898f40a1f64ffddf36b7bcaa7dbe01b0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a35d898f40a1f64ffddf36b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:51:18 2017 +0200 krnl386: Explicitly fetch the service argument in VxDCall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 +++++++++--------- dlls/krnl386.exe16/kernel16_private.h | 15 +++++++++++++++ dlls/krnl386.exe16/krnl386.exe16.spec | 18 +++++++++--------- dlls/krnl386.exe16/thunk.c | 15 --------------- dlls/krnl386.exe16/vxd.c | 7 +++---- 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f67141d..36a98bd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -8,15 +8,15 @@ # - code generated by the MS Thunk Compiler # - symbols exported by the Oct 94 beta version of kernel32.dll - 1 stdcall -noname -i386 -private -register VxDCall0(long) krnl386.exe16.VxDCall0 - 2 stdcall -noname -i386 -private -register VxDCall1(long) krnl386.exe16.VxDCall1 - 3 stdcall -noname -i386 -private -register VxDCall2(long) krnl386.exe16.VxDCall2 - 4 stdcall -noname -i386 -private -register VxDCall3(long) krnl386.exe16.VxDCall3 - 5 stdcall -noname -i386 -private -register VxDCall4(long) krnl386.exe16.VxDCall4 - 6 stdcall -noname -i386 -private -register VxDCall5(long) krnl386.exe16.VxDCall5 - 7 stdcall -noname -i386 -private -register VxDCall6(long) krnl386.exe16.VxDCall6 - 8 stdcall -noname -i386 -private -register VxDCall7(long) krnl386.exe16.VxDCall7 - 9 stdcall -noname -i386 -private -register VxDCall8(long) krnl386.exe16.VxDCall8 + 1 stdcall -noname -i386 -private -register VxDCall0() krnl386.exe16.VxDCall0 + 2 stdcall -noname -i386 -private -register VxDCall1() krnl386.exe16.VxDCall1 + 3 stdcall -noname -i386 -private -register VxDCall2() krnl386.exe16.VxDCall2 + 4 stdcall -noname -i386 -private -register VxDCall3() krnl386.exe16.VxDCall3 + 5 stdcall -noname -i386 -private -register VxDCall4() krnl386.exe16.VxDCall4 + 6 stdcall -noname -i386 -private -register VxDCall5() krnl386.exe16.VxDCall5 + 7 stdcall -noname -i386 -private -register VxDCall6() krnl386.exe16.VxDCall6 + 8 stdcall -noname -i386 -private -register VxDCall7() krnl386.exe16.VxDCall7 + 9 stdcall -noname -i386 -private -register VxDCall8() krnl386.exe16.VxDCall8 10 stdcall -noname -i386 -private k32CharToOemA(str ptr) krnl386.exe16.k32CharToOemA 11 stdcall -noname -i386 -private k32CharToOemBuffA(str ptr long) krnl386.exe16.k32CharToOemBuffA 12 stdcall -noname -i386 -private k32OemToCharA(ptr ptr) krnl386.exe16.k32OemToCharA diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 183c872..2c860df 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -283,6 +283,21 @@ static inline struct kernel_thread_data *kernel_get_thread_data(void) return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; } +/* Push a DWORD on the 32-bit stack */ +static inline void stack32_push( CONTEXT *context, DWORD val ) +{ + context->Esp -= sizeof(DWORD); + *(DWORD *)context->Esp = val; +} + +/* Pop a DWORD from the 32-bit stack */ +static inline DWORD stack32_pop( CONTEXT *context ) +{ + DWORD ret = *(DWORD *)context->Esp; + context->Esp += sizeof(DWORD); + return ret; +} + #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ ".byte 0x68\n\t" /* pushl $__regs_func */ \ diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 09e2cf6..0f2007b 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -549,15 +549,15 @@ ################################################################ # 32-bit version of the various 16-bit functions exported by kernel32 # -@ stdcall -arch=win32 -register VxDCall0(long) VxDCall -@ stdcall -arch=win32 -register VxDCall1(long) VxDCall -@ stdcall -arch=win32 -register VxDCall2(long) VxDCall -@ stdcall -arch=win32 -register VxDCall3(long) VxDCall -@ stdcall -arch=win32 -register VxDCall4(long) VxDCall -@ stdcall -arch=win32 -register VxDCall5(long) VxDCall -@ stdcall -arch=win32 -register VxDCall6(long) VxDCall -@ stdcall -arch=win32 -register VxDCall7(long) VxDCall -@ stdcall -arch=win32 -register VxDCall8(long) VxDCall +@ stdcall -arch=win32 -register VxDCall0() VxDCall +@ stdcall -arch=win32 -register VxDCall1() VxDCall +@ stdcall -arch=win32 -register VxDCall2() VxDCall +@ stdcall -arch=win32 -register VxDCall3() VxDCall +@ stdcall -arch=win32 -register VxDCall4() VxDCall +@ stdcall -arch=win32 -register VxDCall5() VxDCall +@ stdcall -arch=win32 -register VxDCall6() VxDCall +@ stdcall -arch=win32 -register VxDCall7() VxDCall +@ stdcall -arch=win32 -register VxDCall8() VxDCall @ stdcall -arch=win32 k32CharToOemA(str ptr) @ stdcall -arch=win32 k32CharToOemBuffA(str ptr long) @ stdcall -arch=win32 k32OemToCharA(ptr ptr) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c72da1c..64287c3 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -153,21 +153,6 @@ extern void FT_PrologPrime(void); extern void QT_Thunk(void); extern void QT_ThunkPrime(void); -/* Push a DWORD on the 32-bit stack */ -static inline void stack32_push( CONTEXT *context, DWORD val ) -{ - context->Esp -= sizeof(DWORD); - *(DWORD *)context->Esp = val; -} - -/* Pop a DWORD from the 32-bit stack */ -static inline DWORD stack32_pop( CONTEXT *context ) -{ - DWORD ret = *(DWORD *)context->Esp; - context->Esp += sizeof(DWORD); - return ret; -} - /*********************************************************************** * * * Win95 internal thunks * diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 6cb7d70..4cd4f05 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -286,10 +286,11 @@ done: * VxDCall7 (KERNEL32.8) * VxDCall8 (KERNEL32.9) */ -void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( DWORD service, CONTEXT *context ) +void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) { unsigned int i; VxDCallProc proc = NULL; + DWORD service = stack32_pop( context ); RtlEnterCriticalSection( &vxd_section ); for (i = 0; i < NB_VXD_SERVICES; i++) @@ -312,9 +313,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( DWORD service, CONTEXT *context ) context->Eax = 0xffffffff; /* FIXME */ } } -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( VxDCall, 1 ) -#endif +DEFINE_REGS_ENTRYPOINT( VxDCall, 0 ) /***********************************************************************

1 0

Alexandre Julliard : krnl386: Mark function that are only called from assembly as hidden.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 5b71091b434b3981559d18c433044d8d84d45496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b71091b434b3981559d18c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:50:51 2017 +0200 krnl386: Mark function that are only called from assembly as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 2 +- dlls/krnl386.exe16/vxd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 9126125..c72da1c 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2123,7 +2123,7 @@ LPVOID WINAPI GetPK16SysVar(void) /********************************************************************** * CommonUnimpStub (KERNEL32.17) */ -int WINAPI __regs_CommonUnimpStub( const char *name, int type ) +int WINAPI DECLSPEC_HIDDEN __regs_CommonUnimpStub( const char *name, int type ) { FIXME("generic stub %s\n", debugstr_a(name)); diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 64983b4..6cb7d70 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -286,7 +286,7 @@ done: * VxDCall7 (KERNEL32.8) * VxDCall8 (KERNEL32.9) */ -void WINAPI __regs_VxDCall( DWORD service, CONTEXT *context ) +void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( DWORD service, CONTEXT *context ) { unsigned int i; VxDCallProc proc = NULL;

1 0

Alexandre Julliard : msvcrt: Mark function that are only called from assembly as hidden.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: c293acac010966193744f30dc5bf6b92aea5f497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c293acac010966193744f30dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:49:07 2017 +0200 msvcrt: Mark function that are only called from assembly as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 +++--- dlls/msvcrt/misc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f777ba6..0400ce5 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -135,7 +135,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); + EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; /* call a function with a given ebp */ static inline void *call_ebp_func( void *func, void *ebp ) @@ -1054,7 +1054,7 @@ __ASM_GLOBAL_FUNC( longjmp_set_regs, * _setjmp (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp) -int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) +int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) { jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; if (jmp->Registration == ~0UL) @@ -1071,7 +1071,7 @@ int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) * _setjmp3 (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ) -int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...) +int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...) { jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 9e38364..b9dadac 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -237,7 +237,7 @@ __ASM_GLOBAL_FUNC(_chkesp, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") -void CDECL MSVCRT_chkesp_fail(void) +void CDECL DECLSPEC_HIDDEN MSVCRT_chkesp_fail(void) { ERR("Stack pointer incorrect after last function call - Bad prototype/spec entry?\n"); DebugBreak();

1 0

Alexandre Julliard : ntdll: Mark function that are only called from assembly as hidden.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 38d45cbcc820250c12139a14716ce24b24a9c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d45cbcc820250c12139a147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:48:24 2017 +0200 ntdll: Mark function that are only called from assembly as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 17 +++++++++-------- dlls/ntdll/resource.c | 4 ++-- dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/signal_i386.c | 11 ++++++----- dlls/ntdll/signal_x86_64.c | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 9ffe28a..30cb953 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -330,7 +330,8 @@ static void print_timestamp(void) * * stack points to the return address, i.e. the first argument is stack[1]. */ -void * WINAPI relay_trace_entry( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) +DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, + unsigned int idx, const INT_PTR *stack ) { WORD ordinal = LOWORD(idx); BYTE nb_args = LOBYTE(HIWORD(idx)); @@ -357,8 +358,8 @@ void * WINAPI relay_trace_entry( struct relay_descr *descr, unsigned int idx, co /*********************************************************************** * relay_trace_exit */ -void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, - const INT_PTR *stack, LONGLONG retval ) +DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, + const INT_PTR *stack, LONGLONG retval ) { WORD ordinal = LOWORD(idx); BYTE flags = HIBYTE(HIWORD(idx)); @@ -480,9 +481,9 @@ __ASM_GLOBAL_FUNC( relay_call, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret $12" ) -void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, - unsigned int orig_eax, unsigned int ret_addr, - CONTEXT *context ) +void WINAPI DECLSPEC_HIDDEN __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, + unsigned int orig_eax, unsigned int ret_addr, + CONTEXT *context ) { WORD ordinal = LOWORD(idx); BYTE nb_args = LOBYTE(HIWORD(idx)); @@ -1063,7 +1064,7 @@ static void SNOOP_PrintArg(DWORD x) __ENDTRY } -void WINAPI __regs_SNOOP_Entry( void **stack ) +void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Entry( void **stack ) { SNOOP_DLL *dll; SNOOP_FUN *fun = (SNOOP_FUN *)((char *)stack[0] - 5); @@ -1149,7 +1150,7 @@ void WINAPI __regs_SNOOP_Entry( void **stack ) DPRINTF(") ret=%08x\n",(DWORD)ret->origreturn); } -void WINAPI __regs_SNOOP_Return( void **stack ) +void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Return( void **stack ) { SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)((char *)stack[0] - 5); SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal]; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 9635bb0..f542677 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -314,8 +314,8 @@ NTSTATUS WINAPI LdrFindResource_U( HMODULE hmod, const LDR_RESOURCE_INFO *info, /* don't penalize other platforms stuff needed on i386 for compatibility */ #ifdef __i386__ -NTSTATUS WINAPI access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, - void **ptr, ULONG *size ) +NTSTATUS WINAPI DECLSPEC_HIDDEN access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) #else static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, void **ptr, ULONG *size ) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c309e10..b0ea413 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1238,8 +1238,8 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSListEx(PSLIST_HEADER list, PSLIST_ENT */ #ifdef DEFINE_FASTCALL4_ENTRYPOINT DEFINE_FASTCALL4_ENTRYPOINT(RtlInterlockedPushListSList) -PSLIST_ENTRY WINAPI __regs_RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, - PSLIST_ENTRY last, ULONG count) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) #else PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9d7b726..465ac1f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1467,8 +1467,9 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) * Note: we use a small assembly wrapper to save the necessary registers * in case we are fetching the context of the current thread. */ -NTSTATUS CDECL __regs_NtGetContextThread( DWORD edi, DWORD esi, DWORD ebx, DWORD eflags, - DWORD ebp, DWORD retaddr, HANDLE handle, CONTEXT *context ) +NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, DWORD ebx, DWORD eflags, + DWORD ebp, DWORD retaddr, HANDLE handle, + CONTEXT *context ) { NTSTATUS ret; DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; @@ -2644,8 +2645,8 @@ void __wine_enter_vm86( CONTEXT *context ) /******************************************************************* * RtlUnwind (NTDLL.@) */ -void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID targetIp, - PEXCEPTION_RECORD pRecord, PVOID retval, CONTEXT *context ) +void WINAPI DECLSPEC_HIDDEN __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID targetIp, + PEXCEPTION_RECORD pRecord, PVOID retval, CONTEXT *context ) { EXCEPTION_RECORD record; EXCEPTION_REGISTRATION_RECORD *frame, *dispatch; @@ -2850,7 +2851,7 @@ __ASM_GLOBAL_FUNC(call_thread_func_wrapper, /*********************************************************************** * call_thread_func */ -void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) +void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) { x86_thread_data()->exit_frame = frame; __TRY diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c1919e8..ed43682 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4061,7 +4061,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /*********************************************************************** * call_thread_func */ -void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) +void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) { amd64_thread_data()->exit_frame = frame; __TRY

1 0

Alexandre Julliard : krnl386: Use RtlCaptureContext and NtSetContextThread to implement register functions.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 1b85b6cab7372c05fec841a578a9882ef47028f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b85b6cab7372c05fec841a57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 12:04:28 2017 +0200 krnl386: Use RtlCaptureContext and NtSetContextThread to implement register functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 42 +++++++++++++++++------------------ dlls/krnl386.exe16/kernel16_private.h | 26 ++++++++++++++++------ dlls/krnl386.exe16/krnl386.exe16.spec | 42 +++++++++++++++++------------------ dlls/krnl386.exe16/thunk.c | 24 ++++++++++---------- dlls/krnl386.exe16/vxd.c | 2 +- 5 files changed, 74 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b85b6cab7372c05fec84…

1 0

Alexandre Julliard : hal: Mark function that are only called from assembly as hidden.
by Alexandre Julliard July 25, 2017

July 25, 2017

Module: wine Branch: master Commit: 6d2719d3c12c2765c1a4332b894f95f232ff652b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2719d3c12c2765c1a4332b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 25 11:48:40 2017 +0200 hal: Mark function that are only called from assembly as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 9cae67e..ddd8710 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) -VOID WINAPI __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) #else VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) #endif @@ -62,7 +62,7 @@ VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) -VOID WINAPI __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) +VOID WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) #else VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) #endif @@ -72,7 +72,7 @@ VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) -BOOLEAN WINAPI __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) #else BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) #endif @@ -83,7 +83,7 @@ BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) -KIRQL WINAPI __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) #else KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) #endif @@ -96,7 +96,7 @@ KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) -VOID WINAPI __regs_KfLowerIrql(KIRQL NewIrql) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) #else VOID WINAPI KfLowerIrql(KIRQL NewIrql) #endif @@ -107,7 +107,7 @@ VOID WINAPI KfLowerIrql(KIRQL NewIrql) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfRaiseIrql ) -KIRQL WINAPI __regs_KfRaiseIrql(KIRQL NewIrql) +KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfRaiseIrql(KIRQL NewIrql) #else KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) #endif @@ -120,7 +120,7 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) #ifdef DEFINE_FASTCALL2_ENTRYPOINT DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) #else VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) #endif

1 0