wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Damjan Jovanovic : ntdll: Implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: d5406d028b9b735a1f727d7b500494a724b7eaad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5406d028b9b735a1f727d7b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:47:50 2021 +0200 ntdll: Implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6640a66597b..91184b12dba 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1852,6 +1852,7 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) memset( info, 0, sizeof(*info) ); +#if defined(linux) if ((fp = fopen("/proc/uptime", "r"))) { double uptime, idle_time; @@ -1860,12 +1861,28 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) fclose(fp); info->IdleTime.QuadPart = 10000000 * idle_time; } - else +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + { + static int clockrate_name[] = { CTL_KERN, KERN_CLOCKRATE }; + size_t size = 0; + struct clockinfo clockrate; + long ptimes[CPUSTATES]; + + size = sizeof(clockrate); + if (!sysctl(clockrate_name, 2, &clockrate, &size, NULL, 0)) + { + size = sizeof(ptimes); + if (!sysctlbyname("kern.cp_time", ptimes, &size, NULL, 0)) + info->IdleTime.QuadPart = (ULONGLONG)ptimes[CP_IDLE] * 10000000 / clockrate.stathz; + } + } +#else { static ULONGLONG idle; /* many programs expect IdleTime to change so fake change */ info->IdleTime.QuadPart = ++idle; } +#endif #ifdef linux if ((fp = fopen("/proc/meminfo", "r")))

1 0

Damjan Jovanovic : ntdll: Implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 478a7dbc90477de85dc8c98429af99e156e92b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=478a7dbc90477de85dc8c984… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 31 17:47:26 2021 +0200 ntdll: Implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c37fc360f3e..6640a66597b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -52,6 +52,9 @@ #ifdef HAVE_SYS_RANDOM_H # include <sys/random.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> @@ -2611,7 +2614,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); } } -#else +#elif defined(linux) { FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) @@ -2644,6 +2647,33 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, fclose(cpuinfo); } } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) + { + static int clockrate_name[] = { CTL_KERN, KERN_CLOCKRATE }; + size_t size = 0; + struct clockinfo clockrate; + int have_clockrate; + long *ptimes; + + size = sizeof(clockrate); + have_clockrate = !sysctl(clockrate_name, 2, &clockrate, &size, NULL, 0); + size = out_cpus * CPUSTATES * sizeof(long); + ptimes = malloc(size + 1); + if (ptimes) + { + if (have_clockrate && (!sysctlbyname("kern.cp_times", ptimes, &size, NULL, 0) || errno == ENOMEM)) + { + for (cpus = 0; cpus < out_cpus; cpus++) + { + if (cpus * CPUSTATES * sizeof(long) >= size) break; + sppi[cpus].IdleTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_IDLE] * 10000000 / clockrate.stathz; + sppi[cpus].KernelTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_SYS] * 10000000 / clockrate.stathz; + sppi[cpus].UserTime.QuadPart = (ULONGLONG)ptimes[cpus*CPUSTATES + CP_USER] * 10000000 / clockrate.stathz; + } + } + free(ptimes); + } + } #endif if (cpus == 0) {

1 0

Jactry Zeng : include: Add IDeviceWatcher interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 489cdd1932da862e27f4cf4c582f2ed951a12caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=489cdd1932da862e27f4cf4c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:56 2021 +0800 include: Add IDeviceWatcher interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.devices.enumeration.idl | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index 20e4df9d33d..7cde49224a1 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -30,6 +30,7 @@ import "windows.foundation.idl"; namespace Windows { namespace Devices { namespace Enumeration { + typedef enum DeviceWatcherStatus DeviceWatcherStatus; typedef enum Panel Panel; interface IDeviceInformation; @@ -41,6 +42,7 @@ namespace Windows { runtimeclass DeviceInformation; runtimeclass DeviceInformationUpdate; runtimeclass DeviceThumbnail; + runtimeclass DeviceWatcher; runtimeclass EnclosureLocation; } } @@ -59,6 +61,9 @@ namespace Windows interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformationUpdate *>; } } } @@ -82,6 +87,16 @@ namespace Windows namespace Windows { namespace Devices { namespace Enumeration { + enum DeviceWatcherStatus + { + Created = 0, + Started = 1, + EnumerationCompleted = 2, + Stopping = 3, + Stopped = 4, + Aborted = 5 + }; + enum Panel { Unknown = 0, @@ -120,6 +135,32 @@ namespace Windows { [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); } + [ + exclusiveto(Windows.Devices.Enumeration.DeviceWatcher), + uuid(c9eab97d-8f6b-4f96-a9f4-abc814e22271), + ] + interface IDeviceWatcher : IInspectable + { + [eventadd] HRESULT Added([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher*, + Windows.Devices.Enumeration.DeviceInformation *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Added([in] EventRegistrationToken token); + [eventadd] HRESULT Updated([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Updated([in] EventRegistrationToken token); + [eventadd] HRESULT Removed([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Removed([in] EventRegistrationToken token); + [eventadd] HRESULT EnumerationCompleted([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT EnumerationCompleted([in] EventRegistrationToken token); + [eventadd] HRESULT Stopped([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, + IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Stopped([in] EventRegistrationToken token); + [propget] HRESULT Status([out, retval] Windows.Devices.Enumeration.DeviceWatcherStatus *status); + HRESULT Start(); + HRESULT Stop(); + } + [ exclusiveto(Windows.Devices.Enumeration.EnclosureLocation), uuid(42340a27-5810-459c-aabb-c65e1f813ecf) @@ -166,6 +207,15 @@ namespace Windows { interface Windows.Storage.Streams.IInputStream; } + [ + marshaling_behavior(agile), + ] + runtimeclass DeviceWatcher + { + [default] interface Windows.Devices.Enumeration.IDeviceWatcher; + interface Windows.Devices.Enumeration.IDeviceWatcher2; + } + [ marshaling_behavior(agile) ]

1 0

Jactry Zeng : include: Add IDeviceInformation interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: dc65dfe362e53a9f1f1435e83de89489684ad7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc65dfe362e53a9f1f1435e8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:55 2021 +0800 include: Add IDeviceInformation interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.devices.enumeration.idl | 123 ++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index 9aa2aaba441..20e4df9d33d 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -24,13 +24,57 @@ import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; +import "windows.storage.streams.idl"; import "windows.foundation.idl"; namespace Windows { namespace Devices { namespace Enumeration { + typedef enum Panel Panel; + + interface IDeviceInformation; interface IDeviceInformationStatics; interface IDeviceInformationStatics2; + interface IDeviceInformationUpdate; + interface IEnclosureLocation; + + runtimeclass DeviceInformation; + runtimeclass DeviceInformationUpdate; + runtimeclass DeviceThumbnail; + runtimeclass EnclosureLocation; + } + } +} + +namespace Windows +{ + namespace Devices + { + namespace Enumeration + { + declare + { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceThumbnail *>; + interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>; + interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>; + } + } + } +} + +namespace Windows +{ + namespace Storage + { + namespace Streams + { + interface IContentTypeProvider; + interface IInputStream; + interface IOutputStream; + interface IRandomAccessStream; + interface IRandomAccessStreamWithContentType; } } } @@ -38,6 +82,55 @@ namespace Windows { namespace Windows { namespace Devices { namespace Enumeration { + enum Panel + { + Unknown = 0, + Front = 1, + Back = 2, + Top = 3, + Bottom = 4, + Left = 5, + Right = 6 + }; + + [ + exclusiveto(Windows.Devices.Enumeration.DeviceInformation), + uuid(aba0fb95-4398-489d-8e44-e6130927011f) + ] + interface IDeviceInformation : IInspectable + { + [propget] HRESULT Id([out, retval] HSTRING *value); + [propget] HRESULT Name([out, retval] HSTRING *value); + [propget] HRESULT IsEnabled([out, retval] boolean *value); + [propget] HRESULT IsDefault([out, retval] boolean *value); + [propget] HRESULT EnclosureLocation([out, retval] Windows.Devices.Enumeration.EnclosureLocation **value); + [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); + HRESULT Update([in] Windows.Devices.Enumeration.DeviceInformationUpdate *info); + HRESULT GetThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation); + HRESULT GetGlyphThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation); + } + + [ + exclusiveto(Windows.Devices.Enumeration.DeviceInformationUpdate), + uuid(8f315305-d972-44b7-a37e-9e822c78213b) + ] + interface IDeviceInformationUpdate : IInspectable + { + [propget] HRESULT Id([out, retval] HSTRING *value); + [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); + } + + [ + exclusiveto(Windows.Devices.Enumeration.EnclosureLocation), + uuid(42340a27-5810-459c-aabb-c65e1f813ecf) + ] + interface IEnclosureLocation : IInspectable + { + [propget] HRESULT InDock([out, retval] boolean *value); + [propget] HRESULT InLid([out, retval] boolean *value); + [propget] HRESULT Panel([out, retval] Windows.Devices.Enumeration.Panel *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -50,6 +143,36 @@ namespace Windows { [default] interface Windows.Devices.Enumeration.IDeviceInformation; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; } + + [ + marshaling_behavior(agile), + ] + runtimeclass DeviceInformationUpdate + { + [default] interface Windows.Devices.Enumeration.IDeviceInformationUpdate; + interface Windows.Devices.Enumeration.IDeviceInformationUpdate2; + } + + [ + marshaling_behavior(agile), + ] + runtimeclass DeviceThumbnail + { + [default] interface Windows.Storage.Streams.IRandomAccessStreamWithContentType; + interface Windows.Storage.Streams.IContentTypeProvider; + interface Windows.Storage.Streams.IRandomAccessStream; + interface Windows.Storage.Streams.IOutputStream; + interface Windows.Foundation.IClosable; + interface Windows.Storage.Streams.IInputStream; + } + + [ + marshaling_behavior(agile) + ] + runtimeclass EnclosureLocation + { + [default] interface Windows.Devices.Enumeration.IEnclosureLocation; + } } } }

1 0

Jactry Zeng : include: Add IRandomAccessStreamWithContentType interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: a5eb23bd1779ac36be7c24fe4bafce8deb5e176a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5eb23bd1779ac36be7c24fe… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:54 2021 +0800 include: Add IRandomAccessStreamWithContentType interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.storage.streams.idl | 70 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 71d1b497b6d..ff7aa1b0ff5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -776,6 +776,7 @@ SOURCES = \ windows.h \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ + windows.storage.streams.idl \ windows.system.idl \ windows.system.userprofile.idl \ windowscontracts.idl \ diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl new file mode 100644 index 00000000000..59b15761af0 --- /dev/null +++ b/include/windows.storage.streams.idl @@ -0,0 +1,70 @@ +/* + * Copyright 2021 Jactry Zeng 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 "eventtoken.idl"; +import "windows.foundation.idl"; + +namespace Windows +{ + namespace Foundation + { + interface IClosable; + } +} + +namespace Windows +{ + namespace Storage + { + namespace Streams + { + interface IContentTypeProvider; + interface IInputStream; + interface IOutputStream; + interface IRandomAccessStream; + interface IRandomAccessStreamWithContentType; + } + } +} + +namespace Windows +{ + namespace Storage + { + namespace Streams + { + [ + uuid(cc254827-4b3d-438f-9232-10c76bc7e038), + ] + interface IRandomAccessStreamWithContentType : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider + { + } + } + } +}

1 0

Jactry Zeng : include: Add IMapView interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: b74523bb347b6e9c6362287cc67e0c25c758d971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b74523bb347b6e9c6362287c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Oct 29 16:52:53 2021 +0800 include: Add IMapView interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index b0b9430048b..876e15336a2 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -74,6 +74,18 @@ cpp_quote("#endif") namespace Collections { + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e480ce40-a338-4ada-adcf-272272e48cb9) + ] + interface IMapView<K, V> : IInspectable + { + HRESULT Lookup([in] K key, [out] V *value); + [propget] HRESULT Size([out] unsigned int *size); + HRESULT HasKey([in] K key, [out] boolean *found); + HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(6a79e863-4300-459a-9966-cbb660963ee1)

1 0

Paul Gofman : ntdll: Don't add dependencies for system dlls.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: aa234f3a58cb9871d058792408b2d3e64f051873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa234f3a58cb9871d0587924… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:44 2021 +0300 ntdll: Don't add dependencies for system dlls. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 4 ++-- dlls/ntdll/loader.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 466ff3e8d38..2ee23595f55 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1409,7 +1409,7 @@ static void test_ddag_node(void) } mod2 = CONTAINING_RECORD(dep_node->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink); - todo_wine ok( !lstrcmpW( mod2->BaseDllName.Buffer, expected_exe_dependencies[i].dllname ), + ok( !lstrcmpW( mod2->BaseDllName.Buffer, expected_exe_dependencies[i].dllname ), "Got unexpected module %s.\n", debugstr_w(mod2->BaseDllName.Buffer)); se2 = dep_node->IncomingDependencies.Tail; @@ -1428,7 +1428,7 @@ static void test_ddag_node(void) winetest_pop_context(); prev_node = dep_node; } - todo_wine ok( se == node->Dependencies.Tail, "Expected end of the list.\n" ); + ok( se == node->Dependencies.Tail, "Expected end of the list.\n" ); } START_TEST(module) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2b4b428a0fd..255d5afef79 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -182,6 +182,8 @@ static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; +static LDR_DDAG_NODE *node_ntdll, *node_kernel32; + static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, DWORD flags, WINE_MODREF** pwm ); static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ); @@ -1280,7 +1282,10 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) imp = NULL; status = STATUS_DLL_NOT_FOUND; } - else add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); + else if (!is_import_dll_system( &wm->ldr, &imports[i] )) + { + add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); + } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); @@ -2076,6 +2081,7 @@ static void build_ntdll_module(void) wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + node_ntdll = wm->ldr.DdagNode; if (TRACE_ON(relay)) RELAY_SetupDLL( meminfo.AllocationBase ); } @@ -4004,6 +4010,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtTerminateProcess( GetCurrentProcess(), status ); } kernel32_handle = kernel32->ldr.DllBase; + node_kernel32 = kernel32->ldr.DdagNode; RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); if ((status = LdrGetProcedureAddress( kernel32_handle, &func_name, 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) @@ -4053,6 +4060,14 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + if ((status = process_attach( node_ntdll, context )) + || (status = process_attach( node_kernel32, context ))) + { + ERR( "Initializing system dll for %s failed, status %x\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + if ((status = walk_node_dependencies( wm->ldr.DdagNode, context, process_attach ))) { if (last_failed_modref)

1 0

Paul Gofman : ntdll: Factor out is_import_dll_system() function.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 250c113169217933b1fffa8024fa958f71b8aee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=250c113169217933b1fffa80… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:43 2021 +0300 ntdll: Factor out is_import_dll_system() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a016aa86ebf..2b4b428a0fd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -585,6 +585,16 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id ) return NULL; } +/*********************************************************************** + * is_import_dll_system + */ +static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) +{ + const char *name = get_rva( mod->DllBase, import->Name ); + + return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); +} + /********************************************************************** * insert_single_list_tail */ @@ -1066,7 +1076,6 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H { const IMAGE_IMPORT_DESCRIPTOR *imports; DWORD i, size; - WCHAR buffer[16]; if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; @@ -1076,17 +1085,11 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) { for (i = 0; imports[i].Name; i++) - { - const char *name = get_rva( mod->DllBase, imports[i].Name ); - DWORD len = strlen(name); - if (len * sizeof(WCHAR) >= sizeof(buffer)) continue; - ascii_to_unicode( buffer, name, len + 1 ); - if (!wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" )) + if (is_import_dll_system( mod, &imports[i] )) { - TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) ); + TRACE( "%s imports system dll, assuming not native\n", debugstr_w(filename) ); return FALSE; } - } } return TRUE; }

1 0

Paul Gofman : ntdll: Store module dependencies in DDAG structure.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 0dd37b02f99f5090dd855343fcd8a99496047f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd37b02f99f5090dd855343… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:42 2021 +0300 ntdll: Store module dependencies in DDAG structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 12 +-- dlls/ntdll/loader.c | 201 +++++++++++++++++++++++++++++++------------ include/winternl.h | 4 +- 3 files changed, 152 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dd37b02f99f5090dd85…

1 0

Paul Gofman : ntdll: Pass DDAG node to process_attach().
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 06f925c59942ba5613b0aac15172ea2516aee46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f925c59942ba5613b0aac1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:41 2021 +0300 ntdll: Pass DDAG node to process_attach(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index ebb0f4250f9..093ec75476d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -187,7 +187,7 @@ static WINE_MODREF *last_failed_modref; static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, DWORD flags, WINE_MODREF** pwm ); -static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); +static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, @@ -648,7 +648,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS WINE_MODREF **deps = grow_module_deps( current_modref, 1 ); if (deps) deps[current_modref->nDeps++] = wm; } - else if (process_attach( wm, NULL ) != STATUS_SUCCESS) + else if (process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS) { LdrUnloadDll( wm->ldr.DllBase ); wm = NULL; @@ -1438,14 +1438,19 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved * * The loader_section must be locked while calling this function. */ -static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) +static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) { NTSTATUS status = STATUS_SUCCESS; + LDR_DATA_TABLE_ENTRY *mod; ULONG_PTR cookie; + WINE_MODREF *wm; int i; if (process_detaching) return status; + mod = CONTAINING_RECORD( node->Modules.Flink, LDR_DATA_TABLE_ENTRY, NodeModuleLink ); + wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); + /* prevent infinite recursion in case of cyclical dependencies */ if ( ( wm->ldr.Flags & LDR_LOAD_IN_PROGRESS ) || ( wm->ldr.Flags & LDR_PROCESS_ATTACHED ) ) @@ -1462,7 +1467,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) for ( i = 0; i < wm->nDeps; i++ ) { if (!wm->deps[i]) continue; - if ((status = process_attach( wm->deps[i], lpReserved )) != STATUS_SUCCESS) break; + if ((status = process_attach( wm->deps[i]->ldr.DdagNode, lpReserved )) != STATUS_SUCCESS) break; } if (!wm->ldr.InInitializationOrderLinks.Flink) @@ -2994,7 +2999,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { - nts = process_attach( wm, NULL ); + nts = process_attach( wm->ldr.DdagNode, NULL ); if (nts != STATUS_SUCCESS) { LdrUnloadDll(wm->ldr.DllBase); @@ -3957,7 +3962,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR for (i = 0; i < wm->nDeps; i++) { if (!wm->deps[i]) continue; - if ((status = process_attach( wm->deps[i], context )) != STATUS_SUCCESS) + if ((status = process_attach( wm->deps[i]->ldr.DdagNode, context )) != STATUS_SUCCESS) { if (last_failed_modref) ERR( "%s failed to initialize, aborting\n",

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
96
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 November 2021