pangbox · jchv · Aug 6, 2024 · Aug 6, 2024 · Aug 6, 2024 · Aug 6, 2024
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -13,4 +13,6 @@ jobs:
     - uses: DeterminateSystems/nix-installer-action@v11
     - uses: DeterminateSystems/magic-nix-cache-action@v6
     - name: Check formatting
-      run: nix develop --command clang-format --dry-run -Werror src/**/*.c src/**/*.h
+      run: |
+        shopt -s globstar
+        nix develop --command clang-format --dry-run -Werror src/**/*.c src/**/*.h
diff --git a/src/common-fnptr.h b/src/common-fnptr.h
@@ -21,8 +21,7 @@
  * hook various APIs to manipulate or inspect behavior.
  */
 
-#ifndef COMMON_FNPTR_H
-#define COMMON_FNPTR_H
+#pragma once
 
 #include <windows.h>
 #include <ws2tcpip.h>
@@ -157,5 +156,3 @@ typedef int(STDCALL *PFNIJLFREEPROC)(int);
 typedef int(STDCALL *PFNIJLREADPROC)(int, int);
 typedef int(STDCALL *PFNIJLWRITEPROC)(int, int);
 typedef int(STDCALL *PFNIJLERRORSTRPROC)(int);
-
-#endif
diff --git a/src/common.h b/src/common.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef COMMON_H
-#define COMMON_H
+#pragma once
 
 #define STDCALL __stdcall
 #define EXPORT __export
@@ -76,5 +75,3 @@ VOID Exit(DWORD dwExitCode);
 PANGYAVER DetectPangyaVersion();
 PSTR GetPangyaArg(PANGYAVER pangyaVersion);
 PSTR GetSelfPath();
-
-#endif
diff --git a/src/config.h b/src/config.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "common.h"
 #include "regex.h"
@@ -58,5 +57,3 @@ void LoadJsonRugburnConfig();
 LPCSTR RewriteURL(LPCSTR url);
 BOOL RewriteAddr(LPSOCKADDR_IN addr);
 void PatchAddress();
-
-#endif
diff --git a/src/hex.h b/src/hex.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HEX_H
-#define HEX_H
+#pragma once
 
 #include "common.h"
 
@@ -24,5 +23,3 @@ DWORD FromHex(LPCSTR pHex, PVOID pData);
 
 DWORD ParseAddress(LPCSTR lpszText);
 void ParsePatch(LPCSTR lpszText, LPSTR *pDataOut, DWORD *pSizeOut);
-
-#endif
diff --git a/src/hooks/comctl32/dynamic_patch.h b/src/hooks/comctl32/dynamic_patch.h
@@ -15,11 +15,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_COMCTL32_DYNAMIC_PATH
-#define HOOKS_COMCTL32_DYNAMIC_PATH
+#pragma once
 
 #include "../../common.h"
 
 VOID InitComCtl32Hook();
-
-#endif // !HOOKS_COMCTL32_DYNAMIC_PATH
diff --git a/src/hooks/hooks.h b/src/hooks/hooks.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_HOOKS_H
-#define HOOKS_HOOKS_H
+#pragma once
 
 #include "../common.h"
 
 VOID InitHooks();
-
-#endif
diff --git a/src/hooks/kernel32/inject.h b/src/hooks/kernel32/inject.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_KERNEL32_INJECT_H
-#define HOOKS_KERNEL32_INJECT_H
+#pragma once
 
 #include "../../common.h"
 
 VOID InitInjectHook();
-
-#endif
diff --git a/src/hooks/msvcr100/msvcr100.h b/src/hooks/msvcr100/msvcr100.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_MSVCR100_MSVCR100_H
-#define HOOKS_MSVCR100_MSVCR100_H
+#pragma once
 
 #include "../../common.h"
 
 VOID InitMsvcrHook();
-
-#endif
diff --git a/src/hooks/projectg/us852/ranking.h b/src/hooks/projectg/us852/ranking.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_PROJECTG_US852_RANKING_H
-#define HOOKS_PROJECTG_US852_RANKING_H
+#pragma once
 
 #include "../../../common.h"
 
 VOID InitUS852RankingHook();
-
-#endif
diff --git a/src/hooks/user32/window.h b/src/hooks/user32/window.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_USER32_WINDOW_H
-#define HOOKS_USER32_WINDOW_H
+#pragma once
 
 #include "../../common.h"
 
 VOID InitWindowHook();
-
-#endif
diff --git a/src/hooks/wininet/netredir.h b/src/hooks/wininet/netredir.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_WININET_NETREDIR_H
-#define HOOKS_WININET_NETREDIR_H
+#pragma once
 
 #include "../../common.h"
 
 VOID InitNetRedirHook();
-
-#endif
diff --git a/src/hooks/ws2_32/redir.h b/src/hooks/ws2_32/redir.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef HOOKS_WS2_32_REDIR_H
-#define HOOKS_WS2_32_REDIR_H
+#pragma once
 
 #include "../../common.h"
 
 VOID InitRedirHook();
-
-#endif
diff --git a/src/ijl15.c b/src/ijl15.c
@@ -1,17 +1,28 @@
+/**
+ * Copyright 2018-2024 John Chadwick <john@jchw.io>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any purpose
+ * with or without fee is hereby granted, provided that the above copyright notice
+ * and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+
 #include <windows.h>
+
 #include "../third_party/ijl/ijl.h"
 
-const IJLibVersion *__stdcall ijlGetLibVersionWrapper() {
-    return ijlGetLibVersion();
-}
+const IJLibVersion *__stdcall ijlGetLibVersionWrapper() { return ijlGetLibVersion(); }
 
-IJLERR __stdcall ijlInitWrapper(JPEG_CORE_PROPERTIES *jcprops) {
-    return ijlInit(jcprops);
-}
+IJLERR __stdcall ijlInitWrapper(JPEG_CORE_PROPERTIES *jcprops) { return ijlInit(jcprops); }
 
-IJLERR __stdcall ijlFreeWrapper(JPEG_CORE_PROPERTIES *jcprops) {
-    return ijlFree(jcprops);
-}
+IJLERR __stdcall ijlFreeWrapper(JPEG_CORE_PROPERTIES *jcprops) { return ijlFree(jcprops); }
 
 IJLERR __stdcall ijlReadWrapper(JPEG_CORE_PROPERTIES *jcprops, IJLIOTYPE iotype) {
     return ijlRead(jcprops, iotype);
@@ -21,6 +32,4 @@ IJLERR __stdcall ijlWriteWrapper(JPEG_CORE_PROPERTIES *jcprops, IJLIOTYPE iotype
     return ijlWrite(jcprops, iotype);
 }
 
-const char *__stdcall ijlErrorStrWrapper(IJLERR code) {
-    return ijlErrorStr(code);
-}
+const char *__stdcall ijlErrorStrWrapper(IJLERR code) { return ijlErrorStr(code); }
diff --git a/src/json.h b/src/json.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef JSON_H
-#define JSON_H
+#pragma once
 
 #include "common.h"
 
@@ -50,5 +49,3 @@ int JsonReadInteger(LPSTR *json);
 BOOL JsonReadBool(LPSTR *json);
 void JsonReadMap(LPSTR *json, LFNREADMAPVALUECB valuefn);
 void JsonReadArray(LPSTR *json, LFNREADARRAYVALUECB valuefn);
-
-#endif
diff --git a/src/ld.h b/src/ld.h
@@ -14,11 +14,8 @@
  * THIS SOFTWARE.
  */
 
-#ifndef LD_H
-#define LD_H
+#pragma once
 
 #include "common.h"
 
 unsigned int LenDisasm(LPVOID address);
-
-#endif
diff --git a/src/patch.h b/src/patch.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef PATCH_H
-#define PATCH_H
+#pragma once
 
 #include "common.h"
 
@@ -28,5 +27,3 @@ PVOID HookProc(HMODULE hModule, LPCSTR szName, PVOID pfnTargetProc);
 PVOID BuildThiscallToStdcallThunk(PVOID pfnProc);
 PVOID BuildStdcallToThiscallThunk(PVOID pfnProc);
 PVOID BuildStdcallToVirtualThiscallThunk(DWORD dwVtblOffset);
-
-#endif
diff --git a/src/regex.h b/src/regex.h
@@ -14,8 +14,7 @@
  * THIS SOFTWARE.
  */
 
-#ifndef RE_H
-#define RE_H
+#pragma once
 
 #include "common.h"
 
@@ -28,5 +27,3 @@ LPSTR ReReplace(REGEX *find, LPCSTR replace, LPCSTR text);
 int ReGetNumCaptures(REGEX *pattern);
 int ReGetCaptureLen(REGEX *pattern, int i);
 void ReGetCaptureData(REGEX *pattern, int i, LPSTR buffer);
-
-#endif