February 2021 - Wine-commits

Alexandre Julliard : atmlib: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 4505bcedfe4d58faf221fa37b34c87d1ade40800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4505bcedfe4d58faf221fa37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:59 2021 +0100 atmlib: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/Makefile.in | 2 +- dlls/atmlib/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in index f8bd6758568..3290523113e 100644 --- a/dlls/atmlib/Makefile.in +++ b/dlls/atmlib/Makefile.in @@ -1,6 +1,6 @@ MODULE = atmlib.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index 4baeb9d31d8..e416195c408 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(atmlib); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -} - BOOL WINAPI ATMProperlyLoaded(void) { FIXME("stub\n");

1 0

Alexandre Julliard : authz: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 1c5a00d26592037d11b91fa15d537a0eb3cc3fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5a00d26592037d11b91fa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:04 2021 +0100 authz: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/Makefile.in | 2 +- dlls/authz/authz.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index 91a070485bb..33244b45b06 100644 --- a/dlls/authz/Makefile.in +++ b/dlls/authz/Makefile.in @@ -1,6 +1,6 @@ MODULE = authz.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ authz.c diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 72d462d3bb8..879207dd9b6 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -27,24 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(authz); -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; - default: - break; - } - - return TRUE; -} - /*********************************************************************** * AuthzInitializeResourceManager (AUTHZ.@) */

1 0

Alexandre Julliard : avrt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: edc4fb8e9f9817134370e7ff7e9f43cdb6be3ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edc4fb8e9f9817134370e7ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:08 2021 +0100 avrt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avrt/Makefile.in | 2 +- dlls/avrt/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in index 49f5b291ef2..d796989b4ea 100644 --- a/dlls/avrt/Makefile.in +++ b/dlls/avrt/Makefile.in @@ -2,7 +2,7 @@ MODULE = avrt.dll IMPORTLIB = avrt IMPORTS = user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 258c525e198..abcf0ab68ab 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -38,22 +38,6 @@ static inline WCHAR *heap_strdupAW(const char *src) return dst; } -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; -} - HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) { WCHAR *nameW = NULL;

1 0

Alexandre Julliard : clusapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: b40a032e943d4f0bee4feeafcdb810652cf961ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40a032e943d4f0bee4feeaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:12 2021 +0100 clusapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/clusapi/Makefile.in | 2 +- dlls/clusapi/clusapi.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index 2084e289aae..3d09512e630 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = clusapi.dll IMPORTLIB = clusapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ clusapi.c diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index 88c6fbfc12b..b1dde6f0290 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -115,20 +115,3 @@ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWST return ERROR_NO_MORE_ITEMS; } - -/*********************************************************************** - * DllMain (CLUSAPI.@) - * - */ -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 ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : compstui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 3d154c7e2d3a1eba093cc99e79b69a2604197b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d154c7e2d3a1eba093cc99e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:16 2021 +0100 compstui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/Makefile.in | 2 +- dlls/compstui/compstui_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/compstui/Makefile.in b/dlls/compstui/Makefile.in index 2cbc2ed6729..124d9f16270 100644 --- a/dlls/compstui/Makefile.in +++ b/dlls/compstui/Makefile.in @@ -1,7 +1,7 @@ MODULE = compstui.dll IMPORTLIB = compstui -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ compstui_main.c diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index e05acdc0fad..8dc715666c4 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -31,25 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(compstui); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%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; -} - /****************************************************************** * CommonPropertySheetUIA (COMPSTUI.@) *

1 0

Alexandre Julliard : connect: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 666ffbef54611a2435d6333aa7106418f1282f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=666ffbef54611a2435d6333a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:20 2021 +0100 connect: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/connect/Makefile.in | 2 +- dlls/connect/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/connect/Makefile.in b/dlls/connect/Makefile.in index f2396138b68..97c6e8ea0a4 100644 --- a/dlls/connect/Makefile.in +++ b/dlls/connect/Makefile.in @@ -1,6 +1,6 @@ MODULE = connect.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/connect/main.c b/dlls/connect/main.c index 95dca3db324..fb84e8cc876 100644 --- a/dlls/connect/main.c +++ b/dlls/connect/main.c @@ -25,20 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(connect); -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; -} - HRESULT WINAPI IsInternetConnected(void) { FIXME("stub, faking success!\n");

1 0

Alexandre Julliard : cryptext: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: b4c45930591b6eb48c7016e9370358ae6850b142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c45930591b6eb48c7016e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:24 2021 +0100 cryptext: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptext/Makefile.in | 2 +- dlls/cryptext/cryptext_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in index 9c9f84cee87..3acce60ae88 100644 --- a/dlls/cryptext/Makefile.in +++ b/dlls/cryptext/Makefile.in @@ -1,6 +1,6 @@ MODULE = cryptext.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ cryptext_main.c diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c index f7c7bd1f554..537ba66cd3b 100644 --- a/dlls/cryptext/cryptext_main.c +++ b/dlls/cryptext/cryptext_main.c @@ -26,22 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptext); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - /*********************************************************************** * CryptExtAddPFX (CRYPTEXT.@) */

1 0

Alexandre Julliard : d3drm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7526f9d434e0f4135e2d8ef26ef9101badd9320e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7526f9d434e0f4135e2d8ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:28 2021 +0100 d3drm: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/d3drm_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 1c2cbf4c9f9..db7f25609cf 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -2,7 +2,7 @@ MODULE = d3drm.dll IMPORTLIB = d3drm IMPORTS = d3dxof ddraw -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 075b331e051..be7b8101fe8 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -20,22 +20,6 @@ #include "initguid.h" #include "d3drm_private.h" -/*********************************************************************** - * DllMain (D3DRM.@) - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - void d3drm_object_init(struct d3drm_object *object, const char *classname) { object->ref = 1;

1 0

Alexandre Julliard : d3dx10: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 174bfbc1c13118a983ce1142fa9ea6c74ea4b936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=174bfbc1c13118a983ce1142… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:32 2021 +0100 d3dx10: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/Makefile.in | 2 +- dlls/d3dx10_33/d3dx10_33_main.c | 14 -------------- dlls/d3dx10_34/Makefile.in | 2 +- dlls/d3dx10_34/d3dx10_34_main.c | 14 -------------- dlls/d3dx10_35/Makefile.in | 2 +- dlls/d3dx10_35/d3dx10_35_main.c | 14 -------------- dlls/d3dx10_36/Makefile.in | 2 +- dlls/d3dx10_36/d3dx10_36_main.c | 14 -------------- dlls/d3dx10_37/Makefile.in | 2 +- dlls/d3dx10_37/d3dx10_37_main.c | 14 -------------- dlls/d3dx10_38/Makefile.in | 2 +- dlls/d3dx10_38/d3dx10_38_main.c | 14 -------------- dlls/d3dx10_39/Makefile.in | 2 +- dlls/d3dx10_39/d3dx10_39_main.c | 14 -------------- dlls/d3dx10_40/Makefile.in | 2 +- dlls/d3dx10_40/d3dx10_40_main.c | 14 -------------- dlls/d3dx10_41/Makefile.in | 2 +- dlls/d3dx10_41/d3dx10_41_main.c | 14 -------------- dlls/d3dx10_42/Makefile.in | 2 +- dlls/d3dx10_42/d3dx10_42_main.c | 14 -------------- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 14 -------------- 22 files changed, 11 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=174bfbc1c13118a983ce…

1 0

Alexandre Julliard : d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 0fee3fc46fe684f451952d2d775aab117ba64f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fee3fc46fe684f451952d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:37 2021 +0100 d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 2 +- dlls/d3dx11_43/Makefile.in | 2 +- dlls/d3dx11_43/main.c | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 41792c9fd0a..dbc31e2407d 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -3,7 +3,7 @@ MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index bf5a263b284..b69f3f1ce02 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -3,7 +3,7 @@ MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index e8eac58cbbe..950f6d76f5c 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -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; -} - BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION;

1 0