February 2021 - Wine-Commits

Alexandre Julliard : mssign32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: f8d545954f6bcfa1ba5dbeaa318c93be5152927f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d545954f6bcfa1ba5dbeaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:07:00 2021 +0100 mssign32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/Makefile.in | 2 +- dlls/mssign32/mssign32_main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in index 1ca46974e74..85ce1365744 100644 --- a/dlls/mssign32/Makefile.in +++ b/dlls/mssign32/Makefile.in @@ -1,6 +1,6 @@ MODULE = mssign32.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ mssign32_main.c diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 416f836fc40..86825bf0ec1 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mssign); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - - HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiProvider, DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv)

1 0

Alexandre Julliard : mprapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 9981715809300c8e6e648021756d7053df7206cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9981715809300c8e6e648021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:40 2021 +0100 mprapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/Makefile.in | 2 +- dlls/mprapi/mprapi.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index e33e57ea40a..9ad3e0f891a 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = mprapi.dll IMPORTLIB = mprapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ mprapi.c diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index 715f1b8cada..cfb4259b339 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -25,25 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mprapi); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /*********************************************************************** * MprAdminGetErrorString (MPRAPI.@) *

1 0

Alexandre Julliard : mfplat: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: de2a6d9b38f5abac6806036ccce39e8982d197c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2a6d9b38f5abac6806036c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:28 2021 +0100 mfplat: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index bc04a440826..9e5c607deae 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys rtworkq -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 99afbaf8a46..999d8a86147 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,20 +702,6 @@ static BOOL GUIDFromString(LPCWSTR s, GUID *id) return FALSE; } -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes)

1 0

Henri Verbeet : wined3d: Unbind framebuffer state in state_unbind_resources().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 57119a1c1f4992ebf81e6fe10c78a537ee8d0ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57119a1c1f4992ebf81e6fe1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 19:50:44 2021 +0100 wined3d: Unbind framebuffer state in state_unbind_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 ------------- dlls/wined3d/stateblock.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792263ca7d8..c9df09b5348 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1196,7 +1196,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; - unsigned int i; TRACE("device %p.\n", device); @@ -1224,10 +1223,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(state); - for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); @@ -1243,14 +1238,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = state->fb.depth_stencil)) - { - TRACE("Releasing depth/stencil view %p.\n", view); - - state->fb.depth_stencil = NULL; - wined3d_rendertarget_view_decref(view); - } - if ((view = device->auto_depth_stencil_view)) { device->auto_depth_stencil_view = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 46588fa4246..52124583c90 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -374,6 +374,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; struct wined3d_blend_state *blend_state; + struct wined3d_rendertarget_view *rtv; struct wined3d_sampler *sampler; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -473,6 +474,21 @@ void state_unbind_resources(struct wined3d_state *state) state->blend_state = NULL; wined3d_blend_state_decref(blend_state); } + + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) + { + if ((rtv = state->fb.render_targets[i])) + { + state->fb.render_targets[i] = NULL; + wined3d_rendertarget_view_decref(rtv); + } + } + + if ((rtv = state->fb.depth_stencil)) + { + state->fb.depth_stencil = NULL; + wined3d_rendertarget_view_decref(rtv); + } } void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state)

1 0

Nikolay Sivov : mf/tests: Skip all tests on Vista.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: b9ceaa6fed82e3fc70c601ea34eff71e55c37f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ceaa6fed82e3fc70c601ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 16:12:10 2021 +0300 mf/tests: Skip all tests on Vista. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e3a752553bb..40d8561bb06 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -48,6 +48,12 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); +static HRESULT (WINAPI *pMFGetTopoNodeCurrentType)(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); + +static BOOL is_vista(void) +{ + return !pMFGetTopoNodeCurrentType; +} #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) @@ -5089,14 +5095,20 @@ static void test_MFGetTopoNodeCurrentType(void) IMFTopologyNode *node; HRESULT hr; + if (!pMFGetTopoNodeCurrentType) + { + win_skip("MFGetTopoNodeCurrentType() is unsupported.\n"); + return; + } + /* Tee node. */ hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateMediaType(&media_type2); @@ -5109,7 +5121,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5117,14 +5129,14 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, NULL); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* Set second output. */ hr = IMFTopologyNode_SetOutputPrefType(node, 1, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = IMFTopologyNode_SetOutputPrefType(node, 1, NULL); @@ -5134,7 +5146,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetOutputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5149,12 +5161,12 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_PRIMARYOUTPUT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5169,6 +5181,7 @@ static void init_functions(void) #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFCreateSampleCopierMFT); + X(MFGetTopoNodeCurrentType); #undef X } @@ -5176,6 +5189,12 @@ START_TEST(mf) { init_functions(); + if (is_vista()) + { + win_skip("Skipping tests on Vista.\n"); + return; + } + test_topology(); test_topology_tee_node(); test_topology_loader();

1 0

Alexandre Julliard : mspatcha: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 9cef8bb6f2131a2767d03cc8ef3742e10b7fe938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cef8bb6f2131a2767d03cc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:56 2021 +0100 mspatcha: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/Makefile.in | 2 +- dlls/mspatcha/mspatcha_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index a380f3f1a47..e262ce1af3c 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,7 +1,7 @@ MODULE = mspatcha.dll IMPORTLIB = mspatcha -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ lzxd_dec.c \ diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 167c3fda9bb..c96cb01b549 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -41,24 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); -/***************************************************** - * DllMain (MSPATCHA.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} static WCHAR *strdupAW(const char *src) {

1 0

Alexandre Julliard : mfmediaengine: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 0ace8475f94cdc33a7f5b4072963580660b84429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ace8475f94cdc33a7f5b407… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:25 2021 +0100 mfmediaengine: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index ed06dd40f26..0a498a00bcd 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine IMPORTS = oleaut32 ole32 mfplat mf mfuuid uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8ae86d3a68b..4464b525a4d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -61,20 +61,6 @@ static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, si return TRUE; } -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - enum media_engine_mode { MEDIA_ENGINE_INVALID,

1 0

Paul Gofman : advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 7d4eaa30a4f5d1cda3efe1d7a7477ca70d1d1c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4eaa30a4f5d1cda3efe1d7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 23 16:07:31 2021 +0300 advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 295 +++++++++++++++++++++++--------------------- dlls/advapi32/tests/crypt.c | 55 ++++++++- 2 files changed, 206 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d4eaa30a4f5d1cda3ef…

1 0

Alexandre Julliard : msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 576c26c1f230b5a2675078277578175633121c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=576c26c1f230b5a267507827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:07:07 2021 +0100 msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcm80/Makefile.in | 2 +- dlls/msvcm80/msvcm_main.c | 13 ------------- dlls/msvcm90/Makefile.in | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index 9527713e538..5249a128a2c 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcm80.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msvcm_main.c diff --git a/dlls/msvcm80/msvcm_main.c b/dlls/msvcm80/msvcm_main.c index 0dd94ca04b5..9ebf809ab54 100644 --- a/dlls/msvcm80/msvcm_main.c +++ b/dlls/msvcm80/msvcm_main.c @@ -25,19 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcm); -BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hdll); - } - return TRUE; -} - /* void __cdecl <CrtImplementationDetails>::DoDllLanguageSupportValidation(void) */ void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) { diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index 86f56160088..25398876214 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,7 +1,7 @@ MODULE = msvcm90.dll PARENTSRC = ../msvcm80 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msvcm_main.c

1 0

Alexandre Julliard : mssip32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 1c41821291efcfa98c744d83d3e692b071d2a236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c41821291efcfa98c744d83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:07:04 2021 +0100 mssip32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssip32/Makefile.in | 2 +- dlls/mssip32/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mssip32/Makefile.in b/dlls/mssip32/Makefile.in index 665cbc915d8..02ba8071ef2 100644 --- a/dlls/mssip32/Makefile.in +++ b/dlls/mssip32/Makefile.in @@ -1,6 +1,6 @@ MODULE = mssip32.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/mssip32/main.c b/dlls/mssip32/main.c index abefdd0b1b2..a4d21b7cdd3 100644 --- a/dlls/mssip32/main.c +++ b/dlls/mssip32/main.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mssip32); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - /***************************************************** * DllRegisterServer (MSSIP32.@) */

1 0