From 3568b6e2932623e53da3194bb5f915fbdf999e1f Mon Sep 17 00:00:00 2001 From: ssszcmawo Date: Mon, 26 Jan 2026 12:04:22 +0100 Subject: [PATCH 1/3] [rtext] Fix and enhance `TextReplace()` function (#5511) * add check for replacement,replace strcpy,strncpy with memcpy * add 4 spaces in if statement * add spaces --- src/rtext.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rtext.c b/src/rtext.c index 45aa19b13..2c871cc49 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -1727,14 +1727,15 @@ char *GetTextBetween(const char *text, const char *begin, const char *end) // Replace text string // REQUIRES: strstr(), strncpy() -// TODO: If (replacement == "") remove "search" text // WARNING: Allocated memory must be manually freed char *TextReplace(const char *text, const char *search, const char *replacement) { char *result = NULL; if ((text != NULL) && (search != NULL)) - { + { + if (replacement == NULL) replacement = ""; + char *insertPoint = NULL; // Next insert point char *temp = NULL; // Temp pointer int textLen = 0; // Text string length @@ -1767,16 +1768,15 @@ char *TextReplace(const char *text, const char *search, const char *replacement) { insertPoint = (char *)strstr(text, search); lastReplacePos = (int)(insertPoint - text); - - // TODO: Review logic to avoid strcpy() - // OK - Those lines work - temp = strncpy(temp, text, lastReplacePos) + lastReplacePos; - temp = strcpy(temp, replacement) + replaceLen; - // WRONG - But not those ones - //temp = strncpy(temp, text, tempLen - 1) + lastReplacePos; - //tempLen -= lastReplacePos; - //temp = strncpy(temp, replacement, tempLen - 1) + replaceLen; - //tempLen -= replaceLen; + + memcpy(temp, text, lastReplacePos); + temp += lastReplacePos; + + if (replaceLen > 0) + { + memcpy(temp, replacement, replaceLen); + temp += replaceLen; + } text += lastReplacePos + searchLen; // Move to next "end of replace" } From 4c71625730fe4520266fad4036f8ba11f7740429 Mon Sep 17 00:00:00 2001 From: Maicon Santana Date: Mon, 26 Jan 2026 11:04:45 +0000 Subject: [PATCH 2/3] [CI] Removing double zip and misleading zip type (#5512) * Removing double zip and misleading zip type * Removing extra spaces --------- Co-authored-by: maiconpintoabreu --- .github/workflows/build_android.yml | 6 ++++-- .github/workflows/build_linux.yml | 6 ++++-- .github/workflows/build_macos.yml | 6 ++++-- .github/workflows/build_webassembly.yml | 6 ++++-- .github/workflows/build_windows.yml | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index 80520d0b2..6993eb292 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -84,8 +84,10 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.RELEASE_NAME }}.tar.gz - path: ./build/${{ env.RELEASE_NAME }}.tar.gz + name: ${{ env.RELEASE_NAME }} + path: | + ./build/${{ env.RELEASE_NAME }} + !./build/${{ env.RELEASE_NAME }}.tar.gz - name: Upload Artifact to Release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index a76345b90..b101750bc 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -114,8 +114,10 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.RELEASE_NAME }}.tar.gz - path: ./build/${{ env.RELEASE_NAME }}.tar.gz + name: ${{ env.RELEASE_NAME }} + path: | + ./build/${{ env.RELEASE_NAME }} + !./build/${{ env.RELEASE_NAME }}.tar.gz - name: Upload Artifact to Release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 965efe249..f27140107 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -101,8 +101,10 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.RELEASE_NAME }}.tar.gz - path: ./build/${{ env.RELEASE_NAME }}.tar.gz + name: ${{ env.RELEASE_NAME }} + path: | + ./build/${{ env.RELEASE_NAME }} + !./build/${{ env.RELEASE_NAME }}.tar.gz - name: Upload Artifact to Release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/build_webassembly.yml b/.github/workflows/build_webassembly.yml index 32ae94215..d79b12b1c 100644 --- a/.github/workflows/build_webassembly.yml +++ b/.github/workflows/build_webassembly.yml @@ -71,8 +71,10 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.RELEASE_NAME }}.zip - path: ./build/${{ env.RELEASE_NAME }}.zip + name: ${{ env.RELEASE_NAME }} + path: | + ./build/${{ env.RELEASE_NAME }} + !./build/${{ env.RELEASE_NAME }}.zip - name: Upload Artifact to Release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 7a92c208a..988428403 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -142,8 +142,10 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.RELEASE_NAME }}.zip - path: ./build/${{ env.RELEASE_NAME }}.zip + name: ${{ env.RELEASE_NAME }} + path: | + ./build/${{ env.RELEASE_NAME }} + !./build/${{ env.RELEASE_NAME }}.zip - name: Upload Artifact to Release uses: softprops/action-gh-release@v1 From 63e4fd838d5e201799eec70fa826022f08b9b3bf Mon Sep 17 00:00:00 2001 From: mikeemm <42421968+mikeemm@users.noreply.github.com> Date: Tue, 27 Jan 2026 17:38:51 +0100 Subject: [PATCH 3/3] fixed typos preventing launch of native win32 backend (#5515) --- src/platforms/rcore_desktop_win32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platforms/rcore_desktop_win32.c b/src/platforms/rcore_desktop_win32.c index 28094b53f..70ebd8b92 100644 --- a/src/platforms/rcore_desktop_win32.c +++ b/src/platforms/rcore_desktop_win32.c @@ -1227,7 +1227,7 @@ void SwapScreenBuffer(void) // Get elapsed time measure in seconds double GetTime(void) { - LARGE_INTEGER now = 0; + LARGE_INTEGER now = { 0 }; QueryPerformanceCounter(&now); return (double)(now.QuadPart - CORE.Time.base)/(double)platform.timerFrequency.QuadPart; } @@ -1875,8 +1875,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara case WM_DPICHANGED: { // Get current dpi scale factor - float scalex = HIWORD(wParam)/96.0f; - float scaley = LOWORD(wParam)/96.0f; + float scalex = HIWORD(wparam)/96.0f; + float scaley = LOWORD(wparam)/96.0f; RECT *suggestedRect = (RECT *)lparam;