From: Jacek Caban jacek@codeweavers.com
--- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/dllmain.c | 8 ++------ dlls/winex11.drv/unixlib.h | 29 ----------------------------- dlls/winex11.drv/x11drv.h | 3 ++- dlls/winex11.drv/x11drv_main.c | 6 ------ 5 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 dlls/winex11.drv/unixlib.h
diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9806dd350e9..53ea4c794d7 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,5 @@ MODULE = winex11.drv UNIXLIB = winex11.so -IMPORTS = uuid user32 gdi32 win32u UNIX_CFLAGS = $(X_CFLAGS) UNIX_LIBS = -lwin32u $(X_LIBS) $(PTHREAD_LIBS) -lm
diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 2e96b920606..ae7084dd6c3 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -21,9 +21,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "ntgdi.h" -#include "unixlib.h" -#include "wine/debug.h" +#include "wine/unixlib.h"
BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { @@ -31,7 +29,5 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
DisableThreadLibraryCalls( instance ); if (__wine_init_unix_call()) return FALSE; - if (X11DRV_CALL( init, NULL )) return FALSE; - - return TRUE; + return !WINE_UNIX_CALL( 0, NULL ); } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h deleted file mode 100644 index 5da7abc1bfd..00000000000 --- a/dlls/winex11.drv/unixlib.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2022 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "ntuser.h" -#include "shlobj.h" -#include "wine/unixlib.h" - -enum x11drv_funcs -{ - unix_init, - unix_funcs_count, -}; - -#define X11DRV_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6b7f5c263f6..a71607e9e97 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -63,8 +63,9 @@ typedef int Status; #include "windef.h" #include "winbase.h" #include "ntgdi.h" +#include "shlobj.h" +#include "wine/unixlib.h" #include "wine/gdi_driver.h" -#include "unixlib.h" #include "wine/list.h" #include "wine/debug.h" #include "mwm.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1343accc47d..6616f9fb7d0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -808,10 +808,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = x11drv_init, };
- -C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); - - #ifdef _WIN64
const unixlib_entry_t __wine_unix_call_wow64_funcs[] = @@ -819,6 +815,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = x11drv_init, };
-C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); - #endif /* _WIN64 */