Module: wine Branch: master Commit: 38a7e68af1170651bfef62f81e0242e9c33db281 URL: https://gitlab.winehq.org/wine/wine/-/commit/38a7e68af1170651bfef62f81e0242e...
Author: Alex Henrie alexhenrie24@gmail.com Date: Mon Sep 18 23:24:36 2023 -0600
include: Move RTL functions that belong in winnt.h from winternl.h to winnt.h.
---
include/winnt.h | 8 ++++++++ include/winternl.h | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/winnt.h b/include/winnt.h index e5dc402c694..d4137a64aea 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1911,6 +1911,10 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define WOW64_SIZE_OF_80387_REGISTERS 80 #define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512
+#ifdef __x86_64__ +NTSYSAPI BOOLEAN NTAPI RtlIsEcCode(const void*); +#endif + /* Exception definitions */
#define EXCEPTION_READ_FAULT 0 @@ -2062,6 +2066,9 @@ typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64);
#endif /* __aarch64__ */
+NTSYSAPI void NTAPI RtlRaiseException(struct _EXCEPTION_RECORD*); +NTSYSAPI void NTAPI RtlUnwind(void*,void*,struct _EXCEPTION_RECORD*,void*); + #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD_PTR,PVOID); @@ -6710,6 +6717,7 @@ typedef VOID (CALLBACK *PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WAIT,
NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); +NTSYSAPI void* NTAPI RtlPcToFileHeader(void*,void**);
typedef enum _RTL_UMS_THREAD_INFO_CLASS { diff --git a/include/winternl.h b/include/winternl.h index d3537cc774d..a233d8008ee 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4818,9 +4818,6 @@ NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTIO NTSYSAPI BOOLEAN WINAPI RtlIsCurrentProcess(HANDLE); NTSYSAPI BOOLEAN WINAPI RtlIsCurrentThread(HANDLE); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); -#ifdef __x86_64__ -NTSYSAPI BOOLEAN WINAPI RtlIsEcCode(const void*); -#endif NTSYSAPI BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlIsNormalizedString(ULONG,const WCHAR*,INT,BOOLEAN*); NTSYSAPI BOOLEAN WINAPI RtlIsProcessorFeaturePresent(UINT); @@ -4858,7 +4855,6 @@ NTSYSAPI ULONG WINAPI RtlOemStringToUnicodeSize(const STRING*); NTSYSAPI NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); -NTSYSAPI PVOID WINAPI RtlPcToFileHeader(PVOID,PVOID*); NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); @@ -4881,7 +4877,6 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGIS NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); NTSYSAPI BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); -NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlRaiseStatus(NTSTATUS); NTSYSAPI ULONG WINAPI RtlRandom(PULONG); NTSYSAPI ULONG WINAPI RtlRandomEx(PULONG); @@ -4954,7 +4949,6 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); -NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); NTSYSAPI WCHAR WINAPI RtlUpcaseUnicodeChar(WCHAR); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING *,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString(STRING*,const UNICODE_STRING*,BOOLEAN);