February 2021 - Wine-Commits

Alexandre Julliard : winebuild: Set Thumb bit in CPSR register on syscall entry.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 4ef8e946f161ec5f7140699f6f97d9119a4ec7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef8e946f161ec5f7140699f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:34:15 2021 +0100 winebuild: Set Thumb bit in CPSR register on syscall entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- tools/winebuild/import.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 06d8246a566..397de7dad98 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4233,7 +4233,8 @@ static void test_thread_context(void) COMPARE( R9 ); COMPARE( R10 ); COMPARE( R11 ); - COMPARE( Cpsr ); + ok( (context.Cpsr & 0xff0f0000) == (expect.Cpsr & 0xff0f0000), + "wrong Cpsr %08x/%08x\n", context.Cpsr, expect.Cpsr ); ok( context.Sp == expect.Sp - 8, "wrong Sp %08x/%08x\n", context.Sp, expect.Sp - 8 ); /* Pc is somewhere close to the NtGetContextThread implementation */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2fa9d3d430b..791ea6e400c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1611,6 +1611,7 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ output( "\tmrs ip, CPSR\n" ); + output( "\tbfi ip, lr, #5, #1\n" ); /* set thumb bit */ output( "\tstr ip, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */ output( "\tldr r5, 6f+4\n");

1 0

Alexandre Julliard : winebuild: Fix relay entry points for Thumb mode.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fe783adee51b5c3d3c0dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:34:58 2021 +0100 winebuild: Fix relay entry points for Thumb mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 8d7e48d2da4..546d058b199 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -236,7 +236,7 @@ static void output_relay_debug( DLLSPEC *spec ) ORDDEF *odp = spec->ordinals[i]; if (needs_relay( odp )) - output( "\t.long .L__wine_spec_relay_entry_point_%d-__wine_spec_relay_entry_points\n", i ); + output( "\t.long __wine_spec_relay_entry_point_%d-__wine_spec_relay_entry_points\n", i ); else output( "\t.long 0\n" ); } @@ -249,7 +249,6 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -264,7 +263,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_x86: output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\t.byte 0x8b,0xff,0x55,0x8b,0xec,0x5d\n" ); /* hotpatch prolog */ if (odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)) /* add the register arguments */ @@ -308,7 +307,7 @@ static void output_relay_debug( DLLSPEC *spec ) val = (odp->u.func.args_str_offset << 16) | (i - spec->base); output( "\t.align %d\n", get_alignment(4) ); if (thumb_mode) output( "\t.thumb_func\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); @@ -333,7 +332,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM64: output( "\t.align %d\n", get_alignment(4) ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) { @@ -372,7 +371,7 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_x86_64: output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) {

1 0

Alexandre Julliard : printui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 790ab8d24cc58f81870ecbac0128a56c9d7d7620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790ab8d24cc58f81870ecbac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:12 2021 +0100 printui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 2 +- dlls/printui/printui.c | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 8e76c7c29ff..263cc95ccfa 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,7 +1,7 @@ MODULE = printui.dll IMPORTS = shell32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ printui.c diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index f35107fa0b2..09f527bfb0a 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -210,26 +210,6 @@ static BOOL parse_rundll(context_t * cx) return TRUE; } -/***************************************************** - * 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; -} - - /***************************************************** * PrintUIEntryW [printui.@] * Commandline-Interface for using printui.dll with rundll32.exe

1 0

Alexandre Julliard : prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 88313bd112ea9908e393fd5cc76c35102cbadc98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88313bd112ea9908e393fd5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:16 2021 +0100 prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 2 +- dlls/prntvpt/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 452faa4fbf5..09818bc7b74 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -2,7 +2,7 @@ MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 197fb54022c..d6ad0cff46a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -43,21 +43,6 @@ static WCHAR *heap_strdupW(const WCHAR *src) return dst; } -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; -} - HRESULT WINAPI PTReleaseMemory(PVOID mem) { heap_free(mem);

1 0

Alexandre Julliard : query: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 0e3df155303c905a1fca243fad81e73c73eb0c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e3df155303c905a1fca243f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:23 2021 +0100 query: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 2 +- dlls/query/query_main.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 075a645d508..d2c06c4a262 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,7 +1,7 @@ MODULE = query.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ query_main.c diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index b93973addea..4312d483fc2 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -36,19 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(query); -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); - break; - } - return TRUE; -} - /*********************************************************************** * DllGetClassObject (QUERY.@) */

1 0

Alexandre Julliard : pdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 918a41e4835c4b2d5351c370b16395d0c2f002fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=918a41e4835c4b2d5351c370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 20:54:50 2021 +0100 pdh: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/Makefile.in | 2 +- dlls/pdh/pdh_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index d3ce7a4e13e..59e0442a4d0 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,7 +1,7 @@ MODULE = pdh.dll IMPORTLIB = pdh -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ pdh_main.c diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index d3bf6ab8706..73d4fef2a14 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -67,25 +67,6 @@ static inline WCHAR *pdh_strdup_aw( 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; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - DeleteCriticalSection(&pdh_handle_cs); - break; - } - - return TRUE; -} - union value { LONG longvalue;

1 0

Alexandre Julliard : slc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: aa2b3e097def9fd8b567d93e423eb964ba3b9486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2b3e097def9fd8b567d93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:53 2021 +0100 slc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/Makefile.in | 2 +- dlls/slc/slc.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in index fac1c25b192..d3d59fbb312 100644 --- a/dlls/slc/Makefile.in +++ b/dlls/slc/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SLC_ MODULE = slc.dll IMPORTLIB = slc -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ slc.c diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index ffecaa07bff..b246a7dfc1a 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -76,20 +76,3 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } - -/*********************************************************************** - * 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 : schannel: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 9fe9bb9111288cea0d18790706f7073c39b86504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe9bb9111288cea0d187907… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:41 2021 +0100 schannel: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/Makefile.in | 2 +- dlls/schannel/schannel_main.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index 492683a6b25..9eedfe02350 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -1,7 +1,7 @@ MODULE = schannel.dll IMPORTS = secur32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ lsamode.c \ diff --git a/dlls/schannel/schannel_main.c b/dlls/schannel/schannel_main.c index 5f8b5691134..dad82c9efd2 100644 --- a/dlls/schannel/schannel_main.c +++ b/dlls/schannel/schannel_main.c @@ -27,18 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(schannel); -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; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - BOOL WINAPI SslEmptyCacheA(LPSTR target, DWORD flags) { FIXME("%s %x\n", debugstr_a(target), flags);

1 0

Alexandre Julliard : qwave: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: e025648e0b295e9643db48b60142c464e09eb65a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e025648e0b295e9643db48b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:27 2021 +0100 qwave: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/Makefile.in | 2 +- dlls/qwave/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index 2a2336a935e..0c3ec4b382f 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,7 +1,7 @@ MODULE = qwave.dll IMPORTLIB = qwave -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index e256d1b8c6e..fceb5c79503 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -26,21 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qwave); -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 QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) { FIXME("%p %p stub!\n", version, handle);

1 0

Alexandre Julliard : ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 9f9d1e6675c3cf102b1a345058bb926b1bfd6b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9d1e6675c3cf102b1a3450… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:01 2021 +0100 ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 2 +- dlls/ntdsapi/ntdsapi.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index afe29a38fa6..e2f1eca4865 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -2,7 +2,7 @@ MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 929b9944846..2438197a7a3 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -27,25 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); -/***************************************************** - * 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; -} - /*********************************************************************** * DsBindA (NTDSAPI.@) */

1 0