From 56b5e0862c60f6c8ede706fa46c3a50c4dca0a4f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 4 Apr 2003 19:41:31 +0000 Subject: [PATCH] Remove the Wine-specific EXCEPTION_CRITICAL_SECTION_WAIT define. --- dlls/ntdll/critsection.c | 2 +- include/winbase.h | 3 --- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/winedbg.c | 2 +- win32/except.c | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index a0083b5ca16..24474ffffd6 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -172,7 +172,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) /* Throw exception only for Wine internal locks */ if (!crit->DebugInfo) continue; - rec.ExceptionCode = EXCEPTION_CRITICAL_SECTION_WAIT; + rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; rec.ExceptionFlags = 0; rec.ExceptionRecord = NULL; rec.ExceptionAddress = RtlRaiseException; /* sic */ diff --git a/include/winbase.h b/include/winbase.h index a1893e3759f..121cbe6597c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -813,9 +813,6 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE #define EXCEPTION_INVALID_HANDLE STATUS_INVALID_HANDLE #define CONTROL_C_EXIT STATUS_CONTROL_C_EXIT -/* Wine extension; Windows doesn't have a name for this code */ -#define EXCEPTION_CRITICAL_SECTION_WAIT 0xc0000194 - #define DUPLICATE_CLOSE_SOURCE 0x00000001 #define DUPLICATE_SAME_ACCESS 0x00000002 diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e7840b30dbe..a7d4f9c07c1 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -543,7 +543,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e gdbctx->last_sig = SIGINT; ret = TRUE; break; - case EXCEPTION_CRITICAL_SECTION_WAIT: + case STATUS_POSSIBLE_DEADLOCK: gdbctx->last_sig = SIGALRM; ret = TRUE; /* FIXME: we could also add here a O packet with additional information */ diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index f23d3ae325a..ec575396dfd 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -552,7 +552,7 @@ static BOOL DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL case CONTROL_C_EXIT: DEBUG_Printf(DBG_CHN_MESG, "^C"); break; - case EXCEPTION_CRITICAL_SECTION_WAIT: + case STATUS_POSSIBLE_DEADLOCK: { DBG_ADDR addr; diff --git a/win32/except.c b/win32/except.c index 149f5fef224..c30bca4f3e1 100644 --- a/win32/except.c +++ b/win32/except.c @@ -127,7 +127,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in case CONTROL_C_EXIT: len = snprintf( buffer, size, "Unhandled ^C"); break; - case EXCEPTION_CRITICAL_SECTION_WAIT: + case STATUS_POSSIBLE_DEADLOCK: len = snprintf( buffer, size, "Critical section %08lx wait failed", rec->ExceptionInformation[0]); break;