Jacek Caban : winex11: Use __wine_unix_call.
Alexandre Julliard
julliard at winehq.org
Fri Jul 22 15:37:21 CDT 2022
Module: wine
Branch: master
Commit: d246c1a1da9f5ef757a9ede9e211e589e6e191cd
URL: https://gitlab.winehq.org/wine/wine/-/commit/d246c1a1da9f5ef757a9ede9e211e589e6e191cd
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sat Jul 9 18:34:12 2022 +0200
winex11: Use __wine_unix_call.
---
dlls/winex11.drv/dllmain.c | 6 ++----
dlls/winex11.drv/unixlib.h | 6 ++----
dlls/winex11.drv/x11drv_main.c | 10 ----------
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c
index 086a32d2f85..99a137f66e7 100644
--- a/dlls/winex11.drv/dllmain.c
+++ b/dlls/winex11.drv/dllmain.c
@@ -23,8 +23,7 @@
HMODULE x11drv_module = 0;
-static unixlib_handle_t x11drv_handle;
-NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params );
+unixlib_handle_t x11drv_handle;
typedef NTSTATUS (*callback_func)( UINT arg );
@@ -78,13 +77,12 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
&x11drv_handle, sizeof(x11drv_handle), NULL ))
return FALSE;
- if (__wine_unix_call( x11drv_handle, unix_init, ¶ms )) return FALSE;
+ if (X11DRV_CALL( init, ¶ms )) return FALSE;
callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) );
show_systray = params.show_systray;
- x11drv_unix_call = params.unix_call;
return TRUE;
}
diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h
index 208c395e02b..fa3685af33a 100644
--- a/dlls/winex11.drv/unixlib.h
+++ b/dlls/winex11.drv/unixlib.h
@@ -36,9 +36,8 @@ enum x11drv_funcs
unix_funcs_count,
};
-/* FIXME: Use __wine_unix_call when the rest of the stack is ready */
-extern NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ) DECLSPEC_HIDDEN;
-#define X11DRV_CALL(func, params) x11drv_unix_call( unix_ ## func, params )
+extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN;
+#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params )
/* x11drv_create_desktop params */
struct create_desktop_params
@@ -52,7 +51,6 @@ struct init_params
{
WNDPROC foreign_window_proc;
BOOL show_systray;
- NTSTATUS (CDECL *unix_call)( enum x11drv_funcs code, void *params );
};
struct systray_dock_params
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 9e05ebaa9a5..20e07679635 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -220,8 +220,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
"text/uri-list"
};
-static NTSTATUS CDECL unix_call( enum x11drv_funcs code, void *params );
-
/***********************************************************************
* ignore_error
*
@@ -717,7 +715,6 @@ static NTSTATUS x11drv_init( void *arg )
init_user_driver();
X11DRV_DisplayDevices_Init(FALSE);
params->show_systray = show_systray;
- params->unix_call = unix_call;
return STATUS_SUCCESS;
}
@@ -1340,10 +1337,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count );
-
-
-/* FIXME: Use __wine_unix_call instead */
-static NTSTATUS CDECL unix_call( enum x11drv_funcs code, void *params )
-{
- return __wine_unix_call_funcs[code]( params );
-}
More information about the wine-cvs
mailing list