wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : ntdll: Check the output buffer length in NtAccessCheck().
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: be98f67f10c26b46acbf2fe98ea764c27efd3612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be98f67f10c26b46acbf2fe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 19:50:11 2021 -0600 ntdll: Check the output buffer length in NtAccessCheck(). Based on a patch by Qian Hong. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 20 ++++++-------------- dlls/ntdll/unix/security.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 764e0bb5ef6..e6d2f565943 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1368,11 +1368,11 @@ static void test_AccessCheck(void) ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); - todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + ok(ntret == STATUS_BUFFER_TOO_SMALL, "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); ok(err == 0xdeadbeef, "NtAccessCheck shouldn't set last error, got %d\n", err); - todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); @@ -1383,11 +1383,11 @@ static void test_AccessCheck(void) ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); - todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + ok(ntret == STATUS_BUFFER_TOO_SMALL, "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); ok(err == 0xdeadbeef, "NtAccessCheck shouldn't set last error, got %d\n", err); - todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } @@ -1517,11 +1517,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1532,11 +1530,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1544,16 +1540,16 @@ todo_wine SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed; PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + PrivSet->PrivilegeCount = 0xdeadbeef; ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(PrivSet->PrivilegeCount == 0xdeadbeef, "buffer contents should not be changed\n"); /* Valid PrivSet with minimal sufficient PrivSetLen */ SetLastError(0xdeadbeef); @@ -1630,11 +1626,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1645,11 +1639,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 0134b80e148..8838ca13ee4 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -709,11 +709,13 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ data_size_t len; OBJECT_ATTRIBUTES attr; NTSTATUS status; + ULONG priv_len; TRACE( "(%p, %p, %08x, %p, %p, %p, %p, %p)\n", descr, token, access, mapping, privs, retlen, access_granted, access_status ); if (!privs || !retlen) return STATUS_ACCESS_VIOLATION; + priv_len = *retlen; /* reuse the object attribute SD marshalling */ InitializeObjectAttributes( &attr, NULL, 0, 0, descr ); @@ -728,16 +730,20 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ req->mapping.exec = mapping->GenericExecute; req->mapping.all = mapping->GenericAll; wine_server_add_data( req, objattr + 1, objattr->sd_len ); - wine_server_set_reply( req, privs->Privilege, *retlen - offsetof( PRIVILEGE_SET, Privilege ) ); + wine_server_set_reply( req, privs->Privilege, priv_len - offsetof( PRIVILEGE_SET, Privilege ) ); status = wine_server_call( req ); if (status == STATUS_SUCCESS) { *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); - privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); - *access_status = reply->access_status; - *access_granted = reply->access_granted; + if (priv_len >= *retlen) + { + privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); + *access_status = reply->access_status; + *access_granted = reply->access_granted; + } + else status = STATUS_BUFFER_TOO_SMALL; } } SERVER_END_REQ;

1 0

Zebediah Figura : ntdll: Do not touch the privilege output buffers if access_check fails.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: d14cf677b5825fe26b30b65fafac7962d7c279dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d14cf677b5825fe26b30b65f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 19:50:10 2021 -0600 ntdll: Do not touch the privilege output buffers if access_check fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/ntdll/unix/security.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 239c9d3caff..764e0bb5ef6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1344,7 +1344,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); /* Generic access mask - insufficient returnlength */ SetLastError(0xdeadbeef); @@ -1359,7 +1359,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); /* Key access mask - zero returnlength */ SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 8a5b1515ba9..0134b80e148 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -732,10 +732,10 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ status = wine_server_call( req ); - *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); - privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); if (status == STATUS_SUCCESS) { + *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); + privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); *access_status = reply->access_status; *access_granted = reply->access_granted; }

1 0

Zebediah Figura : ntdll: Always return at least sizeof(PRIVILEGE_SET) in NtAccessCheck().
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: bdc10c65ca8cac6881422b95997dcee8c2b96194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdc10c65ca8cac6881422b95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 19:50:09 2021 -0600 ntdll: Always return at least sizeof(PRIVILEGE_SET) in NtAccessCheck(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 10 ++-------- dlls/ntdll/unix/security.c | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index faab2bd32d7..239c9d3caff 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1374,7 +1374,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Key access mask - insufficient returnlength */ SetLastError(0xdeadbeef); @@ -1389,7 +1389,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n"); @@ -1520,7 +1520,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1536,7 +1535,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1552,7 +1550,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1567,7 +1564,6 @@ todo_wine PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); @@ -1637,7 +1633,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1653,7 +1648,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6f945b24e68..8a5b1515ba9 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -732,7 +732,7 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ status = wine_server_call( req ); - *retlen = offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len; + *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); if (status == STATUS_SUCCESS) {

1 0

Zebediah Figura : advapi32/tests: Add a couple tests for DuplicateTokenEx() access flags.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: f9d2db9345a236cffb149c2e6c00e4534659cc03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9d2db9345a236cffb149c2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 6 18:27:00 2021 -0600 advapi32/tests: Add a couple tests for DuplicateTokenEx() access flags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a368460c1de..faab2bd32d7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7926,6 +7926,37 @@ static void test_pseudo_handle_security(void) } } +static void test_duplicate_token(void) +{ + HANDLE token, token2; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT, &token); + ok(ret, "got error %u\n", GetLastError()); + + ret = DuplicateToken(token, SecurityAnonymous, &token2); + ok(ret, "got error %u\n", GetLastError()); + TEST_GRANTED_ACCESS(token2, TOKEN_QUERY | TOKEN_IMPERSONATE); + CloseHandle(token2); + + ret = DuplicateTokenEx(token, 0, NULL, SecurityAnonymous, TokenPrimary, &token2); + ok(ret, "got error %u\n", GetLastError()); + TEST_GRANTED_ACCESS(token2, TOKEN_QUERY | TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT); + CloseHandle(token2); + + ret = DuplicateTokenEx(token, MAXIMUM_ALLOWED, NULL, SecurityAnonymous, TokenPrimary, &token2); + ok(ret, "got error %u\n", GetLastError()); + TEST_GRANTED_ACCESS(token2, TOKEN_ALL_ACCESS); + CloseHandle(token2); + + ret = DuplicateTokenEx(token, TOKEN_QUERY_SOURCE, NULL, SecurityAnonymous, TokenPrimary, &token2); + ok(ret, "got error %u\n", GetLastError()); + TEST_GRANTED_ACCESS(token2, TOKEN_QUERY_SOURCE); + CloseHandle(token2); + + CloseHandle(token); +} + START_TEST(security) { init(); @@ -7989,6 +8020,7 @@ START_TEST(security) test_duplicate_handle_access(); test_create_process_token(); test_pseudo_handle_security(); + test_duplicate_token(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Michael Müller : server: Grant the same access rights when req->access is zero in duplicate_token.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: f68659c6e878070a0d9f7bc94f1f3c6fe07a2990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68659c6e878070a0d9f7bc9… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Feb 6 18:26:59 2021 -0600 server: Grant the same access rights when req->access is zero in duplicate_token. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index ec2616098c6..2ae1cb1780a 100644 --- a/server/token.c +++ b/server/token.c @@ -1358,7 +1358,8 @@ DECL_HANDLER(duplicate_token) struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd, NULL, 0, NULL, 0 ); if (token) { - reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); + unsigned int access = req->access ? req->access : get_handle_access( current->process, req->handle ); + reply->new_handle = alloc_handle_no_access_check( current->process, token, access, objattr->attributes ); release_object( token ); } release_object( src_token );

1 0

Rémi Bernon : ntdll: Print a warning or an error for other exceptions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: da3be6b0b60b509c00d39b479b4cfb21c7cf9c4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3be6b0b60b509c00d39b47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:30 2021 +0100 ntdll: Print a warning or an error for other exceptions. Depending on EH_NONCONTINUABLE. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 5 +++++ dlls/ntdll/signal_arm64.c | 5 +++++ dlls/ntdll/signal_i386.c | 5 +++++ dlls/ntdll/signal_x86_64.c | 5 +++++ include/wine/exception.h | 9 +++++++++ programs/winedbg/debugger.h | 9 --------- programs/winedbg/info.c | 6 +++--- 9 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 6b51be39be0..4594d12f8a0 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -61,6 +61,44 @@ static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0 static PRTL_EXCEPTION_FILTER unhandled_exception_filter; +const char *debugstr_exception_code( DWORD code ) +{ + switch (code) + { + case CONTROL_C_EXIT: return "CONTROL_C_EXIT"; + case DBG_CONTROL_C: return "DBG_CONTROL_C"; + case DBG_PRINTEXCEPTION_C: return "DBG_PRINTEXCEPTION_C"; + case DBG_PRINTEXCEPTION_WIDE_C: return "DBG_PRINTEXCEPTION_WIDE_C"; + case EXCEPTION_ACCESS_VIOLATION: return "EXCEPTION_ACCESS_VIOLATION"; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"; + case EXCEPTION_BREAKPOINT: return "EXCEPTION_BREAKPOINT"; + case EXCEPTION_DATATYPE_MISALIGNMENT: return "EXCEPTION_DATATYPE_MISALIGNMENT"; + case EXCEPTION_FLT_DENORMAL_OPERAND: return "EXCEPTION_FLT_DENORMAL_OPERAND"; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: return "EXCEPTION_FLT_DIVIDE_BY_ZERO"; + case EXCEPTION_FLT_INEXACT_RESULT: return "EXCEPTION_FLT_INEXACT_RESULT"; + case EXCEPTION_FLT_INVALID_OPERATION: return "EXCEPTION_FLT_INVALID_OPERATION"; + case EXCEPTION_FLT_OVERFLOW: return "EXCEPTION_FLT_OVERFLOW"; + case EXCEPTION_FLT_STACK_CHECK: return "EXCEPTION_FLT_STACK_CHECK"; + case EXCEPTION_FLT_UNDERFLOW: return "EXCEPTION_FLT_UNDERFLOW"; + case EXCEPTION_GUARD_PAGE: return "EXCEPTION_GUARD_PAGE"; + case EXCEPTION_ILLEGAL_INSTRUCTION: return "EXCEPTION_ILLEGAL_INSTRUCTION"; + case EXCEPTION_IN_PAGE_ERROR: return "EXCEPTION_IN_PAGE_ERROR"; + case EXCEPTION_INT_DIVIDE_BY_ZERO: return "EXCEPTION_INT_DIVIDE_BY_ZERO"; + case EXCEPTION_INT_OVERFLOW: return "EXCEPTION_INT_OVERFLOW"; + case EXCEPTION_INVALID_DISPOSITION: return "EXCEPTION_INVALID_DISPOSITION"; + case EXCEPTION_INVALID_HANDLE: return "EXCEPTION_INVALID_HANDLE"; + case EXCEPTION_NONCONTINUABLE_EXCEPTION: return "EXCEPTION_NONCONTINUABLE_EXCEPTION"; + case EXCEPTION_PRIV_INSTRUCTION: return "EXCEPTION_PRIV_INSTRUCTION"; + case EXCEPTION_SINGLE_STEP: return "EXCEPTION_SINGLE_STEP"; + case EXCEPTION_STACK_OVERFLOW: return "EXCEPTION_STACK_OVERFLOW"; + case EXCEPTION_WINE_ASSERTION: return "EXCEPTION_WINE_ASSERTION"; + case EXCEPTION_WINE_CXX_EXCEPTION: return "EXCEPTION_WINE_CXX_EXCEPTION"; + case EXCEPTION_WINE_NAME_THREAD: return "EXCEPTION_WINE_NAME_THREAD"; + case EXCEPTION_WINE_STUB: return "EXCEPTION_WINE_STUB"; + } + return "unknown"; +} + static VECTORED_HANDLER *add_vectored_handler( struct list *handler_list, ULONG first, PVECTORED_EXCEPTION_HANDLER func ) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 41e8666a25c..60b8ffc46d6 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -55,6 +55,7 @@ extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LD /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; +extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; /* init routines */ extern void version_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1b98dd5cc70..7c1fceb2bf0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -174,6 +174,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", context->R0, context->R1, context->R2, context->R3, context->R4, context->R5 ); TRACE( " r6=%08x r7=%08x r8=%08x r9=%08x r10=%08x r11=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 078fa947c42..e198f4e607e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -515,6 +515,11 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6ec696931e9..89ef938658c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -206,6 +206,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index df133d6fce9..7e90b109ad0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -552,6 +552,11 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { + if (rec->ExceptionFlags & EH_NONCONTINUABLE) + ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + else + WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index 3d28ff6b110..94796a78e4f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -308,6 +308,15 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) for more info. */ #define EXCEPTION_WINE_NAME_THREAD 0x406D1388 +/* used for C++ exceptions in msvcrt + * parameters: + * [0] CXX_FRAME_MAGIC + * [1] pointer to exception object + * [2] pointer to type + */ +#define EXCEPTION_WINE_CXX_EXCEPTION 0xe06d7363 +#define EXCEPTION_WINE_CXX_FRAME_MAGIC 0x19930520 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 05bf0c047ba..3bcf9d37f23 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -146,15 +146,6 @@ struct dbg_breakpoint struct expr* condition; }; -/* used for C++ exceptions in msvcrt - * parameters: - * [0] CXX_FRAME_MAGIC - * [1] pointer to exception object - * [2] pointer to type - */ -#define CXX_EXCEPTION 0xe06d7363 -#define CXX_FRAME_MAGIC 0x19930520 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 4e8580db0d4..e1f3d269649 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -951,11 +951,11 @@ void info_win32_exception(void) case EXCEPTION_FLT_STACK_CHECK: dbg_printf("floating point stack check"); break; - case CXX_EXCEPTION: - if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + case EXCEPTION_WINE_CXX_EXCEPTION: + if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = %p, type = %p, base = %p)", (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], (void*)rec->ExceptionInformation[3]);

1 0

Rémi Bernon : ntdll: Print a warning for debug print exceptions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 30ecf517e42d173f93f1e86829d397b27b96f274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ecf517e42d173f93f1e868… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:29 2021 +0100 ntdll: Print a warning for debug print exceptions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 8 ++++++++ dlls/ntdll/signal_arm64.c | 8 ++++++++ dlls/ntdll/signal_i386.c | 8 ++++++++ dlls/ntdll/signal_x86_64.c | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f4da2e5c71d..1b98dd5cc70 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -164,6 +164,14 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 88e31d88f7b..078fa947c42 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -505,6 +505,14 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a570be10024..6ec696931e9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -196,6 +196,14 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7a3fd4be204..df133d6fce9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -542,6 +542,14 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + WARN( "%s\n", debugstr_an((char *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } + else if (rec->ExceptionCode == DBG_PRINTEXCEPTION_WIDE_C) + { + WARN( "%s\n", debugstr_wn((WCHAR *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] - 1) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",

1 0

Rémi Bernon : ntdll: Print a warning for thread rename exceptions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 6edf3d3b09efe8b8350bddf068b895dd8fbf07c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edf3d3b09efe8b8350bddf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:21:28 2021 +0100 ntdll: Print a warning for thread rename exceptions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++++ dlls/ntdll/signal_arm64.c | 4 ++++ dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 4 ++++ include/wine/exception.h | 6 ++++++ programs/winedbg/debugger.h | 6 ------ programs/winedbg/gdbproxy.c | 5 +++-- programs/winedbg/tgt_active.c | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b1544ba15fe..f4da2e5c71d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,6 +160,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n", diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9db8a8b17b4..88e31d88f7b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -501,6 +501,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 93e03ae5b8b..a570be10024 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -192,6 +192,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e39991ad1a..7a3fd4be204 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -538,6 +538,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } + else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) + { + WARN( "Thread %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2], debugstr_a((char *)rec->ExceptionInformation[1]) ); + } else { TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", diff --git a/include/wine/exception.h b/include/wine/exception.h index a2b0bb08dc3..3d28ff6b110 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -302,6 +302,12 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ +/* Wine extension; Windows doesn't have a name for this code. This is an + undocumented exception understood by MS VC debugger, allowing the program + to name a particular thread. Search google.com or deja.com for "0x406d1388" + for more info. */ +#define EXCEPTION_WINE_NAME_THREAD 0x406D1388 + #ifdef __cplusplus } #endif diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..05bf0c047ba 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -155,12 +155,6 @@ struct dbg_breakpoint #define CXX_EXCEPTION 0xe06d7363 #define CXX_FRAME_MAGIC 0x19930520 -/* Wine extension; Windows doesn't have a name for this code. This is an - undocumented exception understood by MS VC debugger, allowing the program - to name a particular thread. Search google.com or deja.com for "0x406d1388" - for more info. */ -#define EXCEPTION_NAME_THREAD 0x406D1388 - /* Helper structure */ typedef struct tagTHREADNAME_INFO { diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c51fd342496..3c1b3e85df8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -63,6 +63,7 @@ #include "windef.h" #include "winbase.h" #include "tlhelp32.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -349,7 +350,7 @@ static unsigned char signal_from_debug_event(DEBUG_EVENT* de) return SIGALRM; /* should not be here */ case EXCEPTION_INVALID_HANDLE: - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: return SIGTRAP; default: ERR("Unknown exception code 0x%08x\n", ec); @@ -363,7 +364,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e switch (rec->ExceptionCode) { - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; struct dbg_thread *thread; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4e2d7d6347..e71f4615735 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -246,7 +246,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_SINGLE_STEP: is_debug = TRUE; break; - case EXCEPTION_NAME_THREAD: + case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread;

1 0

Rémi Bernon : configure: Silence a linker warning about no-PIC .text relocations.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: ac14ce8c79ebb8a2a882a5b483fa59476392b036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac14ce8c79ebb8a2a882a5b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 11:19:48 2021 +0100 configure: Silence a linker warning about no-PIC .text relocations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 +++++++++++++++++++++++++++- configure.ac | 4 +++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3f17db20fd6..8d782ad0353 100755 --- a/configure +++ b/configure @@ -9274,7 +9274,33 @@ fi case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-PIC -Wl,-z,notext" >&5 +$as_echo_n "checking whether the compiler supports -fno-PIC -Wl,-z,notext... " >&6; } +if ${ac_cv_cflags__fno_PIC__Wl__z_notext+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-PIC -Wl,-z,notext" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_PIC__Wl__z_notext=yes +else + ac_cv_cflags__fno_PIC__Wl__z_notext=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_PIC__Wl__z_notext" >&5 +$as_echo "$ac_cv_cflags__fno_PIC__Wl__z_notext" >&6; } +if test "x$ac_cv_cflags__fno_PIC__Wl__z_notext" = xyes; then : + LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext" +fi + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;; diff --git a/configure.ac b/configure.ac index 19db4f60b28..9d8f831e0fc 100644 --- a/configure.ac +++ b/configure.ac @@ -912,7 +912,9 @@ case $host_os in case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" - LDDLLFLAGS="-fno-PIC" ;; + LDDLLFLAGS="-fno-PIC" + WINE_TRY_CFLAGS([-fno-PIC -Wl,-z,notext],[LDDLLFLAGS="$LDDLLFLAGS -Wl,-z,notext"]) + ;; *) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" ;;

1 0

Rémi Bernon : windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 8f1122f8d2be5f6a383f2e73d88b9e41a735689f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1122f8d2be5f6a383f2e73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 09:11:01 2021 +0100 windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/tests/wmpformat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b0fcd34c742..89e352b8946 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -724,7 +724,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!ppIBitmapFrame) - return E_POINTER; + return E_INVALIDARG; EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/wmpformat.c b/dlls/windowscodecs/tests/wmpformat.c index c4f947d8acf..c1a320b6ec0 100644 --- a/dlls/windowscodecs/tests/wmpformat.c +++ b/dlls/windowscodecs/tests/wmpformat.c @@ -123,7 +123,7 @@ static void test_decode(void) ok(count == 1, "unexpected count %u\n", count); hr = IWICBitmapDecoder_GetFrame(decoder, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); for (j = 2; j > 0; --j) {

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021