March 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : qmgr: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 7b470425f74a23e988426bd8882175766be1c1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b470425f74a23e988426bd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:57 2021 +0100 qmgr: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/qmgr_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index fe051ad239b..d01f50e3b79 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -1,7 +1,7 @@ MODULE = qmgr.dll IMPORTS = uuid winhttp ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 7bea214ed2b..2c48b4cc09e 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -47,8 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL;

1 0

Alexandre Julliard : taskschd: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 3fce5dc4924abf58d3c1039f4191de8182b1afeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fce5dc4924abf58d3c1039f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:02 2021 +0100 taskschd: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/Makefile.in | 2 +- dlls/taskschd/taskschd.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 8d12fed057c..0ad00898ace 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,7 +1,7 @@ MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ folder.c \ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index b68c352824d..42cd7711fa4 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -121,9 +121,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: schd_instance = hinst; DisableThreadLibraryCalls(hinst);

1 0

Alexandre Julliard : uianimation: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 64af8131f08657db326568f0e2c9d265ae437786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64af8131f08657db326568f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:07 2021 +0100 uianimation: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/Makefile.in | 2 +- dlls/uianimation/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index d492faabde8..d1d3f59cf67 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,7 +1,7 @@ MODULE = uianimation.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c0c7367e092..412c31f5f01 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: hinstance = dll; DisableThreadLibraryCalls( dll );

1 0

Alexandre Julliard : wbemdisp: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: c64b6419c6a19c5f7c1a13f676d4c9ab1469d8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64b6419c6a19c5f7c1a13f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:12 2021 +0100 wbemdisp: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/Makefile.in | 2 +- dlls/wbemdisp/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 38ef9cc2990..770631f7536 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,7 +1,7 @@ MODULE = wbemdisp.dll IMPORTS = oleaut32 ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ locator.c \ diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index b0064582187..624017f5382 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -270,8 +270,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst );

1 0

Alexandre Julliard : wiaservc: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 005e641ec4faed6441c0778d5c6202fc0071c17c URL: https://source.winehq.org/git/wine.git/?a=commit;h=005e641ec4faed6441c0778d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:43 2021 +0100 wiaservc: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/Makefile.in | 2 +- dlls/wiaservc/wiaservc_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 2a8d8900419..e810fa23bc3 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,7 +1,7 @@ MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ factory.c \ diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index a5f9607665d..3293f485158 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -47,8 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL;

1 0

Alexandre Julliard : wpc: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: cb26b60ae12445f4a6ffb78cf3120efc430ae285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb26b60ae12445f4a6ffb78c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:48 2021 +0100 wpc: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/Makefile.in | 2 +- dlls/wpc/wpc.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in index 5d8ea2e1115..df0e596d322 100644 --- a/dlls/wpc/Makefile.in +++ b/dlls/wpc/Makefile.in @@ -1,6 +1,6 @@ MODULE = wpc.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ wpc.c diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index ef2d6dd7d1c..3dcca050bcd 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -166,8 +166,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); wpc_instance = hInstDLL;

1 0

Alexandre Julliard : wuapi: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 24b447714eef2fe739a9694ee26119a6dce0674a URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b447714eef2fe739a9694e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:56:52 2021 +0100 wuapi: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/Makefile.in | 2 +- dlls/wuapi/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index fbabf937189..049bf5e5fe0 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = wuapi.dll IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ downloader.c \ diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 63392b3660c..79530079afc 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -119,8 +119,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst );

1 0

Alexandre Julliard : ntdll: Remove DLL_WINE_PREATTACH support.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: e5cade0ff189c7bc871cf3686d16c55939d06068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5cade0ff189c7bc871cf368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 11:01:25 2021 +0100 ntdll: Remove DLL_WINE_PREATTACH support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 12 ------------ include/winnt.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6c86e6b2e6c..a7e6d712df1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -105,8 +105,6 @@ static const char * const reason_names[] = "PROCESS_ATTACH", "THREAD_ATTACH", "THREAD_DETACH", - NULL, NULL, NULL, NULL, - "WINE_PREATTACH" }; struct file_id @@ -1261,8 +1259,6 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) const PIMAGE_TLS_CALLBACK *callback; ULONG dirsize; - if (reason == DLL_WINE_PREATTACH) return; - dir = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &dirsize ); if (!dir || !dir->AddressOfCallBacks) return; @@ -2687,14 +2683,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC case LO_BUILTIN_NATIVE: case LO_DEFAULT: nts = load_builtin_dll( load_path, &nt_name, flags, pwm, loadorder == LO_DEFAULT ); - if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && - (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) - { - /* stub-only dll, try native */ - TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_us(&nt_name) ); - LdrUnloadDll( (*pwm)->ldr.DllBase ); - nts = STATUS_IMAGE_ALREADY_LOADED; - } if (nts == STATUS_DLL_NOT_FOUND || nts == STATUS_IMAGE_ALREADY_LOADED) nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); break; diff --git a/include/winnt.h b/include/winnt.h index 7973960bf21..9025e965b4d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -676,9 +676,6 @@ typedef DWORD FLONG; #define DLL_PROCESS_ATTACH 1 /* attach process (load library) */ #define DLL_THREAD_ATTACH 2 /* attach new thread */ #define DLL_THREAD_DETACH 3 /* detach thread */ -#ifdef __WINESRC__ -#define DLL_WINE_PREATTACH 8 /* called before process attach for Wine builtins */ -#endif /* u.x.wProcessorArchitecture (NT) */ #define PROCESSOR_ARCHITECTURE_INTEL 0

1 0

Alexandre Julliard : ntdll: Only check the existence of the directory for the Unix pathname heuristic.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 193d9fcf261a40e11349ea57441ae169ff3692de URL: https://source.winehq.org/git/wine.git/?a=commit;h=193d9fcf261a40e11349ea57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:00 2021 +0100 ntdll: Only check the existence of the directory for the Unix pathname heuristic. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 9d707d883b2..4cb64cbe516 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -551,7 +551,8 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) RtlInitUnicodeString( &str, nt_str ); buflen = 3 * wcslen(name) + 1; unix_name = RtlAllocateHeap( GetProcessHeap(), 0, buflen ); - if (!(status = wine_nt_to_unix_file_name( &str, unix_name, &buflen, FILE_OPEN ))) + status = wine_nt_to_unix_file_name( &str, unix_name, &buflen, FILE_OPEN_IF ); + if (!status || status == STATUS_NO_SUCH_FILE) { buflen = wcslen(name) + 9; status = wine_unix_to_nt_file_name( unix_name, nt_str, &buflen );

1 0

Nikolay Sivov : wbemdisp: Iterate properties and methods once when collecting supported member names.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 501a99f2a972158f82cc6be5228c2382f3e93686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=501a99f2a972158f82cc6be5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:03 2021 +0300 wbemdisp: Iterate properties and methods once when collecting supported member names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 82 ++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 867a19c1ab2..deef4d83fb8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1059,50 +1059,52 @@ static HRESULT WINAPI object_GetTypeInfo( return E_NOTIMPL; } +static BOOL object_reserve_member( struct object *object, unsigned int count, unsigned int *capacity ) +{ + unsigned int new_capacity, max_capacity; + struct member *new_members; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~0u / sizeof(*object->members); + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_members = heap_realloc( object->members, new_capacity * sizeof(*new_members) ))) + return FALSE; + + object->members = new_members; + *capacity = new_capacity; + + return TRUE; +} + static HRESULT init_members( struct object *object ) { IWbemClassObject *sig_in, *sig_out; - LONG i = 0, count = 0; - BSTR name; + unsigned int i, capacity = 0, count = 0; HRESULT hr; + BSTR name; if (object->members) return S_OK; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_Next( object->object, 0, NULL, NULL, NULL, NULL ) == S_OK) count++; - IWbemClassObject_EndEnumeration( object->object ); - } - - hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) - { - count++; - SysFreeString( name ); - if (sig_in) IWbemClassObject_Release( sig_in ); - if (sig_out) IWbemClassObject_Release( sig_out ); - } - IWbemClassObject_EndMethodEnumeration( object->object ); - } - - if (!(object->members = heap_alloc( sizeof(struct member) * count ))) return E_OUTOFMEMORY; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); if (SUCCEEDED( hr )) { while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = FALSE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = FALSE; + object->members[count].dispid = 0; + count++; TRACE( "added property %s\n", debugstr_w(name) ); } IWbemClassObject_EndEnumeration( object->object ); @@ -1113,14 +1115,11 @@ static HRESULT init_members( struct object *object ) { while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = TRUE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndMethodEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = TRUE; + object->members[count].dispid = 0; + count++; if (sig_in) IWbemClassObject_Release( sig_in ); if (sig_out) IWbemClassObject_Release( sig_out ); TRACE( "added method %s\n", debugstr_w(name) ); @@ -1133,7 +1132,8 @@ static HRESULT init_members( struct object *object ) return S_OK; error: - for (--i; i >= 0; i--) SysFreeString( object->members[i].name ); + for (i = 0; i < count; ++i) + SysFreeString( object->members[i].name ); heap_free( object->members ); object->members = NULL; object->nb_members = 0;

1 0