Module: wine Branch: master Commit: dc3623f57f072a7e1ab16156e9ee7555bd7a103e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3623f57f072a7e1ab16156e...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jul 5 13:22:48 2019 +0200
winternl.h: Remove inline DbgBreakPoint version.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/tests/debugger.c | 1 - include/winternl.h | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 691e1c0..ff25c21 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -998,7 +998,6 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); - todo_wine_if(sizeof(void*) == 4) ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n");
ret = SetEvent(event_attach); diff --git a/include/winternl.h b/include/winternl.h index 2a9ca65..49eedaf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2285,17 +2285,12 @@ typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); * Function declarations */
-#if defined(__i386__) && defined(__GNUC__) -static inline void WINAPI DbgBreakPoint(void) { __asm__ __volatile__("int3"); } -static inline void WINAPI DbgUserBreakPoint(void) { __asm__ __volatile__("int3"); } -#else /* __i386__ && __GNUC__ */ -NTSYSAPI void WINAPI DbgBreakPoint(void); -NTSYSAPI void WINAPI DbgUserBreakPoint(void); -#endif /* __i386__ && __GNUC__ */ +NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); +NTSYSAPI void WINAPI DbgUserBreakPoint(void); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddRefDll(ULONG,HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY**);