Merge remote-tracking branch 'origin/master' into version/4.1

2023-08-10 05:06:21 +02:00
parent 56a8e454ca 0e22fa6d0f
commit dec80269cb
28 changed files with 444 additions and 208 deletions
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -1250,6 +1250,12 @@ plat_language_code_r(uint32_t lcid, char *outbuf, int len)
    c16stombs(outbuf, buffer, len);
 }

+void
+plat_get_cpu_string(char *outbuf, uint8_t len) {
+    char cpu_string[] = "Unknown";
+    strncpy(outbuf, cpu_string, len);
+}
+
 void
 take_screenshot(void)
 {