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

Alexandre Julliard : msimtf: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 88b5c28dbb8ff09d4c1723578c9de733fd7caeb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b5c28dbb8ff09d4c172357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:58 2021 +0100 msimtf: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/Makefile.in | 2 +- dlls/msimtf/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index 800969ca60f..7e018cac86d 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -1,7 +1,7 @@ MODULE = msimtf.dll IMPORTS = uuid imm32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ activeimmapp.c \ diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 76ad6548f4b..c5d3e8b9f32 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);

1 0

Nikolay Sivov : wbemdisp: Pass context value to ExecMethod().
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 8ea157aca6bfc2c73b1887e4640258d7c9b4e0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea157aca6bfc2c73b1887e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:07 2021 +0300 wbemdisp: Pass context value to ExecMethod(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e2bcf09c6e3..0ef73bdbd56 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -2499,6 +2499,7 @@ static HRESULT WINAPI services_ExecMethod( struct services *services = impl_from_ISWbemServices( iface ); IWbemClassObject *out_params = NULL; struct object *in_params; + IWbemContext *context; HRESULT hr; TRACE( "%p, %s, %s, %p, %#x, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, @@ -2507,10 +2508,9 @@ static HRESULT WINAPI services_ExecMethod( in_params = unsafe_object_impl_from_IDispatch( in_sparams ); out_params = NULL; - if (valueset) - FIXME("Named value set is unused\n"); + context = unsafe_get_context_from_namedvalueset( valueset ); - hr = IWbemServices_ExecMethod( services->services, path, method, flags, NULL, in_params ? in_params->object : NULL, + hr = IWbemServices_ExecMethod( services->services, path, method, flags, context, in_params ? in_params->object : NULL, out_sparams ? &out_params : NULL, NULL ); if (SUCCEEDED(hr) && out_params)

1 0

Alexandre Julliard : ntdll: Only check the existence of the directory for the Unix pathname heuristic.
by Alexandre Julliard March 2, 2021

March 2, 2021

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

Hugh McMaster : reg/tests: Fix copy/paste typo in reg.exe availability check.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: b369af9ac5861f0ec49933ef657a53feeafefc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b369af9ac5861f0ec49933ef… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 2 23:17:49 2021 +1100 reg/tests: Fix copy/paste typo in reg.exe availability check. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- programs/reg/tests/copy.c | 2 +- programs/reg/tests/export.c | 2 +- programs/reg/tests/import.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bdfd429367c..bd0888ae831 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -630,7 +630,7 @@ START_TEST(add) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'add' tests\n"); return; } diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index b91352c9d46..a8956d7e9a0 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -102,7 +102,7 @@ START_TEST(copy) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'copy' tests\n"); return; } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index e03b1f3db25..9a3f7d5fbf0 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -408,7 +408,7 @@ START_TEST(export) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping reg.exe tests\n"); + win_skip("reg.exe not available, skipping 'export' tests\n"); return; } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 5b520f11d5f..f769e0020f5 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3584,7 +3584,7 @@ START_TEST(import) DWORD r; if (!run_reg_exe("reg.exe /?", &r)) { - win_skip("reg.exe not available, skipping 'query' tests\n"); + win_skip("reg.exe not available, skipping 'import' tests\n"); return; }

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 3dca00f1dd7e8ff1abe0a15af3365b4f7c7ae042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dca00f1dd7e8ff1abe0a15a… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 2 12:09:32 2021 +0100 msvcrt: Update source pointer in wcsrtombs in C locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4d61cff11c0..dbc93dc93f5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2094,6 +2094,22 @@ static void test_mbstowcs(void) ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); ok(!mOut[0], "mOut = %s\n", mOut); + if(pwcsrtombs) { + pwstr = wSimple; + err = -3; + ret = pwcsrtombs(mOut, &pwstr, 4, &err); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(err == 0, "err = %d\n", err); + ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); + ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); + + pwstr = wSimple; + ret = pwcsrtombs(mOut, &pwstr, 5, NULL); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(pwstr == NULL, "pwstr != NULL\n"); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + } + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..343dec70477 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + + if(i < count) *wcstr = NULL; + else *wcstr += i; return i; }

1 0

Nikolay Sivov : wbemdisp: Pass context value to ConnectServer().
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 93858d787d02053840dc388e37dc0c9e1acb8b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=93858d787d02053840dc388e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:06 2021 +0300 wbemdisp: Pass context value to ConnectServer(). 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 | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 8c37cc92eb1..e2bcf09c6e3 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -35,6 +35,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; + + IWbemContext *context; +}; + +static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *iface); + +static IWbemContext * unsafe_get_context_from_namedvalueset( IDispatch *disp ) +{ + struct namedvalueset *valueset = unsafe_valueset_impl_from_IDispatch( disp ); + return valueset ? valueset->context : NULL; +} + static WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; @@ -2751,6 +2767,7 @@ static HRESULT WINAPI locator_ConnectServer( { struct locator *locator = impl_from_ISWbemLocator( iface ); IWbemServices *services; + IWbemContext *context; BSTR resource; HRESULT hr; @@ -2758,8 +2775,6 @@ static HRESULT WINAPI locator_ConnectServer( debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); - if (objWbemNamedValueSet) FIXME( "context not supported\n" ); - if (!locator->locator) { hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, @@ -2767,9 +2782,11 @@ static HRESULT WINAPI locator_ConnectServer( if (hr != S_OK) return hr; } + context = unsafe_get_context_from_namedvalueset( objWbemNamedValueSet ); + if (!(resource = build_resource_string( strServer, strNamespace ))) return E_OUTOFMEMORY; hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword, strLocale, - iSecurityFlags, strAuthority, NULL, &services ); + iSecurityFlags, strAuthority, context, &services ); SysFreeString( resource ); if (hr != S_OK) return hr; @@ -3047,14 +3064,6 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) return S_OK; } -struct namedvalueset -{ - ISWbemNamedValueSet ISWbemNamedValueSet_iface; - LONG refs; - - IWbemContext *context; -}; - struct namedvalue { ISWbemNamedValue ISWbemNamedValue_iface; @@ -3478,6 +3487,18 @@ static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = namedvalueset_DeleteAll, }; +static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDispatchVtbl *)&namedvalueset_vtbl) + { + FIXME( "External implementations are not supported.\n" ); + return NULL; + } + return CONTAINING_RECORD(iface, struct namedvalueset, ISWbemNamedValueSet_iface); +} + HRESULT SWbemNamedValueSet_create( void **obj ) { struct namedvalueset *set;

1 0

Nikolay Sivov : wbemdisp: Iterate properties and methods once when collecting supported member names.
by Alexandre Julliard March 2, 2021

March 2, 2021

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

Alexandre Julliard : wuapi: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

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 : wbemdisp: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

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 : uianimation: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

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