Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

fabiangreffrath · Sep 20, 2024 · 6f412f0 · 6f412f0
2 parents 5a3e8ef + aa2c403
commit 6f412f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -78,6 +78,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install \
+            python3-yaml \
             libsdl2-dev \
             libsdl2-mixer-dev \
             libsdl2-net-dev \
@@ -95,7 +96,11 @@ jobs:
             sdl2_net \
             libpng \
             libsamplerate \
+            python3 \
             fluid-synth
+          # Since we're running CI inside a VM it doesn't really
+          # matter if we're "breaking" anything:
+          pip3 install --break-system-packages pyyaml
 
       - name: Install dependencies (MSYS2)
         if: runner.os == 'Windows'
@@ -114,6 +119,7 @@ jobs:
             ${{ matrix.config.msys-env }}-libpng
             ${{ matrix.config.msys-env }}-libsamplerate
             ${{ matrix.config.msys-env }}-fluidsynth
+            ${{ matrix.config.msys-env }}-python3-yaml
 
       - uses: actions/checkout@v4
         with:

diff --git a/quickcheck b/quickcheck
diff --git a/src/i_glob.c b/src/i_glob.c
@@ -26,7 +26,9 @@
 
 #if defined(_WIN32)
 #include <win_opendir.h>
+#ifndef S_ISDIR
 #define S_ISDIR(m)      (((m)& S_IFMT) == S_IFDIR)
+#endif
 #elif defined(HAVE_DIRENT_H)
 #include <dirent.h>
 #include <sys/stat.h>

diff --git a/win32/win_opendir.c b/win32/win_opendir.c
@@ -125,23 +125,25 @@ static __ino_t __inode(const wchar_t *name)
     typedef BOOL(__stdcall * pfnGetFileInformationByHandleEx)(
         HANDLE hFile, dirent_FILE_INFO_BY_HANDLE_CLASS FileInformationClass,
         LPVOID lpFileInformation, DWORD dwBufferSize);
+    pfnGetFileInformationByHandleEx fnGetFileInformationByHandleEx;
+    HANDLE hFile;
 
     HANDLE hKernel32 = GetModuleHandleW(L"kernel32.dll");
     if (!hKernel32)
     {
         return value;
     }
 
-    pfnGetFileInformationByHandleEx fnGetFileInformationByHandleEx =
+    fnGetFileInformationByHandleEx =
         (pfnGetFileInformationByHandleEx) GetProcAddress(
             hKernel32, "GetFileInformationByHandleEx");
     if (!fnGetFileInformationByHandleEx)
     {
         return value;
     }
 
-    HANDLE hFile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL,
-                               OPEN_EXISTING, 0, 0);
+    hFile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+                        OPEN_EXISTING, 0, 0);
     if (hFile == INVALID_HANDLE_VALUE)
     {
         return value;
@@ -172,8 +174,6 @@ static DIR *__internal_opendir(wchar_t *wname, int size)
 {
     struct __dir *data = NULL;
     struct dirent *tmp_entries = NULL;
-    static char default_char = '?';
-    static wchar_t *prefix = L"\\\\?\\";
     static wchar_t *suffix = L"\\*.*";
     static int extra_prefix = 4; /* use prefix "\\?\" to handle long file names */
     static int extra_suffix = 4; /* use suffix "\*.*" to find everything */
@@ -225,7 +225,7 @@ static DIR *__internal_opendir(wchar_t *wname, int size)
     {
         WideCharToMultiByte(CP_UTF8, 0, w32fd.cFileName, -1,
                             data->entries[data->index].d_name, NAME_MAX,
-                            &default_char, NULL);
+                            NULL, NULL);
 
         memcpy(wname + size, w32fd.cFileName, sizeof(wchar_t) * NAME_MAX);