February 2021 - Wine-commits

Alexandre Julliard : mgmtapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 986c0a8cbba1af78b0bd9fbd300abd4abcd7853b URL: https://source.winehq.org/git/wine.git/?a=commit;h=986c0a8cbba1af78b0bd9fbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:36 2021 +0100 mgmtapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/Makefile.in | 2 +- dlls/mgmtapi/mgmtapi.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in index 0093f745f8c..f179c88c658 100644 --- a/dlls/mgmtapi/Makefile.in +++ b/dlls/mgmtapi/Makefile.in @@ -1,5 +1,5 @@ MODULE = mgmtapi.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = mgmtapi.c diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c index 06c540a527e..ea4a40832b0 100644 --- a/dlls/mgmtapi/mgmtapi.c +++ b/dlls/mgmtapi/mgmtapi.c @@ -23,21 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %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; -} - BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) { FIXME("stub: %p\n", available);

1 0

Alexandre Julliard : mprapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

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 : msasn1: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: e0ff40332f570d35bc6d685a21c6c263af049ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ff40332f570d35bc6d685a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:44 2021 +0100 msasn1: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 2 +- dlls/msasn1/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index b57eda7793b..18d6d92526c 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,7 +1,7 @@ MODULE = msasn1.dll IMPORTLIB = msasn1 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index fc867e7b815..2ebaa8c485c 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -29,21 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msasn1); -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; -} - ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags, ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[],

1 0

Alexandre Julliard : msisip: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 882454539edf30fa69c9cfe16c98f6f8d46e8d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=882454539edf30fa69c9cfe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:48 2021 +0100 msisip: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/Makefile.in | 2 +- dlls/msisip/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index c19f18373ef..dd9b6ed5150 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -1,7 +1,7 @@ MODULE = msisip.dll IMPORTS = crypt32 ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 11893f149c3..6324542428a 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -28,22 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisip); -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 GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, { 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }};

1 0

Alexandre Julliard : msnet32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: cbcf26468d862576d66b2c5cd0aaca343bf0c8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbcf26468d862576d66b2c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:52 2021 +0100 msnet32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msnet32/Makefile.in | 2 +- dlls/msnet32/msnet_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 4ec8226c94b..7365debcbba 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,5 +1,5 @@ MODULE = msnet32.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = msnet_main.c diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 8303b8f1730..d765c202631 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -28,22 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msnet); -/*********************************************************************** - * DllMain (MSNET32.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * @ (MSNET32.57) */

1 0

Alexandre Julliard : mspatcha: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

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 : mssign32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

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 : mssip32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

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

Alexandre Julliard : msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 23 Feb '21

23 Feb '21

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

Nikolay Sivov : dwrite: Remove unused function.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: fba2788d835262fae6e33fc70e775ec327ca33b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba2788d835262fae6e33fc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 15:46:00 2021 +0300 dwrite: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 6528970635b..d28c6cef870 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -118,11 +118,6 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; } -static inline FLOAT get_scaled_advance_width(INT32 advance, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) -{ - return (FLOAT)advance * emSize / (FLOAT)metrics->designUnitsPerEm; -} - static inline BOOL is_simulation_valid(DWRITE_FONT_SIMULATIONS simulations) { return (simulations & ~(DWRITE_FONT_SIMULATIONS_NONE | DWRITE_FONT_SIMULATIONS_BOLD |

1 0