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

Nikolay Sivov : wbemdisp: Keep property member types.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 63a9e7e88e29e5aaac987e008d3bd7e78bb85d3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a9e7e88e29e5aaac987e00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:04 2021 +0300 wbemdisp: Keep property member types. 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index deef4d83fb8..59a8150a155 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -527,6 +527,7 @@ struct member BSTR name; BOOL is_method; DISPID dispid; + CIMTYPE type; }; struct object @@ -1090,6 +1091,7 @@ static HRESULT init_members( struct object *object ) { IWbemClassObject *sig_in, *sig_out; unsigned int i, capacity = 0, count = 0; + CIMTYPE type; HRESULT hr; BSTR name; @@ -1098,12 +1100,13 @@ static HRESULT init_members( struct object *object ) hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); if (SUCCEEDED( hr )) { - while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) + while (IWbemClassObject_Next( object->object, 0, &name, NULL, &type, NULL ) == S_OK) { 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; + object->members[count].type = type; count++; TRACE( "added property %s\n", debugstr_w(name) ); }

1 0

Nikolay Sivov : wbemdisp: Coerce property value before setting it in ISWbemObject::Invoke().
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 65ed5d9cc6e3f74275ca2928b62e4d2deed2fc32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ed5d9cc6e3f74275ca2928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:25:05 2021 +0300 wbemdisp: Coerce property value before setting it in ISWbemObject::Invoke(). 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 | 54 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 59a8150a155..8c37cc92eb1 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1199,16 +1199,51 @@ static HRESULT WINAPI object_GetIDsOfNames( return S_OK; } -static BSTR get_member_name( struct object *object, DISPID dispid ) +static BSTR get_member_name( struct object *object, DISPID dispid, CIMTYPE *type ) { UINT i; for (i = 0; i < object->nb_members; i++) { - if (object->members[i].dispid == dispid) return object->members[i].name; + if (object->members[i].dispid == dispid) + { + *type = object->members[i].type; + return object->members[i].name; + } } return NULL; } +static VARTYPE to_vartype( CIMTYPE type ) +{ + switch (type) + { + case CIM_BOOLEAN: return VT_BOOL; + + case CIM_STRING: + case CIM_REFERENCE: + case CIM_DATETIME: return VT_BSTR; + + case CIM_SINT8: return VT_I1; + case CIM_UINT8: return VT_UI1; + case CIM_SINT16: return VT_I2; + + case CIM_UINT16: + case CIM_SINT32: return VT_I4; + + case CIM_UINT32: return VT_UI4; + + case CIM_SINT64: return VT_I8; + case CIM_UINT64: return VT_UI8; + + case CIM_REAL32: return VT_R4; + + default: + ERR("unhandled type %u\n", type); + break; + } + return 0; +} + static HRESULT WINAPI object_Invoke( ISWbemObject *iface, DISPID member, @@ -1223,6 +1258,9 @@ static HRESULT WINAPI object_Invoke( struct object *object = impl_from_ISWbemObject( iface ); BSTR name; ITypeInfo *typeinfo; + VARTYPE vartype; + VARIANT value; + CIMTYPE type; HRESULT hr; TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), @@ -1240,7 +1278,7 @@ static HRESULT WINAPI object_Invoke( return hr; } - if (!(name = get_member_name( object, member ))) + if (!(name = get_member_name( object, member, &type ))) return DISP_E_MEMBERNOTFOUND; if (flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) @@ -1255,7 +1293,15 @@ static HRESULT WINAPI object_Invoke( WARN( "Missing put property value\n" ); return E_INVALIDARG; } - return IWbemClassObject_Put( object->object, name, 0, params->rgvarg, 0 ); + + vartype = to_vartype( type ); + V_VT( &value ) = VT_EMPTY; + if (SUCCEEDED(hr = VariantChangeType( &value, params->rgvarg, 0, vartype ))) + { + hr = IWbemClassObject_Put( object->object, name, 0, &value, 0 ); + VariantClear( &value ); + } + return hr; } else {

1 0

Nikolay Sivov : wbemdisp: Pass context value to ConnectServer().
by Alexandre Julliard 02 Mar '21

02 Mar '21

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: Pass context value to ExecMethod().
by Alexandre Julliard 02 Mar '21

02 Mar '21

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

Nikolay Sivov : oleaut32: Fix Var*FromDec() prototypes.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 02d29c6a9d3707751a2b3ee17b22de9cb124b141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d29c6a9d3707751a2b3ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 2 09:27:17 2021 +0300 oleaut32: Fix Var*FromDec() prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d29c6a9d3707751a2b…

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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

Hugh McMaster : reg/tests: Fix copy/paste typo in reg.exe availability check.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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

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

02 Mar '21

Module: wine Branch: master Commit: 55ae768fdcdb9286adde36198d519c04ebab1273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ae768fdcdb9286adde3619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:33 2021 +0100 adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index a99917a16ad..9420a8a92c9 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -2,7 +2,7 @@ MODULE = adsldp.dll IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ adsldp.c \ diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 13bd73c1296..63f800b5061 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -2135,9 +2135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: adsldp_hinst = hinst; DisableThreadLibraryCalls(hinst);

1 0

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

02 Mar '21

Module: wine Branch: master Commit: 0ed2adf60f87e9c698759a915b16aeceef945acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed2adf60f87e9c698759a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:55 2021 +0100 comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2e..54d4e6a9ded 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -2,7 +2,7 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 74704077ecb..3023783bdf5 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -360,8 +360,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: COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst);

1 0

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

02 Mar '21

Module: wine Branch: master Commit: 79aa19c10d5054ad3c94c8ec691890991515b57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=79aa19c10d5054ad3c94c8ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:01 2021 +0100 directmanipulation: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/Makefile.in | 2 +- dlls/directmanipulation/directmanipulation.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index d67a21eb779..258d3c67177 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,7 +1,7 @@ MODULE = directmanipulation.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native IDL_SRCS = directmanip.idl diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 5bb3461d443..5db998ee9c8 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -38,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: dm_instance = instance; DisableThreadLibraryCalls(instance);

1 0