winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2022
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
1171 discussions
Start a n
N
ew thread
Alexandre Julliard : winebus.sys: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : nsiproxy.sys: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : mountmgr.sys: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : winepulse.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : wineoss.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
Module: wine Branch: master Commit: 07211395f32174a5d12d6bd41eaba9021f41abe2 URL:
https://gitlab.winehq.org/wine/wine/-/commit/07211395f32174a5d12d6bd41eaba9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:32:09 2022 +0100 wineoss.drv: Use the Unix call helpers. --- dlls/wineoss.drv/mmdevdrv.c | 6 +----- dlls/wineoss.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 3bcb0f5f288..7411f87a4d7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -unixlib_handle_t oss_handle = 0; - static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; @@ -209,9 +207,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &oss_handle, sizeof(oss_handle), NULL)) - return FALSE; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 1c3ee7b93b3..f921b00e0a2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t oss_handle; - -#define OSS_CALL(func, params) __wine_unix_call(oss_handle, func, params) +#define OSS_CALL(func, params) WINE_UNIX_CALL(func, params)
1
0
0
0
Alexandre Julliard : winecoreaudio.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : winealsa.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
Module: wine Branch: master Commit: 9e4e8de7c19cb0fb0447357f9117ddeac0af6978 URL:
https://gitlab.winehq.org/wine/wine/-/commit/9e4e8de7c19cb0fb0447357f9117dd…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:31:29 2022 +0100 winealsa.drv: Use the Unix call helpers. --- dlls/winealsa.drv/mmdevdrv.c | 6 +----- dlls/winealsa.drv/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 20a27d501d3..ea48143005b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); -unixlib_handle_t alsa_handle = 0; - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -203,9 +201,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, - &alsa_handle, sizeof(alsa_handle), NULL)) - return FALSE; + if(__wine_init_unix_call()) return FALSE; break; case DLL_PROCESS_DETACH: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 8c82281012a..de6ce71571c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -29,6 +29,4 @@ NTSTATUS alsa_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS alsa_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; #endif -extern unixlib_handle_t alsa_handle; - -#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, func, params) +#define ALSA_CALL(func, params) WINE_UNIX_CALL(func, params)
1
0
0
0
Alexandre Julliard : wineandroid.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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, ¶ms )) 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
0
0
Alexandre Julliard : winemac.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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
0
0
Alexandre Julliard : winex11.drv: Use the Unix call helpers.
by Alexandre Julliard
24 Nov '22
24 Nov '22
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, ¶ms )) 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
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
118
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
Results per page:
10
25
50
100
200