February 2021 - Wine-commits

Alexandre Julliard : snmpapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: b783f1db7053dd6a6fea8827679e4ef611ad482c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b783f1db7053dd6a6fea8827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:58 2021 +0100 snmpapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/snmpapi/Makefile.in | 2 +- dlls/snmpapi/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index 90c390150c3..681215ad11b 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = snmpapi.dll IMPORTLIB = snmpapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 3c90ca20ec9..1fd98c3da8d 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -123,8 +123,6 @@ BOOL WINAPI DllMain( 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); startTime = GetTickCount64();

1 0

Alexandre Julliard : spoolss: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 48b58cf1f416b1337c938715acfb23eb8700da3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b58cf1f416b1337c938715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:03 2021 +0100 spoolss: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/Makefile.in | 2 +- dlls/spoolss/spoolss_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index a177944008a..2b61d1f78f4 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -2,7 +2,7 @@ MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ router.c \ diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index bee58755eee..bc02b43ff62 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -46,8 +46,6 @@ 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;

1 0

Alexandre Julliard : sti: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: fe17d149b01ef3b6d598cdc1110b51c87ff8a672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe17d149b01ef3b6d598cdc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:07 2021 +0100 sti: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/Makefile.in | 2 +- dlls/sti/sti_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 884fdbd57eb..411d8fe6728 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -2,7 +2,7 @@ MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ sti.c \ diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index c532ffbd6ac..b37f4d3fee2 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -137,8 +137,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); - if (fdwReason == DLL_WINE_PREATTACH) - return FALSE; return STI_DllMain(hInstDLL, fdwReason, lpvReserved); }

1 0

Alexandre Julliard : vbscript: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 96be0cfaabadfc521f00049d1d0ed3328789a88d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96be0cfaabadfc521f00049d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:12 2021 +0100 vbscript: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 2 +- dlls/vbscript/vbscript_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 50c464f11ae..c889b62b90e 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,7 +1,7 @@ MODULE = vbscript.dll IMPORTS = oleaut32 ole32 user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ compile.c \ diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 6dbf56d29a7..6143c5c1f1f 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -272,8 +272,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: DisableThreadLibraryCalls(hInstDLL); vbscript_hinstance = hInstDLL;

1 0

Alexandre Julliard : wmiutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: e925b40d1731678cd9954be0cf2f4d59cc7a2ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e925b40d1731678cd9954be0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:16 2021 +0100 wmiutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/Makefile.in | 2 +- dlls/wmiutils/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 0d0cadd0e3b..85bdd697ccd 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,7 +1,7 @@ MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index 9befe016bd4..c12b63256f8 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -117,8 +117,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 : wmp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 5f42351d0877d9366385eca19ad35445e60a40f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f42351d0877d9366385eca1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:21 2021 +0100 wmp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/wmp_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 333717c502e..b9f8f5c2aed 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,7 +1,7 @@ MODULE = wmp.dll IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ events.c \ diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 2541fc54ffb..37ae9a1ac13 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -149,8 +149,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); wmp_instance = hInstDLL;

1 0

Alexandre Julliard : wmphoto: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 02755e0a5337d06c75b90b63c4eb5c8408c46b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=02755e0a5337d06c75b90b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:26 2021 +0100 wmphoto: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/Makefile.in | 2 +- dlls/wmphoto/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 8a626e61f18..d9bfe9542f3 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -2,7 +2,7 @@ MODULE = wmphoto.dll IMPORTS = windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi PARENTSRC = ../windowscodecs -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native EXTRAINCL = $(JXRLIB_CFLAGS) C_SRCS = \ diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 7659dcb2ca8..5c92965b575 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -135,8 +135,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) windowscodecs_module = instance; DisableThreadLibraryCalls(instance); break; - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ } return TRUE;

1 0

Alexandre Julliard : wshom.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: b8f6852bc5246e156f54e8a698372e73a1770071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f6852bc5246e156f54e8a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:31 2021 +0100 wshom.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/wshom_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 6cbec442032..fc967aa3c4c 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,7 +1,7 @@ MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index a44b44ce8f4..2a7e909bcce 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -222,8 +222,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: wshom_instance = hInstDLL; DisableThreadLibraryCalls(wshom_instance);

1 0

Alexandre Julliard : ntdll: Don't set runtime info at all if it's empty.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 9e01af751ef397b93693ea6a694896a0d13477b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e01af751ef397b93693ea6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 13:34:19 2021 +0100 ntdll: Don't set runtime info at all if it's empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index c6037afafbc..f5979a980ea 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1622,12 +1622,15 @@ void init_startup_info(void) copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len ); copy_unicode_string( &src, &dst, &params->Desktop, info->desktop_len ); copy_unicode_string( &src, &dst, &params->ShellInfo, info->shellinfo_len ); - /* runtime info isn't a real string */ - params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length = info->runtime_len; - params->RuntimeInfo.Buffer = dst; - memcpy( dst, src, info->runtime_len ); - src += (info->runtime_len + 1) / sizeof(WCHAR); - dst += (info->runtime_len + 1) / sizeof(WCHAR); + if (info->runtime_len) + { + /* runtime info isn't a real string */ + params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length = info->runtime_len; + params->RuntimeInfo.Buffer = dst; + memcpy( dst, src, info->runtime_len ); + src += (info->runtime_len + 1) / sizeof(WCHAR); + dst += (info->runtime_len + 1) / sizeof(WCHAR); + } assert( (char *)src == (char *)info + info_size ); params->Environment = dst;

1 0

Alexandre Julliard : browseui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: c3280aa0d04ee837d5c50eed9ac86dd63fb4417a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3280aa0d04ee837d5c50eed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:21:35 2021 +0100 browseui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/Makefile.in | 2 +- dlls/browseui/browseui_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index a09649f81cb..76cda37a84c 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,7 +1,7 @@ MODULE = browseui.dll IMPORTS = uuid ole32 comctl32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ aclmulti.c \ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 71981d7b7f2..97f400d949e 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -165,8 +165,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); BROWSEUI_hinstance = hinst;

1 0