winapi: Run clang format on files

XboxDev · Jun 15, 2024 · 2a2392a · JayFoxRox · Jun 15, 2024 · JayFoxRox
1 parent 0b4b1d2
commit 2a2392a
Show file tree

Hide file tree

Showing 24 changed files with 108 additions and 109 deletions.
diff --git a/lib/winapi/badptr.c b/lib/winapi/badptr.c
@@ -10,7 +10,7 @@ BOOL IsBadWritePtr (LPVOID lp, UINT_PTR ucb)
     // The Microsoft implementation then probes each page.
     // For Xbox, this is not suitable because `lp` potentially points at MMIO.
 
-    //FIXME: Walk allocations in region with NtQueryVirtualMemory and check write permission?
+    // FIXME: Walk allocations in region with NtQueryVirtualMemory and check write permission?
 
     // We disallow all access for now, because memory is potentially unsafe
     return TRUE;

diff --git a/lib/winapi/debug.c b/lib/winapi/debug.c
@@ -24,5 +24,5 @@ void WINAPI OutputDebugStringA (LPCTSTR lpOutputString)
 
     __asm__ __volatile__("mov $1, %%eax\n" // $1 = BREAKPOINT_PRINT
                          "int $0x2D\n"
-                         "int $3\n": :"c" (&s));
+                         "int $3\n" : : "c"(&s));
 }
diff --git a/lib/winapi/debugapi.h b/lib/winapi/debugapi.h
@@ -8,8 +8,7 @@
 #include <windef.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 BOOL IsDebuggerPresent (VOID);

diff --git a/lib/winapi/errhandlingapi.h b/lib/winapi/errhandlingapi.h
@@ -8,8 +8,7 @@
 #include <winbase.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 VOID RaiseException (DWORD dwExceptionCode, DWORD dwExceptionFlags, DWORD nNumberOfArguments, const ULONG_PTR *lpArguments);

diff --git a/lib/winapi/fiber.c b/lib/winapi/fiber.c
@@ -29,7 +29,7 @@ static __cdecl VOID fls_init (VOID)
     InitializeListHead(&fls_nodes_list);
 }
 #pragma comment(linker, "/include:___fls_init_p")
-__attribute__((section(".CRT$XXT"))) void (__cdecl *const __fls_init_p)(void) = fls_init;
+__attribute__((section(".CRT$XXT"))) void(__cdecl *const __fls_init_p)(void) = fls_init;
 
 VOID fls_register_thread (VOID)
 {
@@ -70,11 +70,12 @@ DWORD FlsAlloc (PFLS_CALLBACK_FUNCTION lpCallback)
     EnterCriticalSection(&fls_lock);
 
     for (size_t i = 0; i < (FLS_MAXIMUM_AVAILABLE / 32); i++) {
-        if (fls_bitmap[i] == 0xFFFFFFFF) continue;
+        if (fls_bitmap[i] == 0xFFFFFFFF)
+            continue;
 
         unsigned int index = __builtin_ctz(~fls_bitmap[i]);
         fls_bitmap[i] |= (1 << index);
-        retval = i*32 + index;
+        retval = i * 32 + index;
         fls_dtors[retval] = lpCallback;
         break;
     }

diff --git a/lib/winapi/fibersapi.h b/lib/winapi/fibersapi.h
@@ -8,8 +8,7 @@
 #include <winbase.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 DWORD FlsAlloc (PFLS_CALLBACK_FUNCTION lpCallback);

diff --git a/lib/winapi/fileapi.h b/lib/winapi/fileapi.h
@@ -11,8 +11,7 @@
 #include <winnt.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 DWORD GetFileAttributesA (LPCSTR lpFileName);

diff --git a/lib/winapi/fileio.c b/lib/winapi/fileio.c
@@ -77,7 +77,7 @@ HANDLE CreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
         if (status == STATUS_OBJECT_NAME_COLLISION) {
             SetLastError(ERROR_FILE_EXISTS);
         } else if (status == STATUS_FILE_IS_A_DIRECTORY) {
-            if (lpFileName[path.Length-1] == '\\') {
+            if (lpFileName[path.Length - 1] == '\\') {
                 SetLastError(ERROR_PATH_NOT_FOUND);
             } else {
                 SetLastError(ERROR_ACCESS_DENIED);
@@ -190,7 +190,7 @@ BOOL WriteFile (HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPD
         lpOverlapped->InternalHigh = 0;
 
         status = NtWriteFile(hFile, lpOverlapped->hEvent, NULL, NULL, (PIO_STATUS_BLOCK)&lpOverlapped->Internal,
-                            (PVOID)lpBuffer, nNumberOfBytesToWrite, &overlappedOffset);
+                             (PVOID)lpBuffer, nNumberOfBytesToWrite, &overlappedOffset);
 
         // The write can finish immediately. Handle this case
         if (NT_SUCCESS(status) && status != STATUS_PENDING) {
@@ -341,7 +341,7 @@ BOOL SetFilePointerEx (HANDLE hFile, LARGE_INTEGER liDistanceToMove, PLARGE_INTE
         case FILE_CURRENT:
             status = NtQueryInformationFile(hFile, &ioStatusBlock, &positionInfo, sizeof(positionInfo), FilePositionInformation);
 
-            if(!NT_SUCCESS(status)) {
+            if (!NT_SUCCESS(status)) {
                 SetLastError(RtlNtStatusToDosError(status));
                 return FALSE;
             }

diff --git a/lib/winapi/filemanip.c b/lib/winapi/filemanip.c
@@ -356,26 +356,26 @@ BOOL CopyFileA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExi
     InitializeObjectAttributes(&objectAttributes, &targetPath, OBJ_CASE_INSENSITIVE, ObDosDevicesDirectory(), NULL);
 
     status = NtCreateFile(
-            &targetHandle,
-            FILE_GENERIC_WRITE,
-            &objectAttributes,
-            &ioStatusBlock,
-            &networkOpenInformation.AllocationSize,
-            networkOpenInformation.FileAttributes,
-            0,
-            bFailIfExists ? FILE_CREATE : FILE_SUPERSEDE,
-            FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE | FILE_SEQUENTIAL_ONLY);
+        &targetHandle,
+        FILE_GENERIC_WRITE,
+        &objectAttributes,
+        &ioStatusBlock,
+        &networkOpenInformation.AllocationSize,
+        networkOpenInformation.FileAttributes,
+        0,
+        bFailIfExists ? FILE_CREATE : FILE_SUPERSEDE,
+        FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE | FILE_SEQUENTIAL_ONLY);
     if (!NT_SUCCESS(status)) {
         NtClose(sourceHandle);
         SetLastError(RtlNtStatusToDosError(status));
         return FALSE;
     }
 
     status = NtAllocateVirtualMemory(&readBuffer,
-                                      0,
-                                      &readBufferRegionSize,
-                                      MEM_RESERVE | MEM_COMMIT,
-                                      PAGE_READWRITE);
+                                     0,
+                                     &readBufferRegionSize,
+                                     MEM_RESERVE | MEM_COMMIT,
+                                     PAGE_READWRITE);
     if (!NT_SUCCESS(status)) {
         NtClose(sourceHandle);
         NtClose(targetHandle);
@@ -418,11 +418,11 @@ BOOL CopyFileA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExi
     fileBasicInformation.LastWriteTime = networkOpenInformation.LastWriteTime;
     fileBasicInformation.FileAttributes = networkOpenInformation.FileAttributes;
     status = NtSetInformationFile(
-            targetHandle,
-            &ioStatusBlock,
-            &fileBasicInformation,
-            sizeof(fileBasicInformation),
-            FileBasicInformation);
+        targetHandle,
+        &ioStatusBlock,
+        &fileBasicInformation,
+        sizeof(fileBasicInformation),
+        FileBasicInformation);
     if (!NT_SUCCESS(status)) {
         SetLastError(RtlNtStatusToDosError(status));
         NtClose(sourceHandle);
@@ -439,8 +439,8 @@ BOOL CopyFileA (LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExi
 
     status = NtClose(targetHandle);
     if (!NT_SUCCESS(status)) {
-      SetLastError(RtlNtStatusToDosError(status));
-      return FALSE;
+        SetLastError(RtlNtStatusToDosError(status));
+        return FALSE;
     }
     return TRUE;
 }
@@ -555,7 +555,8 @@ DWORD GetLogicalDrives (VOID)
     ANSI_STRING path;
     HANDLE handle;
     OBJECT_ATTRIBUTES attributes;
-    struct {
+    struct
+    {
         OBJECT_DIRECTORY_INFORMATION objDirInfo;
         CHAR filenameBuf[2];
     } objDirInfoBuf;
@@ -614,7 +615,7 @@ DWORD GetLogicalDriveStringsA (DWORD nBufferLength, LPSTR lpBuffer)
     }
 
     if (nBufferLength == 0 || nBufferLength < requiredBufLength) {
-        return requiredBufLength+1;
+        return requiredBufLength + 1;
     }
 
     for (int bit = 0; bit < 26; bit++) {

diff --git a/lib/winapi/findfile.c b/lib/winapi/findfile.c
@@ -10,20 +10,21 @@
 #include <winerror.h>
 #include <fileapi.h>
 
-struct FileInfo {
+struct FileInfo
+{
     FILE_DIRECTORY_INFORMATION dirInfo;
     // Reserve path buffer minus the null-terminator and the first byte provided by dirInfo
-    char filename[MAX_PATH-2];
+    char filename[MAX_PATH - 2];
 };
 
 static void dirtofind (FILE_DIRECTORY_INFORMATION *dirInfo, LPWIN32_FIND_DATAA lpFindFileData)
 {
     lpFindFileData->dwFileAttributes = dirInfo->FileAttributes;
     lpFindFileData->ftCreationTime.dwLowDateTime = dirInfo->CreationTime.LowPart;
     lpFindFileData->ftCreationTime.dwHighDateTime = dirInfo->CreationTime.HighPart;
-    lpFindFileData->ftLastAccessTime.dwLowDateTime  = dirInfo->LastAccessTime.LowPart;
+    lpFindFileData->ftLastAccessTime.dwLowDateTime = dirInfo->LastAccessTime.LowPart;
     lpFindFileData->ftLastAccessTime.dwHighDateTime = dirInfo->LastAccessTime.HighPart;
-    lpFindFileData->ftLastWriteTime.dwLowDateTime  = dirInfo->LastWriteTime.LowPart;
+    lpFindFileData->ftLastWriteTime.dwLowDateTime = dirInfo->LastWriteTime.LowPart;
     lpFindFileData->ftLastWriteTime.dwHighDateTime = dirInfo->LastWriteTime.HighPart;
     lpFindFileData->nFileSizeHigh = dirInfo->EndOfFile.HighPart;
     lpFindFileData->nFileSizeLow = dirInfo->EndOfFile.LowPart;

diff --git a/lib/winapi/handleapi.c b/lib/winapi/handleapi.c
@@ -6,14 +6,14 @@
 #include <winbase.h>
 #include <xboxkrnl/xboxkrnl.h>
 
- BOOL CloseHandle (HANDLE hObject)
- {
-     NTSTATUS status = NtClose(hObject);
+BOOL CloseHandle (HANDLE hObject)
+{
+    NTSTATUS status = NtClose(hObject);
 
-     if (NT_SUCCESS(status)) {
-         return TRUE;
-     } else {
-         SetLastError(RtlNtStatusToDosError(status));
-         return FALSE;
-     }
- }
+    if (NT_SUCCESS(status)) {
+        return TRUE;
+    } else {
+        SetLastError(RtlNtStatusToDosError(status));
+        return FALSE;
+    }
+}
diff --git a/lib/winapi/handleapi.h b/lib/winapi/handleapi.h
@@ -8,8 +8,7 @@
 #include <windef.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 BOOL CloseHandle (HANDLE hObject);

diff --git a/lib/winapi/minwinbase.h b/lib/winapi/minwinbase.h
@@ -9,7 +9,8 @@
 #include <windef.h>
 #include <xboxkrnl/ntstatus.h>
 
-typedef struct _FILETIME {
+typedef struct _FILETIME
+{
     DWORD dwLowDateTime;
     DWORD dwHighDateTime;
 } FILETIME, *LPFILETIME;
@@ -35,28 +36,28 @@ typedef struct _SYSTEMTIME
     WORD wMilliseconds;
 } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
 
-#define STILL_ACTIVE                       STATUS_PENDING
-#define EXCEPTION_ACCESS_VIOLATION         STATUS_ACCESS_VIOLATION
-#define EXCEPTION_DATATYPE_MISALIGNMENT    STATUS_DATATYPE_MISALIGNMENT
-#define EXCEPTION_BREAKPOINT               STATUS_BREAKPOINT
-#define EXCEPTION_SINGLE_STEP              STATUS_SINGLE_STEP
-#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED    STATUS_ARRAY_BOUNDS_EXCEEDED
-#define EXCEPTION_FLT_DENORMAL_OPERAND     STATUS_FLOAT_DENORMAL_OPERAND
-#define EXCEPTION_FLT_DIVIDE_BY_ZERO       STATUS_FLOAT_DIVIDE_BY_ZERO
-#define EXCEPTION_FLT_INEXACT_RESULT       STATUS_FLOAT_INEXACT_RESULT
-#define EXCEPTION_FLT_INVALID_OPERATION    STATUS_FLOAT_INVALID_OPERATION
-#define EXCEPTION_FLT_OVERFLOW             STATUS_FLOAT_OVERFLOW
-#define EXCEPTION_FLT_STACK_CHECK          STATUS_FLOAT_STACK_CHECK
-#define EXCEPTION_FLT_UNDERFLOW            STATUS_FLOAT_UNDERFLOW
-#define EXCEPTION_INT_DIVIDE_BY_ZERO       STATUS_INTEGER_DIVIDE_BY_ZERO
-#define EXCEPTION_INT_OVERFLOW             STATUS_INTEGER_OVERFLOW
-#define EXCEPTION_PRIV_INSTRUCTION         STATUS_PRIVILEGED_INSTRUCTION
-#define EXCEPTION_IN_PAGE_ERROR            STATUS_IN_PAGE_ERROR
-#define EXCEPTION_ILLEGAL_INSTRUCTION      STATUS_ILLEGAL_INSTRUCTION
+#define STILL_ACTIVE STATUS_PENDING
+#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION
+#define EXCEPTION_DATATYPE_MISALIGNMENT STATUS_DATATYPE_MISALIGNMENT
+#define EXCEPTION_BREAKPOINT STATUS_BREAKPOINT
+#define EXCEPTION_SINGLE_STEP STATUS_SINGLE_STEP
+#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED STATUS_ARRAY_BOUNDS_EXCEEDED
+#define EXCEPTION_FLT_DENORMAL_OPERAND STATUS_FLOAT_DENORMAL_OPERAND
+#define EXCEPTION_FLT_DIVIDE_BY_ZERO STATUS_FLOAT_DIVIDE_BY_ZERO
+#define EXCEPTION_FLT_INEXACT_RESULT STATUS_FLOAT_INEXACT_RESULT
+#define EXCEPTION_FLT_INVALID_OPERATION STATUS_FLOAT_INVALID_OPERATION
+#define EXCEPTION_FLT_OVERFLOW STATUS_FLOAT_OVERFLOW
+#define EXCEPTION_FLT_STACK_CHECK STATUS_FLOAT_STACK_CHECK
+#define EXCEPTION_FLT_UNDERFLOW STATUS_FLOAT_UNDERFLOW
+#define EXCEPTION_INT_DIVIDE_BY_ZERO STATUS_INTEGER_DIVIDE_BY_ZERO
+#define EXCEPTION_INT_OVERFLOW STATUS_INTEGER_OVERFLOW
+#define EXCEPTION_PRIV_INSTRUCTION STATUS_PRIVILEGED_INSTRUCTION
+#define EXCEPTION_IN_PAGE_ERROR STATUS_IN_PAGE_ERROR
+#define EXCEPTION_ILLEGAL_INSTRUCTION STATUS_ILLEGAL_INSTRUCTION
 #define EXCEPTION_NONCONTINUABLE_EXCEPTION STATUS_NONCONTINUABLE_EXCEPTION
-#define EXCEPTION_STACK_OVERFLOW           STATUS_STACK_OVERFLOW
-#define EXCEPTION_INVALID_DISPOSITION      STATUS_INVALID_DISPOSITION
-#define EXCEPTION_GUARD_PAGE               STATUS_GUARD_PAGE_VIOLATION
-#define EXCEPTION_INVALID_HANDLE           STATUS_INVALID_HANDLE
+#define EXCEPTION_STACK_OVERFLOW STATUS_STACK_OVERFLOW
+#define EXCEPTION_INVALID_DISPOSITION STATUS_INVALID_DISPOSITION
+#define EXCEPTION_GUARD_PAGE STATUS_GUARD_PAGE_VIOLATION
+#define EXCEPTION_INVALID_HANDLE STATUS_INVALID_HANDLE
 
 #endif
diff --git a/lib/winapi/process.h b/lib/winapi/process.h
@@ -8,14 +8,13 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-typedef unsigned (__stdcall *_beginthreadex_proc_type)(void *);
+typedef unsigned(__stdcall *_beginthreadex_proc_type)(void *);
 
-uintptr_t __cdecl _beginthreadex (void *_Security, unsigned _StackSize, _beginthreadex_proc_type _StartAddress, void *_ArgList, unsigned _InitFlag, unsigned *_ThrdAddr);
-void __cdecl _endthreadex (unsigned _ReturnCode);
+uintptr_t __cdecl _beginthreadex(void *_Security, unsigned _StackSize, _beginthreadex_proc_type _StartAddress, void *_ArgList, unsigned _InitFlag, unsigned *_ThrdAddr);
+void __cdecl _endthreadex(unsigned _ReturnCode);
 
 #ifdef __cplusplus
 }

diff --git a/lib/winapi/processthreadsapi.h b/lib/winapi/processthreadsapi.h
@@ -9,11 +9,10 @@
 #include <windef.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-typedef DWORD (__stdcall *LPTHREAD_START_ROUTINE) (LPVOID lpThreadParameter);
+typedef DWORD(__stdcall *LPTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
 HANDLE CreateThread (LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId);
 VOID ExitThread (DWORD dwExitCode);
 BOOL GetExitCodeThread (HANDLE hThread, LPDWORD lpExitCode);

diff --git a/lib/winapi/shlobj_core.h b/lib/winapi/shlobj_core.h
@@ -10,8 +10,7 @@
 #include <winnt.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 #ifndef CSIDL_APPDATA

diff --git a/lib/winapi/sync.c b/lib/winapi/sync.c
@@ -267,7 +267,7 @@ BOOL InitOnceComplete (LPINIT_ONCE lpInitOnce, DWORD dwFlags, LPVOID lpContext)
                 // init done, waiters continue because they were spinning in InitOnceBeginInitialize
                 return TRUE;
             case INITONCE_ASYNC_IN_PROGRESS:
-                if(!(dwFlags & INIT_ONCE_ASYNC)) {
+                if (!(dwFlags & INIT_ONCE_ASYNC)) {
                     SetLastError(ERROR_INVALID_PARAMETER);
                     return FALSE;
                 }
@@ -453,7 +453,8 @@ DWORD WaitForSingleObjectEx (HANDLE hHandle, DWORD dwMilliseconds, BOOL bAlertab
     while (true) {
         NTSTATUS status = NtWaitForSingleObjectEx(hHandle, UserMode, bAlertable, &duration);
 
-        if (status == STATUS_ALERTED) continue;
+        if (status == STATUS_ALERTED)
+            continue;
 
         if (!NT_SUCCESS(status)) {
             SetLastError(RtlNtStatusToDosError(status));
@@ -477,7 +478,8 @@ DWORD WaitForMultipleObjectsEx (DWORD nCount, const HANDLE *lpHandles, BOOL bWai
     while (true) {
         NTSTATUS status = NtWaitForMultipleObjectsEx(nCount, lpHandles, bWaitAll ? WaitAll : WaitAny, UserMode, bAlertable, &duration);
 
-        if (status == STATUS_ALERTED) continue;
+        if (status == STATUS_ALERTED)
+            continue;
 
         if (!NT_SUCCESS(status)) {
             SetLastError(RtlNtStatusToDosError(status));

diff --git a/lib/winapi/synchapi.h b/lib/winapi/synchapi.h
@@ -34,7 +34,6 @@ VOID WakeAllConditionVariable (PCONDITION_VARIABLE ConditionVariable);
 // UninitializeConditionVariable is an nxdk extension to free associated system resources
 VOID UninitializeConditionVariable (PCONDITION_VARIABLE ConditionVariable);
 
-
 void AcquireSRWLockExclusive (PSRWLOCK SRWLock);
 void AcquireSRWLockShared (PSRWLOCK SRWLock);
 void InitializeSRWLock (PSRWLOCK SRWLock);