Add non-Windows backends to a few classes by madebr · Pull Request #105 · w3dhub/OpenW3D

madebr · 2026-03-22T23:58:14Z

Use SDL3 for getting SDL3 tick count and frequency (this ended up mostly used by the test suite, which are not currently built)
Add alternative implementation to ResourceClass: instead of using Windows-only *.res files, embed resources using a code generator (see cmake/embed.{cmake,py})
Remove unused LaunchWebBrowser function
~~modeless dialogs were not used, so remove this ability~~
restore accelerators in renegade's resources
Remove unused obfuscation: the game is open source
Add SDL3 backend to opening, reading and writing files (this commit series first implements it using stdio, before switching it away with SDL3-specific symbols). The SDL3-based implementation is more powerful when other platforms enter the picture.
I added wdump and W3DShellExt also built a FileClass related class, I added those to the CMake project and removed some duplicated sources.

caseychaos1212

CODEX review

caseychaos1212

CODEX:

Findings

High: In rawfile.cpp (line 442) the SDL3 READ|WRITE path uses SDL_IOFromFile(..., "wb+"), which truncates the file immediately. Existing callers such as tagblock.cpp (line 133) still open persistent files with Open(fname, READ|WRITE) and then read headers back, so this changes an in-place update path into silent data loss.

Medium: verchk.cpp (line 105) no longer reads the file creation time at all; it converts Get_Date_Time() instead, and the FAT day decode at verchk.cpp (line 110) is wrong ((fatDate >> 5) & 0x1f). The DATE field emitted from GameResSend.cpp (line 106) can therefore report an incorrect build timestamp.

Medium: The new SDL3 resource API tells callers to create static StaticResourceFileClass objects in rcfile.h (line 107), but those constructors register into a namespace-scope global map defined in another translation unit at rcfile.cpp (line 50). Cross-TU static initialization order is undefined, so this can fail nondeterministically before main().

caseychaos1212 · 2026-03-26T00:36:34Z

+			unsigned int dateTime = file->Get_Date_Time();
+			unsigned int fatDate = dateTime >> 16;
+			unsigned int fatTime = dateTime & 0xffff;
+			createTime->year = 1980 + (fatDate >> 9);
+			createTime->month = (fatDate >> 5) & 0xf;
+			createTime->day = (fatDate >> 5) & 0x1f;
+			createTime->hour = fatTime >> 11;
+			createTime->minute = (fatTime >> 5) & 0x3f;
+			createTime->second = 2 * (fatTime & 0x1f);
+			return true;


Medium: verchk.cpp (line 105) no longer reads the file creation time at all; it converts Get_Date_Time() instead, and the FAT day decode at verchk.cpp (line 110) is wrong ((fatDate >> 5) & 0x1f). The DATE field emitted from GameResSend.cpp (line 106) can therefore report an incorrect build timestamp.

caseychaos1212 · 2026-03-26T00:38:35Z

+	StaticResourceFileClass(const char *filename, const void *data, size_t size)
+		: m_filename(filename)
+		, m_data(data)
+		, m_size(size) {
+		Register();
+	}
+
+	~StaticResourceFileClass() {
+		Unregister();
+	}


Medium: The new SDL3 resource API tells callers to create static StaticResourceFileClass objects in rcfile.h (line 107), but those constructors register into a namespace-scope global map defined in another translation unit at rcfile.cpp (line 50). Cross-TU static initialization order is undefined, so this can fail nondeterministically before main().

NOTE: This class is not used by the main game, and can be removed there.

This partially reverts bab59cf9d4238a9821592e9a74dcedd1fc31a229

caseychaos1212 · 2026-04-07T17:30:55Z

 												NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 				#elif defined(OPENW3D_SDL3)
-					Handle = fopen(Filename, "a+");
+					Handle = SDL_IOFromFile(Filename, "a+");


This does not preserve the Win32 OPEN_ALWAYS behavior. Per SDL’s SDL_IOFromFile docs, a+ means all writes are forced to EOF even after seeking, so this is not safe for callers that do random-access updates. For example, TagBlockFile::Save_Header() seeks back to offset 0 and rewrites the header; with append mode, that write will go to the end of the file instead of overwriting the existing header.

Changed it to

Handle = SDL_IOFromFile(Filename, "r+"); if (Handle == nullptr) { Handle = SDL_IOFromFile(Filename, "w+"); }

Needs a review from a real human.

This fixes a bug introduced by 60aa437

High: rawfile.cpp READ|WRITE path no longer truncates existing files. - Changed SDL3 path from 'r+' fallback to 'r+b' then 'w+b', matching OPEN_ALWAYS semantics (preserve existing file, create if absent). Medium: verchk.cpp FAT date month field decode corrected. - Mask was 0xf (4 bits), should be 0x1f (5 bits) for FAT month field. Medium: rcfile.cpp static init order fix (cross-TU). - Replaced 'extern std::unordered_map Static_Resources' with an inline function GetStaticResources() using a function-local static (Meyers singleton), guaranteeing construction on first use. - cmake/embed.py generator updated.

OmniBlade · 2026-04-22T15:43:01Z

+    sources = {}
+    varnames = set()
+    for arg_src in args.sources:
+        match arg_src.rsplit("@", 1):


I get an invalid synatax error here on the version of python I happened to have locally here (Python 3.9)

OmniBlade · 2026-04-22T15:47:16Z

 	bool	b_placeholder;

-   Set_Port(						packet.Get(i_placeholder));
+	Set_Port(						packet.Get(i_placeholder));


Unintended whitespace change?

OmniBlade · 2026-04-22T15:52:36Z

-	0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
-	0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L,
-	0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL
+	0x00000000U, 0x77073096U, 0xEE0E612CU, 0x990951BAU,


Probably don't need the U as hex is treated as unsigned by default, just an observation though.

OmniBlade · 2026-04-22T15:55:04Z

 					Handle = CreateFileA(Filename, GENERIC_READ | GENERIC_WRITE, 0,
 												NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+				#elif defined(OPENW3D_SDL3)
+					Handle = SDL_IOFromFile(Filename, "r+");


You use r+ here and w+ below. However you have rb and wb earlier in the function, don't you need b here as well to open as binary?

OmniBlade · 2026-04-22T15:57:04Z

+				return(false);
+			}
+		#elif defined(OPENW3D_SDL3)
+			deleteok=SDL_RemovePath(Filename)?true:false;


SDL_RemovePath already returns bool, isn't the ternary a bit overkill?

Dadud · 2026-04-22T16:25:46Z

Good catch on the Python 3.9 issue in cmake/embed.py.

The syntax error comes from the match / case block, which requires Python 3.10+.

A Python 3.9-safe equivalent is:

parts = arg_src.rsplit("@", 1)
if len(parts) == 1:
    p = parts[0]
    path = pathlib.Path(p)
    name = path.name
else:
    p, name = parts
    path = pathlib.Path(p)
name = name.lower()

I tested that replacement locally and it works fine.

madebr mentioned this pull request Mar 24, 2026

feature(gitinfo): Embed version info into binary. #18

Open

caseychaos1212 self-requested a review March 24, 2026 16:22

caseychaos1212 reviewed Mar 24, 2026

View reviewed changes

Comment thread Code/wwlib/rawfile.cpp Outdated

Comment thread Code/wwlib/rawfile.cpp

Comment thread Code/wwlib/rawfile.cpp Outdated

Comment thread Code/wwlib/rawfile.cpp

Add SDL3 backend for getting CPU tick count and frequency

72b2edc

madebr force-pushed the sdl3-things branch from 0df1b29 to 227432d Compare March 25, 2026 20:07

caseychaos1212 reviewed Mar 26, 2026

View reviewed changes

madebr added 8 commits April 4, 2026 05:44

Add non-win32 backend to ResourceFileClass

cbf25b8

NOTE: This class is not used by the main game, and can be removed there.

Remove unused LaunchWebBrowser

8f2ccc6

Restore accidentally removed win32 accelerators

a507c04

This partially reverts bab59cf9d4238a9821592e9a74dcedd1fc31a229

Remove unused Obfuscate hashing function

9de1715

Remove useless obfuscation of filenames used for cheater detection

6f0b70a

Matrix manipulation in SoldierGameObj::Check is not needed

1ff299d

Implement ::Get_Version_Number

465d7e6

CRC-32 hashes are 32-bit unsigned integers: use uint32_t

4887bd0

madebr force-pushed the sdl3-things branch from 227432d to 49a830c Compare April 4, 2026 03:51

caseychaos1212 reviewed Apr 7, 2026

View reviewed changes

madebr added 5 commits April 7, 2026 19:46

Add stdio backend to FileClass classes

9b1c7c2

A zero process exit code means success

05e3a99

This fixes a bug introduced by 60aa437

cmake: add tools/wdump

ee61d28

cmake: add tools/W3DShellExt

bbd80bc

Add SDL3 backend to FileClass classes

cc473a7

madebr force-pushed the sdl3-things branch from 49a830c to cc473a7 Compare April 7, 2026 17:47

Dadud mentioned this pull request Apr 22, 2026

fix(wwlib): address CODEX review findings for PR #105 (SDL3 backends) #107

Closed

OmniBlade requested changes Apr 22, 2026

View reviewed changes

Conversation

madebr commented Mar 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

caseychaos1212 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

caseychaos1212 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Dadud commented Apr 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

madebr commented Mar 22, 2026 •

edited

Loading