Merge pull request #185 from RadWolfie/minor-fixes

Minor fixes
Cxbx-Reloaded · Feb 9, 2023 · df9a6a6 · df9a6a6
2 parents 066a9cc + 3dafa0a
commit df9a6a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/test/libverify/D3D8.cpp b/src/test/libverify/D3D8.cpp
@@ -369,8 +369,8 @@ static const library_list database_full = {
     REGISTER_SYMBOL_INLINE(D3D_CommonSetRenderTarget, VER_RANGE(4627, VER_MAX, VER_NONE, VER_NONE)),
     REGISTER_SYMBOL_INLINE(D3D_CreateStandAloneSurface, VER_RANGE(4034, VER_MAX, VER_NONE, VER_NONE)),
     REGISTER_SYMBOLS(D3D_DestroyResource,
-        REGISTER_SYMBOL(D3D_DestroyResource, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
-        REGISTER_SYMBOL(D3D_DestroyResource__LTCG, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: missing param usage
+                     REGISTER_SYMBOL(D3D_DestroyResource, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
+                     REGISTER_SYMBOL(D3D_DestroyResource__LTCG, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: missing param usage
     REGISTER_SYMBOL_INLINE(D3D_EnumAdapterModes, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
     REGISTER_SYMBOL_INLINE(D3D_GetAdapterDisplayMode, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
     REGISTER_SYMBOL_INLINE(D3D_GetAdapterIdentifier, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
@@ -384,23 +384,22 @@ static const library_list database_full = {
     REGISTER_SYMBOL_INLINE(D3D_SetTileNoWait, VER_RANGE(4627, VER_MAX, VER_NONE, VER_NONE)),
 
     REGISTER_SYMBOL_INLINE(D3D_UpdateProjectionViewportTransform, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
-
     REGISTER_SYMBOL_INLINE(Direct3D_CheckDeviceMultiSampleType, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
     REGISTER_SYMBOLS(Direct3D_CreateDevice,
-        REGISTER_SYMBOL(Direct3D_CreateDevice, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
+                     REGISTER_SYMBOL(Direct3D_CreateDevice, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
                      REGISTER_SYMBOL(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
                      REGISTER_SYMBOL(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
                      REGISTER_SYMBOL(Direct3D_CreateDevice_4, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
     REGISTER_SYMBOLS(D3D8_Get2DSurfaceDesc,
-        REGISTER_SYMBOL(Get2DSurfaceDesc, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
-        REGISTER_SYMBOL(Get2DSurfaceDesc_0, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)), // NOTE: LTCG usage
-        REGISTER_SYMBOL(Get2DSurfaceDesc_4, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
+                     REGISTER_SYMBOL(Get2DSurfaceDesc, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
+                     REGISTER_SYMBOL(Get2DSurfaceDesc_0, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),  // NOTE: LTCG usage
+                     REGISTER_SYMBOL(Get2DSurfaceDesc_4, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
     REGISTER_SYMBOLS(D3D8_Lock2DSurface,
-        REGISTER_SYMBOL(Lock2DSurface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
-        REGISTER_SYMBOL(Lock2DSurface_16, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
+                     REGISTER_SYMBOL(Lock2DSurface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
+                     REGISTER_SYMBOL(Lock2DSurface_16, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
     REGISTER_SYMBOLS(D3D8_Lock3DSurface,
-        REGISTER_SYMBOL(Lock3DSurface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
-        REGISTER_SYMBOL(Lock3DSurface_16, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
+                     REGISTER_SYMBOL(Lock3DSurface, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE)),
+                     REGISTER_SYMBOL(Lock3DSurface_16, VER_RANGE(3911, VER_MAX, VER_NONE, VER_NONE))), // NOTE: LTCG usage
     REGISTER_SYMBOLS(D3D_MakeRequestedSpace,
                      REGISTER_SYMBOL(D3D_MakeRequestedSpace_4, VER_RANGE(4034, 4134, VER_NONE, VER_NONE)),
                      REGISTER_SYMBOL(D3D_MakeRequestedSpace_8, VER_RANGE(4134, VER_MAX, VER_NONE, VER_NONE)),

diff --git a/src/test/scripts/_unittest_cache.bat b/src/test/scripts/_unittest_cache.bat
@@ -11,11 +11,11 @@ FOR /F "tokens=1,2 delims=d" %%A IN ("-%~a1") DO (
  IF "%%B" neq "" (
   :: input is a directory
   SET /A dirC+=1
-  SET dirs[!dirC!]=%~s1
+  SET "dirs[!dirC!]=%~s1"
  ) else if "%%A" neq "-" (
   :: input is a file
   SET /A fileC+=1
-  SET xbes[!fileC!]=%~s1
+  SET "xbes[!fileC!]=%~s1"
  ) else (
   ECHO ERROR: "%~1" does not exist
  )
@@ -33,7 +33,7 @@ SET "dir=!dirs[%dirI%]!"
 :: Look in each sub directory to find filtered files found.
 FOR /R "%dir%" %%i IN (*.xbe) DO (
   SET /A fileC+=1
-  SET xbes[!fileC!]=%%~si
+  SET "xbes[!fileC!]=%%~si"
 )
 SET /A dirI+=1
 :: Continue loop until we hit the limit