Commit cb713d60 authored by Alexandre Julliard's avatar Alexandre Julliard

winex11.drv: Use the Unix call helpers.

parent 1d036c04
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
HMODULE x11drv_module = 0; HMODULE x11drv_module = 0;
unixlib_handle_t x11drv_handle;
typedef NTSTATUS (*callback_func)( UINT arg ); typedef NTSTATUS (*callback_func)( UINT arg );
...@@ -74,10 +73,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) ...@@ -74,10 +73,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
DisableThreadLibraryCalls( instance ); DisableThreadLibraryCalls( instance );
x11drv_module = instance; x11drv_module = instance;
if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, if (__wine_init_unix_call()) return FALSE;
&x11drv_handle, sizeof(x11drv_handle), NULL ))
return FALSE;
if (X11DRV_CALL( init, &params )) return FALSE; if (X11DRV_CALL( init, &params )) return FALSE;
callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
......
...@@ -36,8 +36,7 @@ enum x11drv_funcs ...@@ -36,8 +36,7 @@ enum x11drv_funcs
unix_funcs_count, unix_funcs_count,
}; };
extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN; #define X11DRV_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params )
#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params )
/* x11drv_create_desktop params */ /* x11drv_create_desktop params */
struct create_desktop_params struct create_desktop_params
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment