November 2022 - Wine-Commits

Alexandre Julliard : nsiproxy.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 2a366cddd71fed2148a4e6fd0fe28312421e13e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a366cddd71fed2148a4e6fd0fe283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:33:45 2022 +0100 nsiproxy.sys: Use the Unix call helpers. --- dlls/nsiproxy.sys/device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 7aba1f0c36f..4528e934991 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); -static unixlib_handle_t nsiproxy_handle; static HANDLE request_event; #define DECLARE_CRITICAL_SECTION(cs) \ @@ -53,7 +52,7 @@ static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { - return __wine_unix_call( nsiproxy_handle, code, args ); + return WINE_UNIX_CALL( code, args ); } enum unix_calls @@ -425,15 +424,12 @@ static DWORD WINAPI request_thread_proc( void *arg ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - HMODULE instance; NTSTATUS status; HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); - RtlPcToFileHeader( &DriverEntry, (void *)&instance ); - status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + status = __wine_init_unix_call(); if (status) return status; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl;

1 0

Alexandre Julliard : winebus.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 4510e490e9392c3326241de7c587c990f249614f URL: https://gitlab.winehq.org/wine/wine/-/commit/4510e490e9392c3326241de7c587c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:04 2022 +0100 winebus.sys: Use the Unix call helpers. --- dlls/winebus.sys/main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 35f84bd9e29..c02f786a11f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -100,12 +100,9 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); -static HMODULE instance; -static unixlib_handle_t winebus_handle; - static NTSTATUS winebus_call(unsigned int code, void *args) { - return __wine_unix_call(winebus_handle, code, args); + return WINE_UNIX_CALL(code, args); } static void unix_device_remove(DEVICE_OBJECT *device) @@ -1181,10 +1178,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); - RtlPcToFileHeader(&DriverEntry, (void *)&instance); - if ((ret = NtQueryVirtualMemory(GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &winebus_handle, sizeof(winebus_handle), NULL))) - return ret; + if ((ret = __wine_init_unix_call())) return ret; attr.Length = sizeof(attr); attr.ObjectName = path;

1 0

Alexandre Julliard : mountmgr.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 14d411b8a097fa3b335750d0b04a47f2525d6058 URL: https://gitlab.winehq.org/wine/wine/-/commit/14d411b8a097fa3b335750d0b04a47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:33:23 2022 +0100 mountmgr.sys: Use the Unix call helpers. --- dlls/mountmgr.sys/mountmgr.c | 7 +------ dlls/mountmgr.sys/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 66034621b44..b67082229f6 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -46,8 +46,6 @@ struct mount_point static struct list mount_points_list = LIST_INIT(mount_points_list); static HKEY mount_key; -unixlib_handle_t mountmgr_handle = 0; - void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) { RtlFreeHeap( GetProcessHeap(), 0, mount->id ); @@ -620,7 +618,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) #ifdef _WIN64 HKEY wow64_ports_key = NULL; #endif - void *instance; UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; HKEY devicemap_key; @@ -629,9 +626,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "%s\n", debugstr_w(path->Buffer) ); - RtlPcToFileHeader( DriverEntry, &instance ); - status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &mountmgr_handle, sizeof(mountmgr_handle), NULL ); + status = __wine_init_unix_call(); if (status) return status; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index d70371876fa..efbce71b979 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -174,9 +174,7 @@ enum mountmgr_funcs unix_enumerate_credentials, }; -extern unixlib_handle_t mountmgr_handle; - -#define MOUNTMGR_CALL( func, params ) __wine_unix_call( mountmgr_handle, unix_ ## func, params ) +#define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) extern void queue_device_op( enum device_op op, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid,

1 0

Alexandre Julliard : winecoreaudio.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: c372caaebceff9fe751b122ff30a1b9797101cdc URL: https://gitlab.winehq.org/wine/wine/-/commit/c372caaebceff9fe751b122ff30a1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:49 2022 +0100 winecoreaudio.drv: Use the Unix call helpers. --- dlls/winecoreaudio.drv/mmdevdrv.c | 5 +---- dlls/winecoreaudio.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6715ab72e88..367f7ba0ab8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -unixlib_handle_t coreaudio_handle = 0; - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -199,8 +197,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(dll); - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + if (__wine_init_unix_call()) return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index caa352d2dfa..1ff4a0bac24 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -33,6 +33,4 @@ NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t coreaudio_handle; - -#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( func, params )

1 0

Alex Henrie : pdh: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: ed510dd900a6feb57f280b0d10ee2a61b7873fe8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed510dd900a6feb57f280b0d10ee2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 23 21:43:11 2022 -0700 pdh: Use standard C functions for memory allocation. --- dlls/pdh/pdh_main.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 3fc3f7bc6b8..7eae7872b48 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <math.h> #define NONAMELESSUNION @@ -32,7 +33,6 @@ #include "winperf.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); @@ -47,15 +47,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -static inline WCHAR *pdh_strdup( const WCHAR *src ) -{ - WCHAR *dst; - - if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *pdh_strdup_aw( const char *src ) { int len; @@ -63,7 +54,7 @@ static inline WCHAR *pdh_strdup_aw( const char *src ) if (!src) return NULL; len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); - if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); return dst; } @@ -98,7 +89,7 @@ static struct counter *create_counter( void ) { struct counter *counter; - if ((counter = heap_alloc_zero( sizeof(struct counter) ))) + if ((counter = calloc( 1, sizeof(struct counter) ))) { counter->magic = PDH_MAGIC_COUNTER; return counter; @@ -109,8 +100,8 @@ static struct counter *create_counter( void ) static void destroy_counter( struct counter *counter ) { counter->magic = 0; - heap_free( counter->path ); - heap_free( counter ); + free( counter->path ); + free( counter ); } #define PDH_MAGIC_QUERY 0x50444830 /* 'PDH0' */ @@ -130,7 +121,7 @@ static struct query *create_query( void ) { struct query *query; - if ((query = heap_alloc_zero( sizeof(struct query) ))) + if ((query = calloc( 1, sizeof(struct query) ))) { query->magic = PDH_MAGIC_QUERY; list_init( &query->counters ); @@ -142,7 +133,7 @@ static struct query *create_query( void ) static void destroy_query( struct query *query ) { query->magic = 0; - heap_free( query ); + free( query ); } struct source @@ -222,7 +213,7 @@ PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, ret = PdhAddCounterW( query, pathW, userdata, counter ); - heap_free( pathW ); + free( pathW ); return ret; } @@ -254,7 +245,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, { if ((counter = create_counter())) { - counter->path = pdh_strdup( counter_sources[i].path ); + counter->path = wcsdup( counter_sources[i].path ); counter->collect = counter_sources[i].collect; counter->type = counter_sources[i].type; counter->defaultscale = counter_sources[i].scale; @@ -822,8 +813,8 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameA( LPCSTR machine, LPCSTR name, LPDWOR ret = PdhLookupPerfIndexByNameW( machineW, nameW, index ); - heap_free( nameW ); - heap_free( machineW ); + free( nameW ); + free( machineW ); return ret; } @@ -878,7 +869,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); *size = required; } - heap_free( machineW ); + free( machineW ); return ret; } @@ -934,7 +925,7 @@ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY * if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; ret = PdhOpenQueryW( sourceW, userdata, query ); - heap_free( sourceW ); + free( sourceW ); return ret; } @@ -1030,7 +1021,7 @@ PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) ret = PdhValidatePathW( pathW ); - heap_free( pathW ); + free( pathW ); return ret; } @@ -1128,7 +1119,7 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf ret = PdhMakeCounterPathW( &eW, NULL, &buflenW, flags ); if (ret == PDH_MORE_DATA) { - if ((bufferW = heap_alloc( buflenW * sizeof(WCHAR) ))) + if ((bufferW = malloc( buflenW * sizeof(WCHAR) ))) { if (!(ret = PdhMakeCounterPathW( &eW, bufferW, &buflenW, flags ))) { @@ -1137,18 +1128,18 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf else ret = PDH_MORE_DATA; *buflen = len; } - heap_free( bufferW ); + free( bufferW ); } else ret = PDH_MEMORY_ALLOCATION_FAILURE; } done: - heap_free( eW.szMachineName ); - heap_free( eW.szObjectName ); - heap_free( eW.szInstanceName ); - heap_free( eW.szParentInstance ); - heap_free( eW.szCounterName ); + free( eW.szMachineName ); + free( eW.szObjectName ); + free( eW.szInstanceName ); + free( eW.szParentInstance ); + free( eW.szCounterName ); return ret; }

1 0

Alexandre Julliard : winepulse.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: d8b77f14a3d3aacf06169cbc8f0beeaba17bc199 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b77f14a3d3aacf06169cbc8f0bee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:32:30 2022 +0100 winepulse.drv: Use the Unix call helpers. --- dlls/winepulse.drv/mmdevdrv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6e138ac4529..5de9a941099 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -50,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); -static unixlib_handle_t pulse_handle; - #define MAX_PULSE_NAME_LEN 256 #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -87,17 +85,16 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(dll); - if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &pulse_handle, sizeof(pulse_handle), NULL )) + if (__wine_init_unix_call()) return FALSE; - if (__wine_unix_call(pulse_handle, process_attach, NULL)) + if (WINE_UNIX_CALL(process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { struct device_cache *device, *device_next; LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) free(device); - __wine_unix_call(pulse_handle, process_detach, NULL); + WINE_UNIX_CALL(process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread); @@ -218,7 +215,7 @@ static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; - status = __wine_unix_call(pulse_handle, code, params); + status = WINE_UNIX_CALL(code, params); assert(!status); }

1 0

Alexandre Julliard : winemac.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 5ac3c41eee8e91afc44311b9a81281237dcae68c URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac3c41eee8e91afc44311b9a81281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:30:44 2022 +0100 winemac.drv: Use the Unix call helpers. --- dlls/winemac.drv/dllmain.c | 5 +---- dlls/winemac.drv/unixlib.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index dd12321fa7f..41e9e908b61 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); HMODULE macdrv_module = 0; -unixlib_handle_t macdrv_handle; struct quit_info { HWND *wins; @@ -406,9 +405,7 @@ static BOOL process_attach(void) { .id = 0 } }; - if (NtQueryVirtualMemory(GetCurrentProcess(), macdrv_module, MemoryWineUnixFuncs, - &macdrv_handle, sizeof(macdrv_handle), NULL)) - return FALSE; + if (__wine_init_unix_call()) return FALSE; for (str = strings; str->id; str++) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 5fe19a94fee..614e3ddb11a 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -35,8 +35,7 @@ enum macdrv_funcs unix_funcs_count }; -extern unixlib_handle_t macdrv_handle DECLSPEC_HIDDEN; -#define MACDRV_CALL(func, params) __wine_unix_call(macdrv_handle, unix_ ## func, params) +#define MACDRV_CALL(func, params) WINE_UNIX_CALL(unix_ ## func, params) /* macdrv_dnd_get_data params */ struct dnd_get_data_params

1 0

Alexandre Julliard : wineandroid.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 50347810a148a50ee0717db287e74dc84f62cfb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/50347810a148a50ee0717db287e74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:07 2022 +0100 wineandroid.drv: Use the Unix call helpers. --- dlls/wineandroid.drv/dllmain.c | 6 +----- dlls/wineandroid.drv/unixlib.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index ca3583b574f..3f6dbd388eb 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); -static unixlib_handle_t unix_handle; - extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; static HANDLE thread; @@ -124,9 +122,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - if (NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, - &unix_handle, sizeof(unix_handle), NULL )) - return FALSE; + if (__wine_init_unix_call()) return FALSE; params.register_window_callback = register_window_callback; if (ANDROID_CALL( init, &params )) return FALSE; diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 98da6528fd5..a180e6660c8 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -30,7 +30,7 @@ enum android_funcs unix_funcs_count }; -#define ANDROID_CALL(func, params) __wine_unix_call( unix_handle, unix_ ## func, params ) +#define ANDROID_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params ) /* android_init params */ struct init_params

1 0

Alexandre Julliard : winecrt0: Add a helper function and macro to simplify Unix library usage.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 1d036c04930e449cfc374e52e9663ab8ecad0465 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d036c04930e449cfc374e52e9663a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:25:52 2022 +0100 winecrt0: Add a helper function and macro to simplify Unix library usage. --- dlls/winecrt0/unix_lib.c | 23 +++++++++++++++++++++-- include/wine/unixlib.h | 10 +++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index c86897b9905..10be32899ba 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __WINE_PE_BUILD - #include <stdarg.h> #include "ntstatus.h" @@ -29,6 +27,8 @@ #include "winternl.h" #include "wine/unixlib.h" +#ifdef __WINE_PE_BUILD + static NTSTATUS (WINAPI *p__wine_unix_call)( unixlib_handle_t, unsigned int, void * ); static void load_func( void **func, const char *name, void *def ) @@ -54,3 +54,22 @@ NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, vo } #endif /* __WINE_PE_BUILD */ + +static inline void *image_base(void) +{ +#ifdef __WINE_PE_BUILD + extern IMAGE_DOS_HEADER __ImageBase; + return (void *)&__ImageBase; +#else + extern IMAGE_NT_HEADERS __wine_spec_nt_header; + return (void *)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); +#endif +} + +unixlib_handle_t __wine_unixlib_handle = 0; + +NTSTATUS WINAPI __wine_init_unix_call(void) +{ + return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); +} diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index ef60b32184c..fcb25422524 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -21,13 +21,14 @@ #ifndef __WINE_WINE_UNIXLIB_H #define __WINE_WINE_UNIXLIB_H -typedef NTSTATUS (*unixlib_entry_t)( void *args ); typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); #ifdef WINE_UNIX_LIB +typedef NTSTATUS (*unixlib_entry_t)( void *args ); + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void); @@ -264,6 +265,13 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #define wcstol(str,e,b) ntdll_wcstol(str,e,b) #define wcstoul(str,e,b) ntdll_wcstoul(str,e,b) +#else /* WINE_UNIX_LIB */ + +extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN; + +#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) + #endif /* WINE_UNIX_LIB */ #endif /* __WINE_WINE_UNIXLIB_H */

1 0

Alexandre Julliard : winex11.drv: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: cb713d60066ac88a75aa74edf3af03fa0e2e817c URL: https://gitlab.winehq.org/wine/wine/-/commit/cb713d60066ac88a75aa74edf3af03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:30:16 2022 +0100 winex11.drv: Use the Unix call helpers. --- dlls/winex11.drv/dllmain.c | 6 +----- dlls/winex11.drv/unixlib.h | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 8ed0e40d1ac..500a4a6bc44 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -23,7 +23,6 @@ HMODULE x11drv_module = 0; -unixlib_handle_t x11drv_handle; typedef NTSTATUS (*callback_func)( UINT arg ); @@ -74,10 +73,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) DisableThreadLibraryCalls( instance ); x11drv_module = instance; - if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &x11drv_handle, sizeof(x11drv_handle), NULL )) - return FALSE; - + if (__wine_init_unix_call()) return FALSE; if (X11DRV_CALL( init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index e8b243d67a1..7dc1d9f0ca7 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -36,8 +36,7 @@ enum x11drv_funcs unix_funcs_count, }; -extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN; -#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params ) +#define X11DRV_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params ) /* x11drv_create_desktop params */ struct create_desktop_params

1 0