wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Alexandre Julliard : bluetoothapis: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 724de1a6a95a6f654c7b913ddd6d75dd1c5b422a URL: https://source.winehq.org/git/wine.git/?a=commit;h=724de1a6a95a6f654c7b913d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:40:33 2021 +0100 bluetoothapis: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bluetoothapis/Makefile.in | 5 +---- dlls/bluetoothapis/main.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index d73ca872594..51b2871d81d 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,6 +1,3 @@ MODULE = bluetoothapis.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c deleted file mode 100644 index b035248b5ff..00000000000 --- a/dlls/bluetoothapis/main.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Bluetooth APIs - * - * Copyright 2015 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" - -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); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : adsldpc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: c9b909b572784cffb244a61fd1913ad325e7d8b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b909b572784cffb244a61f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:40:17 2021 +0100 adsldpc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldpc/Makefile.in | 5 +---- dlls/adsldpc/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/adsldpc/Makefile.in b/dlls/adsldpc/Makefile.in index bcee0d4962a..0ba2453a18b 100644 --- a/dlls/adsldpc/Makefile.in +++ b/dlls/adsldpc/Makefile.in @@ -1,6 +1,3 @@ MODULE = adsldpc.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/adsldpc/main.c b/dlls/adsldpc/main.c deleted file mode 100644 index f9df390e068..00000000000 --- a/dlls/adsldpc/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Active Directory Services Lightweight Directory Provider C - * - * Copyright 2017 Alex Henrie - * - * 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(adsldpc); - -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 : normaliz: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

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 : msvcrt40: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: a4ca6f19a3538c4a17b7c0653d625ed5bef660eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ca6f19a3538c4a17b7c065… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:46:36 2021 +0100 msvcrt40: Remove DLL_WINE_PREATTACH. The functions are mostly implemented now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt40/Makefile.in | 5 ----- dlls/msvcrt40/msvcrt40.c | 37 ------------------------------------- 2 files changed, 42 deletions(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 576d651c702..1d5dc02627c 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1 @@ MODULE = msvcrt40.dll - -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - msvcrt40.c diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c deleted file mode 100644 index 122166d1dbf..00000000000 --- a/dlls/msvcrt40/msvcrt40.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * msvcrt40 main file - * - * Copyright (C) 2007 Louis Lenders - * - * 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 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; -}

1 0

Alexandre Julliard : winedump: Print the "prefer native" Wine flag.
by Alexandre Julliard 18 Feb '21

18 Feb '21

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 : ntdll: Check the prefer-native flag in the PE header for default load order.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 37600028fca8fc7c78b7374dc45513930e0161e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37600028fca8fc7c78b7374d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:11:22 2021 +0100 ntdll: Check the prefer-native flag in the PE header for default load order. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++++-------- dlls/ntdll/unix/loader.c | 52 +++++++++++++++++++++++++++++------------------- dlls/ntdll/unixlib.h | 4 ++-- 3 files changed, 42 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37600028fca8fc7c78b7…

1 0

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

18 Feb '21

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

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 717dd6cee400f806f3432129ff8f048ef061e830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717dd6cee400f806f3432129… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Feb 17 21:59:33 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/po/nl.po b/po/nl.po index 27ef0b5aaba..d727b541ffa 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6043,7 +6043,7 @@ msgstr "Geen MDI-kindvenster.\n" #: dlls/kernel32/winerror.mc:2628 msgid "Popup menu already active.\n" -msgstr "Popup-menu reeds actief.\n" +msgstr "Pop-up menu reeds actief.\n" #: dlls/kernel32/winerror.mc:2633 msgid "No scrollbars.\n" @@ -8102,7 +8102,7 @@ msgstr "client" #: dlls/oleacc/oleacc.rc:42 msgid "popup menu" -msgstr "popupmenu" +msgstr "pop-up menu" #: dlls/oleacc/oleacc.rc:43 msgid "menu item" @@ -12961,7 +12961,7 @@ msgstr "&Verwijder dubbelen" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "Popup menu" +msgstr "Pop-up menu" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -13021,7 +13021,7 @@ msgstr "H&oogte :" #: programs/conhost/conhost.rc:111 msgid "End of program" -msgstr "Programma is beëindigd" +msgstr "Einde programma" #: programs/conhost/conhost.rc:112 msgid "&Close console" @@ -13029,7 +13029,7 @@ msgstr "&Console afsluiten" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Versie" +msgstr "Modus" #: programs/conhost/conhost.rc:120 msgid "Console parameters" @@ -16108,7 +16108,8 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"De Wine configuratie in %s wordt bijgewerkt, even geduld alstublieft..." +"De Wine configuratie in %s wordt bijgewerkt.\n" +"Even geduld alstublieft..." #: programs/winecfg/winecfg.rc:140 msgid "" @@ -16205,7 +16206,7 @@ msgid "" msgstr "" "Elke DLL (Dynamic Link Library) kan apart worden ingesteld op " "'ingebouwd' (de versie van Wine) of 'windows' (afkomstig van Windows of " -"meegeleverd met een programma." +"meegeleverd met een programma)." #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:"

1 0

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

18 Feb '21

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

Zebediah Figura : ntdll: Fill the handle attributes in System(Extended)HandleInformation.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 1f1d4da5f66e00cd01a71b062ee2d1111609e971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1d4da5f66e00cd01a71b06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 22:59:16 2021 -0600 ntdll: Fill the handle attributes 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/tests/info.c | 24 +++++++++++++++++++----- dlls/ntdll/unix/system.c | 12 +++++++----- include/wine/server_protocol.h | 3 ++- server/handle.c | 9 ++++++--- server/protocol.def | 1 + server/trace.c | 4 ++-- 6 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 419d8582dd3..85c523881ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -542,11 +542,14 @@ static void test_query_handle(void) ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); HANDLE EventHandle; - BOOL found; + BOOL found, ret; INT i; EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() ); + ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "got error %u\n", GetLastError()); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ ReturnLength = 0xdeadbeef; @@ -581,11 +584,22 @@ static void test_query_handle(void) goto done; } - for (i = 0, found = FALSE; i < shi->Count && !found; i++) - found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && - ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + found = FALSE; + for (i = 0; i < shi->Count; i++) + { + if (shi->Handle[i].OwnerPid == GetCurrentProcessId() && + (HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle) + { + ok(shi->Handle[i].HandleFlags == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + "got attributes %#x\n", shi->Handle[i].HandleFlags); + found = TRUE; + break; + } + } ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() ); + ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(ret, "got error %u\n", GetLastError()); CloseHandle(EventHandle); ReturnLength = 0xdeadbeef; @@ -645,7 +659,7 @@ static void test_query_handle_ex(void) if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() && (HANDLE)info->Handles[i].HandleValue == event) { - todo_wine ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), "got flags %#x\n", info->Handles[i].HandleAttributes); ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); found = TRUE; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index e2482f91041..f4a879d8748 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,7 +2446,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, shi->Handle[i].OwnerPid = handle_info[i].owner; shi->Handle[i].HandleValue = handle_info[i].handle; shi->Handle[i].AccessMask = handle_info[i].access; - /* FIXME: Fill out ObjectType, HandleFlags, ObjectPointer */ + shi->Handle[i].HandleFlags = handle_info[i].attributes; + /* FIXME: Fill out ObjectType, ObjectPointer */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) @@ -2493,10 +2494,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, for (i = 0; i < shi->NumberOfHandles; i++) { memset( &shi->Handles[i], 0, sizeof(shi->Handles[i]) ); - shi->Handles[i].UniqueProcessId = handle_info[i].owner; - shi->Handles[i].HandleValue = handle_info[i].handle; - shi->Handles[i].GrantedAccess = handle_info[i].access; - /* FIXME: Fill out Object, HandleAttributes, ObjectTypeIndex */ + shi->Handles[i].UniqueProcessId = handle_info[i].owner; + 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 */ } } else if (ret == STATUS_BUFFER_TOO_SMALL) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 277b1a1c33a..5e463fd5c9e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4543,6 +4543,7 @@ struct handle_info process_id_t owner; obj_handle_t handle; unsigned int access; + unsigned int attributes; }; @@ -6226,7 +6227,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 682 +#define SERVER_PROTOCOL_VERSION 683 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index ef0f595bf08..4291761ec6c 100644 --- a/server/handle.c +++ b/server/handle.c @@ -830,9 +830,12 @@ static int enum_handles( struct process *process, void *user ) } assert( info->count ); handle = info->handle++; - handle->owner = process->id; - handle->handle = index_to_handle(i); - handle->access = entry->access & ~RESERVED_ALL; + handle->owner = process->id; + handle->handle = index_to_handle(i); + handle->access = entry->access & ~RESERVED_ALL; + handle->attributes = 0; + if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; + if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; info->count--; } diff --git a/server/protocol.def b/server/protocol.def index fa19bb41bb4..5126a9e37e5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3197,6 +3197,7 @@ struct handle_info process_id_t owner; obj_handle_t handle; unsigned int access; + unsigned int attributes; }; /* Return a list of all opened handles */ diff --git a/server/trace.c b/server/trace.c index 2737cb16499..9faa3d5a443 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}", - handle->owner, handle->handle, handle->access ); + fprintf( stderr, "{owner=%04x,handle=%04x,access=%08x,attributes=%08x}", + handle->owner, handle->handle, handle->access, handle->attributes ); size -= sizeof(*handle); remove_data( sizeof(*handle) ); if (size) fputc( ',', stderr );

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021