wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Rémi Bernon : include: Add missing items_size parameter to GetMany.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 03e3bf5324f2a7c12f9fdccfb344e367d512a8a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e3bf5324f2a7c12f9fdccf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 11:23:16 2021 +0100 include: Add missing items_size parameter to GetMany. For IVectorView and IIterator interfaces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 12 ++++++++---- dlls/windows.gaming.input/tests/input.c | 8 ++++++++ dlls/windows.media.speech/main.c | 3 ++- dlls/windows.media.speech/tests/speech.c | 5 +++++ include/windows.foundation.collections.idl | 4 ++-- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c71374e34a3..e97322212e4 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -142,10 +142,12 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany( - IVectorView_Gamepad *iface, ULONG start_index, IGamepad **items, UINT *value) + IVectorView_Gamepad *iface, ULONG start_index, + ULONG items_size, IGamepad **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); - return E_NOTIMPL; + *value = 0; + return E_BOUNDS; } static const struct IVectorView_GamepadVtbl vector_view_gamepad_vtbl = @@ -266,10 +268,12 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetMany( - IVectorView_RawGameController *iface, ULONG start_index, IRawGameController **items, UINT *value) + IVectorView_RawGameController *iface, ULONG start_index, + ULONG items_size, IRawGameController **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); - return E_NOTIMPL; + *value = 0; + return E_BOUNDS; } static const struct IVectorView_RawGameControllerVtbl vector_view_raw_game_controller_vtbl = diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index 62822b30c28..6ed40186df9 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -175,6 +175,10 @@ static void test_Gamepad(void) ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetAt failed, hr %#x\n", hr); ok(gamepad == NULL, "IVectorView_Gamepad_GetAt returned %p\n", gamepad); + hr = IVectorView_Gamepad_GetMany(gamepads, size, 1, &gamepad, &size); + ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetMany failed, hr %#x\n", hr); + ok(size == 0, "IVectorView_Gamepad_GetMany returned count %u\n", size); + size = 0xdeadbeef; found = TRUE; gamepad = (IGamepad *)0xdeadbeef; @@ -343,6 +347,10 @@ static void test_RawGameController(void) ok(hr == S_OK, "IVectorView_RawGameController_get_Size failed, hr %#x\n", hr); ok(size != 0xdeadbeef, "IVectorView_RawGameController_get_Size returned %u\n", size); + hr = IVectorView_RawGameController_GetMany(controllers, size, 1, &controller, &size); + ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetMany failed, hr %#x\n", hr); + ok(size == 0, "IVectorView_RawGameController_GetMany returned count %u\n", size); + controller = (IRawGameController *)0xdeadbeef; hr = IVectorView_RawGameController_GetAt(controllers, size, &controller); ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetAt failed, hr %#x\n", hr); diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index 92215fe717d..1a9ba51b071 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -139,7 +139,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany( - IVectorView_VoiceInformation *iface, ULONG start_index, IVoiceInformation **items, UINT *value) + IVectorView_VoiceInformation *iface, ULONG start_index, + ULONG items_size, IVoiceInformation **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); *value = 0; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 33ce75c0c0e..30244e59612 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -48,6 +48,7 @@ static void test_SpeechSynthesizer(void) IVectorView_VoiceInformation *voices = NULL; IInstalledVoicesStatic *voices_static = NULL; IActivationFactory *factory = NULL; + IVoiceInformation *voice; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; HSTRING str; @@ -98,6 +99,10 @@ static void test_SpeechSynthesizer(void) ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); + hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); + ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); + ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size); + IVectorView_VoiceInformation_Release(voices); IInstalledVoicesStatic_Release(voices_static); diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 50a678e410c..250f8b9acbe 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -83,7 +83,7 @@ cpp_quote("#endif") [propget] HRESULT Current([out, retval] T *value); [propget] HRESULT HasCurrent([out, retval] BOOL *value); HRESULT MoveNext([out, retval] BOOL *value); - HRESULT GetMany([in] UINT32 count, [out] T *items, [out, retval] UINT32 *value); + HRESULT GetMany([in] UINT32 count, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } [ @@ -104,7 +104,7 @@ cpp_quote("#endif") HRESULT GetAt([in] ULONG index, [out, retval] T *value); [propget] HRESULT Size([out, retval] ULONG *value); HRESULT IndexOf([in, optional] T element, [out] ULONG *index, [out, retval] BOOLEAN *value); - HRESULT GetMany([in] ULONG start_index, [out] T *items, [out, retval] ULONG *value); + HRESULT GetMany([in] ULONG start_index, [in] ULONG items_size, [out] T *items, [out, retval] ULONG *value); } } #endif

1 0

Rémi Bernon : include: Add GlobalizationPreferences runtimeclass in windows.system.userprofile.idl.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 9bc674f57bd51102d7cab033f0b35938247a3626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc674f57bd51102d7cab033… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 11:23:15 2021 +0100 include: Add GlobalizationPreferences runtimeclass in windows.system.userprofile.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.idl | 1 + include/windows.system.userprofile.idl | 70 ++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 46164b8268f..9133e5c6315 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -757,6 +757,7 @@ SOURCES = \ windows.h \ windows.media.speechsynthesis.idl \ windows.system.idl \ + windows.system.userprofile.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index c4dc454974f..fe09dc66edd 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -127,6 +127,7 @@ namespace Windows { declare { interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.Collections.IVectorView<HSTRING>; } } } diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl new file mode 100644 index 00000000000..4a066c9ae8b --- /dev/null +++ b/include/windows.system.userprofile.idl @@ -0,0 +1,70 @@ +/* + * Copyright 2021 Rémi Bernon 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.globalization.idl"; + +namespace Windows { + namespace System { + namespace UserProfile { + interface IGlobalizationPreferencesStatics; + interface IGlobalizationPreferencesStatics2; + interface IGlobalizationPreferencesStatics3; + runtimeclass GlobalizationPreferences; + } + } +} + +namespace Windows { + namespace System { + namespace UserProfile { + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.UserProfile.GlobalizationPreferences), + uuid(01bf4326-ed37-4e96-b0e9-c1340d1ea158) + ] + interface IGlobalizationPreferencesStatics : IInspectable + { + [propget] HRESULT Calendars([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); + [propget] HRESULT Clocks([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); + [propget] HRESULT Currencies([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); + [propget] HRESULT Languages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); + [propget] HRESULT HomeGeographicRegion([out, retval] HSTRING* value); + [propget] HRESULT WeekStartsOn([out, retval] Windows.Globalization.DayOfWeek* value); + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics, Windows.Foundation.UniversalApiContract, 1.0)] + [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics2, Windows.Foundation.UniversalApiContract, 5.0)] + [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics3, Windows.Foundation.UniversalApiContract, 6.0)] + runtimeclass GlobalizationPreferences + { + } + } + } +}

1 0

Rémi Bernon : include: Add DayOfWeek enum in windows.globalization.idl.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 81392e241c6a05cdfa893e1d4e328c0e128b272e URL: https://source.winehq.org/git/wine.git/?a=commit;h=81392e241c6a05cdfa893e1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 11:23:14 2021 +0100 include: Add DayOfWeek enum in windows.globalization.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.globalization.idl | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b71de990aa2..46164b8268f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -753,6 +753,7 @@ SOURCES = \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ + windows.globalization.idl \ windows.h \ windows.media.speechsynthesis.idl \ windows.system.idl \ diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl new file mode 100644 index 00000000000..c08f7bd27d9 --- /dev/null +++ b/include/windows.globalization.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2021 Rémi Bernon 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Globalization { + typedef enum DayOfWeek DayOfWeek; + } +} + +namespace Windows { + namespace Globalization { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum DayOfWeek + { + Sunday = 0, + Monday = 1, + Tuesday = 2, + Wednesday = 3, + Thursday = 4, + Friday = 5, + Saturday = 6 + }; + } +}

1 0

Alexandre Julliard : ntdll: Set the additional environment variables from the Unix side.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: ec5925a8a259ebc7691716197c77da06c70946bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5925a8a259ebc769171619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 15:50:32 2021 +0100 ntdll: Set the additional environment variables from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 51 --------------------------------- dlls/ntdll/unix/env.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 75ea2ebbb45..46e60e36721 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -108,55 +108,6 @@ static WCHAR *get_registry_value( WCHAR *env, HKEY hkey, const WCHAR *name ) } -/*********************************************************************** - * set_additional_environment - * - * Set some additional environment variables not specified in the registry. - */ -static void set_additional_environment( WCHAR **env ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - WCHAR *val; - HANDLE hkey; - - /* set the user profile variables */ - - InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\" - "CurrentVersion\\ProfileList" ); - if (!NtOpenKey( &hkey, KEY_READ, &attr )) - { - if ((val = get_registry_value( *env, hkey, L"ProgramData" ))) - { - set_env_var( env, L"ALLUSERSPROFILE", val ); - set_env_var( env, L"ProgramData", val ); - RtlFreeHeap( GetProcessHeap(), 0, val ); - } - if ((val = get_registry_value( *env, hkey, L"Public" ))) - { - set_env_var( env, L"PUBLIC", val ); - RtlFreeHeap( GetProcessHeap(), 0, val ); - } - NtClose( hkey ); - } - - /* set the computer name */ - - RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\" - "ComputerName\\ActiveComputerName" ); - if (!NtOpenKey( &hkey, KEY_READ, &attr )) - { - if ((val = get_registry_value( *env, hkey, L"ComputerName" ))) - { - set_env_var( env, L"COMPUTERNAME", val ); - RtlFreeHeap( GetProcessHeap(), 0, val ); - } - NtClose( hkey ); - } -} - - /*********************************************************************** * set_wow64_environment * @@ -844,8 +795,6 @@ void init_user_process_params(void) if (!params->DllPath.MaximumLength) /* not inherited from parent process */ { - set_additional_environment( &params->Environment ); - get_image_path( params->ImagePathName.Buffer, image, sizeof(image) ); RtlInitUnicodeString( &params->ImagePathName, image ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index b0cb893997e..cc708f678a3 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1350,6 +1350,36 @@ static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HAND } +/*********************************************************************** + * get_registry_value + */ +static WCHAR *get_registry_value( WCHAR *env, SIZE_T pos, HKEY key, const WCHAR *name ) +{ + WCHAR buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[1024 * sizeof(WCHAR)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + DWORD len, size = sizeof(buffer) - sizeof(WCHAR); + WCHAR *ret = NULL; + UNICODE_STRING nameW; + + init_unicode_string( &nameW, name ); + if (NtQueryValueKey( key, &nameW, KeyValuePartialInformation, buffer, size, &size )) return NULL; + if (size <= offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )) return NULL; + len = size - offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + if (info->Type == REG_EXPAND_SZ) + { + ret = expand_value( env, pos, (WCHAR *)info->Data, len / sizeof(WCHAR) ); + } + else + { + ret = malloc( len + sizeof(WCHAR) ); + memcpy( ret, info->Data, len ); + ret[len / sizeof(WCHAR)] = 0; + } + return ret; +} + + /*********************************************************************** * add_registry_environment * @@ -1364,8 +1394,27 @@ static void add_registry_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) '\\','C','o','n','t','r','o','l', '\\','S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r', '\\','E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR profileW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','o','f','i','l','e','L','i','s','t',0}; + static const WCHAR computerW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','C','o','m','p','u','t','e','r','N','a','m','e', + '\\','A','c','t','i','v','e','C','o','m','p','u','t','e','r','N','a','m','e',0}; + static const WCHAR progdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; + WCHAR *value; HANDLE key; InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); @@ -1385,6 +1434,36 @@ static void add_registry_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_registry_variables( env, pos, size, key ); NtClose( key ); } + + /* set the user profile variables */ + init_unicode_string( &nameW, profileW ); + if (!NtOpenKey( &key, KEY_READ, &attr )) + { + if ((value = get_registry_value( *env, *pos, key, progdataW ))) + { + set_env_var( env, pos, size, allusersW, wcslen(allusersW), value ); + set_env_var( env, pos, size, progdataW, wcslen(progdataW), value ); + free( value ); + } + if ((value = get_registry_value( *env, *pos, key, publicW ))) + { + set_env_var( env, pos, size, publicW, wcslen(publicW), value ); + free( value ); + } + NtClose( key ); + } + + /* set the computer name */ + init_unicode_string( &nameW, computerW ); + if (!NtOpenKey( &key, KEY_READ, &attr )) + { + if ((value = get_registry_value( *env, *pos, key, computernameW ))) + { + set_env_var( env, pos, size, computernameW, wcslen(computernameW), value ); + free( value ); + } + NtClose( key ); + } }

1 0

Alexandre Julliard : ntdll: Return an NT path for the initial current directory.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 5246f34a3ea08b4153c0b2f9ee83512bf9dee2c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5246f34a3ea08b4153c0b2f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 12:59:50 2021 +0100 ntdll: Return an NT path for the initial current directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e1fb4c99544..b0cb893997e 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1437,14 +1437,14 @@ static void get_initial_console( RTL_USER_PROCESS_PARAMETERS *params ) * * Get the current directory at startup. */ -static void get_initial_directory( UNICODE_STRING *dir ) +static WCHAR *get_initial_directory(void) { + static const WCHAR backslashW[] = {'\\',0}; + static const WCHAR windows_dir[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\',0}; const char *pwd; char *cwd; int size; - - dir->MaximumLength = MAX_PATH * sizeof(WCHAR); - dir->Length = 0; + WCHAR *ret = NULL; /* try to get it from the Unix cwd */ @@ -1472,45 +1472,30 @@ static void get_initial_directory( UNICODE_STRING *dir ) if (pwd) { - WCHAR *nt_name; - - if (!unix_to_nt_file_name( pwd, &nt_name )) + if (!unix_to_nt_file_name( pwd, &ret )) { - /* skip the \??\ prefix */ - ULONG len = wcslen( nt_name ); - if (len > 6 && nt_name[5] == ':') - { - dir->Length = (len - 4) * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name + 4, dir->Length ); - } - else /* change \??\ to \\?\ */ + ULONG len = wcslen( ret ); + if (len && ret[len - 1] != '\\') { - dir->Length = len * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name, dir->Length ); - dir->Buffer[1] = '\\'; + /* add trailing backslash */ + WCHAR *tmp = malloc( (len + 2) * sizeof(WCHAR) ); + wcscpy( tmp, ret ); + wcscat( tmp, backslashW ); + free( ret ); + ret = tmp; } - free( nt_name ); + free( cwd ); + return ret; } } - if (!dir->Length) /* still not initialized */ - { - static const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s'}; - - MESSAGE("Warning: could not find DOS drive for current working directory '%s', " - "starting in the Windows directory.\n", cwd ? cwd : "" ); - memcpy( dir->Buffer, windows_dir, sizeof(windows_dir) ); - dir->Length = sizeof(windows_dir); - } - - /* add trailing backslash */ - if (dir->Buffer[dir->Length / sizeof(WCHAR) - 1] != '\\') - { - dir->Buffer[dir->Length / sizeof(WCHAR)] = '\\'; - dir->Length += sizeof(WCHAR); - } - dir->Buffer[dir->Length / sizeof(WCHAR)] = 0; + /* still not initialized */ + MESSAGE("Warning: could not find DOS drive for current working directory '%s', " + "starting in the Windows directory.\n", cwd ? cwd : "" ); + ret = malloc( sizeof(windows_dir) ); + wcscpy( ret, windows_dir ); free( cwd ); + return ret; } @@ -1700,6 +1685,12 @@ static inline void put_unicode_string( WCHAR *src, WCHAR **dst, UNICODE_STRING * copy_unicode_string( &src, dst, str, wcslen(src) * sizeof(WCHAR) ); } +static inline WCHAR *get_dos_path( WCHAR *nt_path ) +{ + if (nt_path[4] && nt_path[5] == ':') return nt_path + 4; /* skip the \??\ prefix */ + nt_path[1] = '\\'; /* change \??\ to \\?\ */ + return nt_path; +} /************************************************************************* * build_initial_params @@ -1714,6 +1705,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) WCHAR *dst, *p, *path = NULL; WCHAR *cmdline = build_command_line( main_wargv + 1 ); WCHAR *env = get_initial_environment( &env_pos, &env_size ); + WCHAR *curdir = get_initial_directory(); NTSTATUS status; /* store the initial PATH value */ @@ -1749,12 +1741,15 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) params->wShowWindow = 1; /* SW_SHOWNORMAL */ params->CurrentDirectory.DosPath.Buffer = (WCHAR *)(params + 1); - get_initial_directory( &params->CurrentDirectory.DosPath ); + wcscpy( params->CurrentDirectory.DosPath.Buffer, get_dos_path( curdir )); + params->CurrentDirectory.DosPath.Length = wcslen(params->CurrentDirectory.DosPath.Buffer) * sizeof(WCHAR); + params->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); dst = params->CurrentDirectory.DosPath.Buffer + MAX_PATH; put_unicode_string( main_wargv[0], &dst, &params->ImagePathName ); put_unicode_string( cmdline, &dst, &params->CommandLine ); free( cmdline ); + free( curdir ); params->Environment = dst; params->EnvironmentSize = env_pos * sizeof(WCHAR);

1 0

Zebediah Figura : server: Do not forbid closing fd handles in other processes.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 101082253f1e9645fbe96e2f4ffd4ff27c30963d URL: https://source.winehq.org/git/wine.git/?a=commit;h=101082253f1e9645fbe96e2f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 22 23:04:30 2021 -0500 server: Do not forbid closing fd handles in other processes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 1 - server/console.c | 2 +- server/fd.c | 6 ------ server/file.c | 2 +- server/file.h | 1 - server/mailslot.c | 6 +++--- server/mapping.c | 2 +- server/named_pipe.c | 6 +++--- server/serial.c | 2 +- server/sock.c | 2 +- 10 files changed, 11 insertions(+), 19 deletions(-) diff --git a/server/change.c b/server/change.c index ff8c3ad1037..b02a9cd65bf 100644 --- a/server/change.c +++ b/server/change.c @@ -421,7 +421,6 @@ static int dir_close_handle( struct object *obj, struct process *process, obj_ha { struct dir *dir = (struct dir *)obj; - if (!fd_close_handle( obj, process, handle )) return 0; if (obj->handle_count == 1) release_dir_cache_entry( dir ); /* closing last handle, release cache */ return 1; /* ok to close */ } diff --git a/server/console.c b/server/console.c index 848ee6e8d98..1e6f6c0f8a3 100644 --- a/server/console.c +++ b/server/console.c @@ -168,7 +168,7 @@ static const struct object_ops console_server_ops = NULL, /* unlink_name */ console_server_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ console_server_destroy /* destroy */ }; diff --git a/server/fd.c b/server/fd.c index 65a6f876e5c..481e9a88f0f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2118,12 +2118,6 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* handler for close_handle that refuses to close fd-associated handles in other processes */ -int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) -{ - return (!current || current->process == process); -} - /* check if events are pending and if yes return which one(s) */ int check_fd_events( struct fd *fd, int events ) { diff --git a/server/file.c b/server/file.c index f9ce0106c3b..9a072e6c64e 100644 --- a/server/file.c +++ b/server/file.c @@ -109,7 +109,7 @@ static const struct object_ops file_ops = NULL, /* unlink_name */ file_open_file, /* open_file */ file_get_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ file_destroy /* destroy */ }; diff --git a/server/file.h b/server/file.h index fbfd1e4eec9..0fa66e5750a 100644 --- a/server/file.h +++ b/server/file.h @@ -93,7 +93,6 @@ extern int is_fd_overlapped( struct fd *fd ); extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); extern int is_fd_removable( struct fd *fd ); -extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); extern int check_fd_events( struct fd *fd, int events ); extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait ); diff --git a/server/mailslot.c b/server/mailslot.c index 5597a21dd29..d4b2fd1b562 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -90,7 +90,7 @@ static const struct object_ops mailslot_ops = default_unlink_name, /* unlink_name */ mailslot_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ mailslot_destroy /* destroy */ }; @@ -148,7 +148,7 @@ static const struct object_ops mail_writer_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ mail_writer_destroy /* destroy */ }; @@ -240,7 +240,7 @@ static const struct object_ops mailslot_device_file_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ mailslot_device_file_destroy /* destroy */ }; diff --git a/server/mapping.c b/server/mapping.c index 13a0948a8ab..0dcaa13e91d 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -189,7 +189,7 @@ static const struct object_ops mapping_ops = default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ mapping_destroy /* destroy */ }; diff --git a/server/named_pipe.c b/server/named_pipe.c index a3ce9d463f1..df8c7e3170c 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -179,7 +179,7 @@ static const struct object_ops pipe_server_ops = NULL, /* unlink_name */ pipe_server_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ pipe_server_destroy /* destroy */ }; @@ -222,7 +222,7 @@ static const struct object_ops pipe_client_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ pipe_end_destroy /* destroy */ }; @@ -299,7 +299,7 @@ static const struct object_ops named_pipe_device_file_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ named_pipe_device_file_destroy /* destroy */ }; diff --git a/server/serial.c b/server/serial.c index ba8402c5935..d3ea4cbe420 100644 --- a/server/serial.c +++ b/server/serial.c @@ -104,7 +104,7 @@ static const struct object_ops serial_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - fd_close_handle, /* close_handle */ + no_close_handle, /* close_handle */ serial_destroy /* destroy */ }; diff --git a/server/sock.c b/server/sock.c index 775ec6edf32..00d5b0b9044 100644 --- a/server/sock.c +++ b/server/sock.c @@ -889,7 +889,7 @@ static int sock_close_handle( struct object *obj, struct process *process, obj_h async_terminate( req->async, STATUS_CANCELLED ); } - return fd_close_handle( obj, process, handle ); + return 1; } static void sock_destroy( struct object *obj )

1 0

Zebediah Figura : ntdll: Hold fd_cache_section while removing and closing handles.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: d144890c88c69c937b5e3ffa9b85d0d9d475c44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d144890c88c69c937b5e3ffa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 22 23:04:29 2021 -0500 ntdll: Hold fd_cache_section while removing and closing handles. Otherwise, it's possible for the old handle to be re-added to the cache between removing and closing it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 506cc99e542..7d1231bf925 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1692,8 +1692,9 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest, ACCESS_MASK access, ULONG attributes, ULONG options ) { + sigset_t sigset; NTSTATUS ret; - int fd; + int fd = -1; if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess()) { @@ -1716,13 +1717,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE return result.dup_handle.status; } + server_enter_uninterrupted_section( &fd_cache_mutex, &sigset ); + /* always remove the cached fd; if the server request fails we'll just * retrieve it again */ if (options & DUPLICATE_CLOSE_SOURCE) - { fd = remove_fd_from_cache( source ); - if (fd != -1) close( fd ); - } SERVER_START_REQ( dup_handle ) { @@ -1738,6 +1738,10 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE } } SERVER_END_REQ; + + server_leave_uninterrupted_section( &fd_cache_mutex, &sigset ); + + if (fd != -1) close( fd ); return ret; } @@ -1747,12 +1751,16 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE */ NTSTATUS WINAPI NtClose( HANDLE handle ) { + sigset_t sigset; HANDLE port; NTSTATUS ret; + int fd; + + server_enter_uninterrupted_section( &fd_cache_mutex, &sigset ); /* always remove the cached fd; if the server request fails we'll just * retrieve it again */ - int fd = remove_fd_from_cache( handle ); + fd = remove_fd_from_cache( handle ); SERVER_START_REQ( close_handle ) { @@ -1760,6 +1768,9 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) ret = wine_server_call( req ); } SERVER_END_REQ; + + server_leave_uninterrupted_section( &fd_cache_mutex, &sigset ); + if (fd != -1) close( fd ); if (ret != STATUS_INVALID_HANDLE || !handle) return ret;

1 0

Zebediah Figura : ntdll: Remove the source fd from the cache before calling the dup_handle request.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 64cfcc1c62c2e1ca25ade05973675c64bbc3356e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64cfcc1c62c2e1ca25ade059… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 22 23:04:28 2021 -0500 ntdll: Remove the source fd from the cache before calling the dup_handle request. If another thread creates and accesses a file between the dup_handle request and the call to remove_fd_from_cache(), the file may be allocated to the same handle number, and that thread will then receive the wrong unix fd. Avoid this race by invalidating the cache first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1f8cf546977..506cc99e542 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1693,6 +1693,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE ACCESS_MASK access, ULONG attributes, ULONG options ) { NTSTATUS ret; + int fd; if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess()) { @@ -1715,6 +1716,14 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE return result.dup_handle.status; } + /* always remove the cached fd; if the server request fails we'll just + * retrieve it again */ + if (options & DUPLICATE_CLOSE_SOURCE) + { + fd = remove_fd_from_cache( source ); + if (fd != -1) close( fd ); + } + SERVER_START_REQ( dup_handle ) { req->src_process = wine_server_obj_handle( source_process ); @@ -1726,11 +1735,6 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE if (!(ret = wine_server_call( req ))) { if (dest) *dest = wine_server_ptr_handle( reply->handle ); - if (reply->closed && reply->self) - { - int fd = remove_fd_from_cache( source ); - if (fd != -1) close( fd ); - } } } SERVER_END_REQ; @@ -1745,6 +1749,9 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) { HANDLE port; NTSTATUS ret; + + /* always remove the cached fd; if the server request fails we'll just + * retrieve it again */ int fd = remove_fd_from_cache( handle ); SERVER_START_REQ( close_handle )

1 0

Zebediah Figura : ntdll: Use a kernel APC to call NtDuplicateObject() if DUPLICATE_CLOSE_SOURCE is used on another process.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 5df0f5f6fb90e1326b71cd1094a7b710b94916d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df0f5f6fb90e1326b71cd10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 22 23:04:27 2021 -0500 ntdll: Use a kernel APC to call NtDuplicateObject() if DUPLICATE_CLOSE_SOURCE is used on another process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 36 ++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 22 ++++++++++++++++++---- server/handle.c | 3 +-- server/protocol.def | 18 ++++++++++++++++-- server/request.h | 4 +--- server/thread.c | 15 +++++++++++++++ server/trace.c | 11 +++++++++-- 7 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4f149c0f644..1f8cf546977 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -580,6 +580,21 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) else result->create_thread.status = STATUS_INVALID_PARAMETER; break; } + case APC_DUP_HANDLE: + { + HANDLE dst_handle = NULL; + + result->type = call->type; + + result->dup_handle.status = NtDuplicateObject( NtCurrentProcess(), + wine_server_ptr_handle(call->dup_handle.src_handle), + wine_server_ptr_handle(call->dup_handle.dst_process), + &dst_handle, call->dup_handle.access, + call->dup_handle.attributes, call->dup_handle.options ); + result->dup_handle.handle = wine_server_obj_handle( dst_handle ); + NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); + break; + } case APC_BREAK_PROCESS: { HANDLE handle; @@ -1679,6 +1694,27 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE { NTSTATUS ret; + if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess()) + { + apc_call_t call; + apc_result_t result; + + memset( &call, 0, sizeof(call) ); + + call.dup_handle.type = APC_DUP_HANDLE; + call.dup_handle.src_handle = wine_server_obj_handle( source ); + call.dup_handle.dst_process = wine_server_obj_handle( dest_process ); + call.dup_handle.access = access; + call.dup_handle.attributes = attributes; + call.dup_handle.options = options; + ret = server_queue_process_apc( source_process, &call, &result ); + if (ret != STATUS_SUCCESS) return ret; + + if (!result.dup_handle.status) + *dest = wine_server_ptr_handle( result.dup_handle.handle ); + return result.dup_handle.status; + } + SERVER_START_REQ( dup_handle ) { req->src_process = wine_server_obj_handle( source_process ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 238d0d6045d..e948799b05d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -467,6 +467,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, + APC_DUP_HANDLE, APC_BREAK_PROCESS }; @@ -577,6 +578,15 @@ typedef union mem_size_t reserve; mem_size_t commit; } create_thread; + struct + { + enum apc_type type; + obj_handle_t src_handle; + obj_handle_t dst_process; + unsigned int access; + unsigned int attributes; + unsigned int options; + } dup_handle; } apc_call_t; typedef union @@ -665,6 +675,12 @@ typedef union obj_handle_t handle; } create_thread; struct + { + enum apc_type type; + unsigned int status; + obj_handle_t handle; + } dup_handle; + struct { enum apc_type type; unsigned int status; @@ -1253,9 +1269,7 @@ struct dup_handle_reply { struct reply_header __header; obj_handle_t handle; - int self; - int closed; - char __pad_20[4]; + char __pad_12[4]; }; @@ -6229,7 +6243,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 686 +#define SERVER_PROTOCOL_VERSION 687 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 6e0848eedf0..d86f0960ccf 100644 --- a/server/handle.c +++ b/server/handle.c @@ -678,8 +678,7 @@ DECL_HANDLER(dup_handle) } /* close the handle no matter what happened */ if ((req->options & DUPLICATE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) - reply->closed = !close_handle( src, req->src_handle ); - reply->self = (src == current->process); + close_handle( src, req->src_handle ); release_object( src ); } } diff --git a/server/protocol.def b/server/protocol.def index 2bfdcca6de1..c2792e9551c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -483,6 +483,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, + APC_DUP_HANDLE, APC_BREAK_PROCESS }; @@ -593,6 +594,15 @@ typedef union mem_size_t reserve; /* reserve size for thread stack */ mem_size_t commit; /* commit size for thread stack */ } create_thread; + struct + { + enum apc_type type; /* APC_DUP_HANDLE */ + obj_handle_t src_handle; /* src handle to duplicate */ + obj_handle_t dst_process; /* dst process handle */ + unsigned int access; /* wanted access rights */ + unsigned int attributes; /* object attributes */ + unsigned int options; /* duplicate options */ + } dup_handle; } apc_call_t; typedef union @@ -681,6 +691,12 @@ typedef union obj_handle_t handle; /* handle to new thread */ } create_thread; struct + { + enum apc_type type; /* APC_DUP_HANDLE */ + unsigned int status; /* status returned by call */ + obj_handle_t handle; /* duplicated handle in dst process */ + } dup_handle; + struct { enum apc_type type; /* APC_BREAK_PROCESS */ unsigned int status; /* status returned by call */ @@ -1117,8 +1133,6 @@ typedef struct unsigned int options; /* duplicate options */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ - int self; /* is the source the current process? */ - int closed; /* whether the source handle has been closed */ @END diff --git a/server/request.h b/server/request.h index 9303496b7fb..a4d003e5c6a 100644 --- a/server/request.h +++ b/server/request.h @@ -879,9 +879,7 @@ C_ASSERT( FIELD_OFFSET(struct dup_handle_request, attributes) == 28 ); C_ASSERT( FIELD_OFFSET(struct dup_handle_request, options) == 32 ); C_ASSERT( sizeof(struct dup_handle_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, handle) == 8 ); -C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, self) == 12 ); -C_ASSERT( FIELD_OFFSET(struct dup_handle_reply, closed) == 16 ); -C_ASSERT( sizeof(struct dup_handle_reply) == 24 ); +C_ASSERT( sizeof(struct dup_handle_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct make_temporary_request, handle) == 12 ); C_ASSERT( sizeof(struct make_temporary_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, pid) == 12 ); diff --git a/server/thread.c b/server/thread.c index e4abe4fab94..fe9f9bdec37 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1756,6 +1756,21 @@ DECL_HANDLER(queue_apc) case APC_BREAK_PROCESS: process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD ); break; + case APC_DUP_HANDLE: + process = get_process_from_handle( req->handle, PROCESS_DUP_HANDLE ); + if (process && process != current->process) + { + /* duplicate the destination process handle into the target process */ + obj_handle_t handle = duplicate_handle( current->process, apc->call.dup_handle.dst_process, + process, 0, 0, DUPLICATE_SAME_ACCESS ); + if (handle) apc->call.dup_handle.dst_process = handle; + else + { + release_object( process ); + process = NULL; + } + } + break; default: set_error( STATUS_INVALID_PARAMETER ); break; diff --git a/server/trace.c b/server/trace.c index 5f906a5abfa..c0d2e3dfab7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -235,6 +235,11 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",commit=", &call->create_thread.commit ); fprintf( stderr, ",flags=%x", call->create_thread.flags ); break; + case APC_DUP_HANDLE: + fprintf( stderr, "APC_DUP_HANDLE,src_handle=%04x,dst_process=%04x,access=%x,attributes=%x,options=%x", + call->dup_handle.src_handle, call->dup_handle.dst_process, call->dup_handle.access, + call->dup_handle.attributes, call->dup_handle.options ); + break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS" ); break; @@ -318,6 +323,10 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) get_status_name( result->create_thread.status ), result->create_thread.pid, result->create_thread.tid, result->create_thread.handle ); break; + case APC_DUP_HANDLE: + fprintf( stderr, "APC_DUP_HANDLE,status=%s,handle=%04x", + get_status_name( result->dup_handle.status ), result->dup_handle.handle ); + break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) ); break; @@ -1676,8 +1685,6 @@ static void dump_dup_handle_request( const struct dup_handle_request *req ) static void dump_dup_handle_reply( const struct dup_handle_reply *req ) { fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", self=%d", req->self ); - fprintf( stderr, ", closed=%d", req->closed ); } static void dump_make_temporary_request( const struct make_temporary_request *req )

1 0

Zebediah Figura : server: Cancel asyncs before closing handles when a process is destroyed.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: e69d5b9f46c1c1ff37f8376457caa0bcdfd0b9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69d5b9f46c1c1ff37f83764… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 22 23:04:26 2021 -0500 server: Cancel asyncs before closing handles when a process is destroyed. test_exit_process_async() essentially validates this. The only reason it currently succeeds (instead of incorrectly returning ERROR_BROKEN_PIPE) is that due to the use of DuplicateHandle() the source handle is never actually closed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index f65d7abe2af..571a80f0dc6 100644 --- a/server/process.c +++ b/server/process.c @@ -842,8 +842,8 @@ static void process_killed( struct process *process ) if (!process->is_system) close_process_desktop( process ); process->winstation = 0; process->desktop = 0; - close_process_handles( process ); cancel_process_asyncs( process ); + close_process_handles( process ); if (process->idle_event) release_object( process->idle_event ); process->idle_event = NULL; assert( !process->console );

1 0

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 March 2021