February 2021 - Wine-Commits

Alexandre Julliard : normaliz: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 077bb664edb38bbabade7a2a2c2fc043b0cb492c URL: https://source.winehq.org/git/wine.git/?a=commit;h=077bb664edb38bbabade7a2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:58:09 2021 +0100 normaliz: Remove DLL_WINE_PREATTACH. The functions are implemented now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/normaliz/Makefile.in | 5 ----- dlls/normaliz/normaliz.c | 50 ----------------------------------------------- 2 files changed, 55 deletions(-) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index 444c1687a1c..89d7dba795d 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -1,7 +1,2 @@ MODULE = normaliz.dll IMPORTLIB = normaliz - -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - normaliz.c diff --git a/dlls/normaliz/normaliz.c b/dlls/normaliz/normaliz.c deleted file mode 100644 index e6d06c51933..00000000000 --- a/dlls/normaliz/normaliz.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Normaliz DLL. - * - * Copyright 2011 Thomas Mullaly - * - * 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 - */ - -/* All calls to this DLL are forwarded to kernel32. On Windows XP this DLL actually contains - * the implementations for the functions it exports, but, starting with Vista these - * functions have been moved into kernel32. - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(normaliz); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : winedump: Print the "prefer native" Wine flag.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: e27c7e0648c05a28e550254e295abfb7ea9049b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27c7e0648c05a28e550254e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:11:33 2021 +0100 winedump: Print the "prefer native" Wine flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/output.c | 36 ++++++++++-------------------------- tools/winedump/pe.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index bbbb1ac0397..5911f22f6c8 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -234,41 +234,25 @@ void output_c_preamble (void) puts ("Creating a forwarding DLL"); fputs ("\nHMODULE hDLL=0; /* DLL to call */\n\n", cfile); - } - fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void " - "*reserved)\n{\n" + fprintf (cfile, + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)\n{\n" " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" " switch (reason)\n" " {\n" - " case DLL_WINE_PREATTACH:\n" - " return FALSE; /* prefer native version */\n" - " case DLL_PROCESS_ATTACH:\n"); - - if (globals.forward_dll) - fprintf (cfile, + " case DLL_PROCESS_ATTACH:\n" " hDLL = LoadLibraryA(\"%s\");\n" - " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", - globals.forward_dll, globals.forward_dll); - else - fprintf (cfile, - " DisableThreadLibraryCalls(instance);\n"); - - fprintf (cfile, - " break;\n"); - - if (globals.forward_dll) - fprintf (cfile, + " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n" + " DisableThreadLibraryCalls(instance);\n" + " break;\n" " case DLL_PROCESS_DETACH:\n" " FreeLibrary(hDLL);\n" " TRACE(\"Forwarding DLL (%s) freed\\n\");\n" - " break;\n", - globals.forward_dll); - - fprintf (cfile, + " break;\n" " }\n\n" - " return TRUE;\n}\n"); + " return TRUE;\n}\n", + globals.forward_dll, globals.forward_dll, globals.forward_dll); + } } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 19ccd172da2..aa679103e59 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -45,8 +45,14 @@ #include "winbase.h" #include "winedump.h" +#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ + static const IMAGE_NT_HEADERS32* PE_nt_headers; +static const char builtin_signature[] = "Wine builtin DLL"; +static const char fakedll_signature[] = "Wine placeholder DLL"; +static int is_builtin; + const char *get_machine_str(int mach) { switch (mach) @@ -95,13 +101,13 @@ static const IMAGE_NT_HEADERS32 *get_nt_header( void ) const IMAGE_DOS_HEADER *dos; dos = PRD(0, sizeof(*dos)); if (!dos) return NULL; + is_builtin = (dos->e_lfanew >= sizeof(*dos) + 32 && + !memcmp( dos + 1, builtin_signature, sizeof(builtin_signature) )); return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } void print_fake_dll( void ) { - static const char builtin_signature[] = "Wine builtin DLL"; - static const char fakedll_signature[] = "Wine placeholder DLL"; const IMAGE_DOS_HEADER *dos; dos = PRD(0, sizeof(*dos) + 32); @@ -214,7 +220,8 @@ static inline void print_subsys(const char *title, WORD value) static inline void print_dllflags(const char *title, WORD value) { printf(" %-34s 0x%04X\n", title, value); -#define X(f,s) if (value & f) printf(" %s\n", s) +#define X(f,s) do { if (value & f) printf(" %s\n", s); } while(0) + if (is_builtin) X(IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE, "PREFER_NATIVE (Wine extension)"); X(IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA, "HIGH_ENTROPY_VA"); X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY");

1 0

Alexandre Julliard : winebuild: Add a --prefer-native option to set a Wine-specific flag in the PE header.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: ad438726691e6b8077e7f1ddcbee9abf67f3840e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad438726691e6b8077e7f1dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:06:06 2021 +0100 winebuild: Add a --prefer-native option to set a Wine-specific flag in the PE header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 4 +++- tools/winebuild/main.c | 8 ++++++++ tools/winebuild/spec32.c | 13 +++++++++++++ tools/winebuild/winebuild.man.in | 4 ++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 104c77db593..84938aabf4f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -217,7 +217,8 @@ struct strarray #define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000 #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 @@ -380,6 +381,7 @@ extern int unwind_tables; extern int use_msvcrt; extern int unix_lib; extern int safe_seh; +extern int prefer_native; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 1477df7f259..72e13b7992b 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -49,6 +49,7 @@ int unwind_tables = 0; int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; +int prefer_native = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -294,6 +295,7 @@ static const char usage_str[] = " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" +" --prefer-native Set the flag to prefer loading native at run time\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" @@ -329,6 +331,7 @@ enum long_options_values LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, + LONG_OPT_PREFER_NATIVE, LONG_OPT_RESOURCES, LONG_OPT_SAFE_SEH, LONG_OPT_SAVE_TEMPS, @@ -356,6 +359,7 @@ static const struct option long_options[] = { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, + { "prefer-native", 0, 0, LONG_OPT_PREFER_NATIVE }, { "resources", 0, 0, LONG_OPT_RESOURCES }, { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, @@ -575,6 +579,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_SAFE_SEH: safe_seh = 1; break; + case LONG_OPT_PREFER_NATIVE: + prefer_native = 1; + spec->dll_characteristics |= IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE; + break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 678f104c555..8d7e48d2da4 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1076,6 +1076,19 @@ void make_builtin_files( char *argv[] ) if (header.e_lfanew < sizeof(header) + sizeof(builtin_signature)) fatal_error( "%s: Not enough space (%x) for Wine signature\n", argv[i], header.e_lfanew ); write( fd, builtin_signature, sizeof(builtin_signature) ); + + if (prefer_native) + { + unsigned int pos = header.e_lfanew + 0x5e; /* OptionalHeader.DllCharacteristics */ + unsigned short dll_charact; + lseek( fd, pos, SEEK_SET ); + if (read( fd, &dll_charact, sizeof(dll_charact) ) == sizeof(dll_charact)) + { + dll_charact |= IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE; + lseek( fd, pos, SEEK_SET ); + write( fd, &dll_charact, sizeof(dll_charact) ); + } + } } else fatal_error( "%s: Unrecognized file format\n", argv[i] ); close( fd ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index c1de885dac2..d55c00b2d24 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -209,6 +209,10 @@ output file name ends in .o, the text output is sent to a temporary file that is then assembled to produce the specified .o file. .TP +.B --prefer-native +Specify that the native DLL should be preferred if available at run +time. This can be used on modules that are mostly unimplemented. +.TP .BI \-r,\ --res= rsrc.res Load resources from the specified binary resource file. The \fIrsrc.res\fR file can be produced from a source resource file with

1 0

Alexandre Julliard : d3dim: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 5a99feea38ddc08bf2d31518ab4d4b0777372a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a99feea38ddc08bf2d31518… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:42:47 2021 +0100 d3dim: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dim/Makefile.in | 4 +--- dlls/d3dim/d3dim_main.c | 37 ------------------------------------- dlls/d3dim700/Makefile.in | 5 +---- dlls/d3dim700/d3dim700_main.c | 42 ------------------------------------------ 4 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index 1acc05440cc..f62573b513d 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -1,7 +1,5 @@ MODULE = d3dim.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = d3dim_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3dim/d3dim_main.c b/dlls/d3dim/d3dim_main.c deleted file mode 100644 index 4651d5dc11f..00000000000 --- a/dlls/d3dim/d3dim_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2006 Alexandre Julliard - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" - -/*********************************************************************** - * DllMain (D3DIM.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in index 12a28ae475a..f2106dd977e 100644 --- a/dlls/d3dim700/Makefile.in +++ b/dlls/d3dim700/Makefile.in @@ -1,8 +1,5 @@ MODULE = d3dim700.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - d3dim700_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c deleted file mode 100644 index 18a211ccc74..00000000000 --- a/dlls/d3dim700/d3dim700_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright 2020 Austin English - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 146ff01f5465ba4d6c769ac452a00e8a6a4b112d URL: https://source.winehq.org/git/wine.git/?a=commit;h=146ff01f5465ba4d6c769ac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:26 2021 +0100 dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/Makefile.in | 5 ++--- dlls/dcomp/main.c | 44 -------------------------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 436b88993ab..c02907f3373 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -1,9 +1,8 @@ MODULE = dcomp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ - device.c \ - main.c + device.c RC_SRCS = version.rc diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c deleted file mode 100644 index b0b911a9bf5..00000000000 --- a/dlls/dcomp/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * DirectComposition Library - * - * Copyright 2020 Austin English - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dcomp); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : cryptdll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: c8a804cf54038850908d8581d382acbe829aa2a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8a804cf54038850908d8581… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:41:20 2021 +0100 cryptdll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdll/Makefile.in | 5 +---- dlls/cryptdll/cryptdll.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in index 7fd574e526f..e473c311083 100644 --- a/dlls/cryptdll/Makefile.in +++ b/dlls/cryptdll/Makefile.in @@ -2,7 +2,4 @@ MODULE = cryptdll.dll IMPORTLIB = cryptdll IMPORTS = advapi32 -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - cryptdll.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c deleted file mode 100644 index 963a2684e08..00000000000 --- a/dlls/cryptdll/cryptdll.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2005 Ulrich Czekalla (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 <stdarg.h> -#include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 9d1f13438f523a7799631c0324b5ecbaf83eeea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1f13438f523a7799631c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:17 2021 +0100 mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscorwks/Makefile.in | 5 +---- dlls/mscorwks/mscorwks_main.c | 36 ------------------------------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 42a6238a9a9..91d8823d971 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1,6 +1,3 @@ MODULE = mscorwks.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - mscorwks_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c deleted file mode 100644 index ac7708087f6..00000000000 --- a/dlls/mscorwks/mscorwks_main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * .NET workstation runtime - * - * Copyright 2019 Zebediah Figura 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 <stdarg.h> -#include <windef.h> -#include <winbase.h> - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - } - - return TRUE; -}

1 0

Alexandre Julliard : hid: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 30e7c49a7f1ce3a979bd34e7ff0911cccaff6ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e7c49a7f1ce3a979bd34e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:44:18 2021 +0100 hid: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/Makefile.in | 5 ++--- dlls/hid/hidd.c | 1 + dlls/hid/main.c | 44 -------------------------------------------- 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index c9ae5f0e567..0146ebd8102 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -1,11 +1,10 @@ MODULE = hid.dll IMPORTLIB = hid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ hidd.c \ - hidp.c \ - main.c + hidp.c RC_SRCS = version.rc diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4bb4deb48b3..684ad5b5df8 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "hidusage.h" +#include "initguid.h" #include "ddk/hidclass.h" #include "ddk/hidsdi.h" diff --git a/dlls/hid/main.c b/dlls/hid/main.c deleted file mode 100644 index 6c53f118582..00000000000 --- a/dlls/hid/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Human Input Devices - * - * Copyright (C) 2006 Kevin Koltzau - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" -#include "initguid.h" -#include "ddk/hidclass.h" - -/***********************************************************************/ - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Zebediah Figura : ntdll: Fill the object type index in System(Extended)HandleInformation.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 33a80885ce72793476eaab1f3f5f16083b3ccaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33a80885ce72793476eaab1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 22:59:17 2021 -0600 ntdll: Fill the object type index in System(Extended)HandleInformation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 6 ++++-- include/wine/server_protocol.h | 3 ++- server/handle.c | 1 + server/protocol.def | 1 + server/trace.c | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index f4a879d8748..6cf044d496f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2447,7 +2447,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].AccessMask = handle_info[i].access; shi->Handle[i].HandleFlags = handle_info[i].attributes; - /* FIXME: Fill out ObjectType, ObjectPointer */ + shi->Handle[i].ObjectType = handle_info[i].type; + /* FIXME: Fill out ObjectPointer */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) @@ -2498,7 +2499,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handles[i].HandleValue = handle_info[i].handle; shi->Handles[i].GrantedAccess = handle_info[i].access; shi->Handles[i].HandleAttributes = handle_info[i].attributes; - /* FIXME: Fill out Object, ObjectTypeIndex */ + shi->Handles[i].ObjectTypeIndex = handle_info[i].type; + /* FIXME: Fill out Object */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5e463fd5c9e..18551a2d448 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4544,6 +4544,7 @@ struct handle_info obj_handle_t handle; unsigned int access; unsigned int attributes; + unsigned int type; }; @@ -6227,7 +6228,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 683 +#define SERVER_PROTOCOL_VERSION 684 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 4291761ec6c..6e0848eedf0 100644 --- a/server/handle.c +++ b/server/handle.c @@ -833,6 +833,7 @@ static int enum_handles( struct process *process, void *user ) handle->owner = process->id; handle->handle = index_to_handle(i); handle->access = entry->access & ~RESERVED_ALL; + handle->type = entry->ptr->ops->type->index; handle->attributes = 0; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; diff --git a/server/protocol.def b/server/protocol.def index 5126a9e37e5..7f3b785df51 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3198,6 +3198,7 @@ struct handle_info obj_handle_t handle; unsigned int access; unsigned int attributes; + unsigned int type; }; /* Return a list of all opened handles */ diff --git a/server/trace.c b/server/trace.c index 9faa3d5a443..b07935cc54b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1342,8 +1342,8 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) while (size >= sizeof(*handle)) { handle = cur_data; - fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x}", - handle->owner, handle->handle, handle->access, handle->attributes ); + fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x,type=%u}", + handle->owner, handle->handle, handle->access, handle->attributes, handle->type ); size -= sizeof(*handle); remove_data( sizeof(*handle) ); if (size) fputc( ',', stderr );

1 0

Esme Povirk : mscoree: Remove individual vtable fixup traces.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 09d573cee83eea2e1a34fbd0cee7b2800613c962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09d573cee83eea2e1a34fbd0… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Feb 17 16:02:17 2021 -0600 mscoree: Remove individual vtable fixup traces. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index cf8acae09e0..51522c57d83 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1319,7 +1319,6 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) ULONG_PTR *tokens = fixup->tokens; for (i=0; i<fixup->fixup->count; i++) { - TRACE("%#lx\n", tokens[i]); vtable[i] = mono_marshal_get_vtfixup_ftnptr( image, tokens[i], fixup->fixup->type); } @@ -1363,7 +1362,6 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; fixup->done = FALSE; - TRACE("vtable_fixup->type=0x%x\n",vtable_fixup->type); #if __x86_64__ if (vtable_fixup->type & COR_VTABLE_64BIT) #else

1 0