Updated to version 2.26.2 for release

Fixed keyboard scancode mapping for parenthesis
(thanks to @meyraud705 for tracking down the root cause!) Fixes https://github.com/libsdl-org/SDL/issues/6787 Closes https://github.com/libsdl-org/SDL/pull/6937 (cherry picked from commit e1bd5bd071) (cherry picked from commit 74229d4a41)
2026-03-22 16:51:07 +01:00 · 2023-01-03 06:45:18 -08:00 · 2022-12-29 14:56:14 -08:00 · 2022-12-28 12:53:07 -08:00 · 2022-12-28 10:00:00 +03:00 · 2022-12-27 00:15:37 +03:00
22 changed files with 59 additions and 43 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ endif()
 # See docs/release_checklist.md
 set(SDL_MAJOR_VERSION 2)
 set(SDL_MINOR_VERSION 26)
-set(SDL_MICRO_VERSION 1)
+set(SDL_MICRO_VERSION 2)
 set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")

 # Set defaults preventing destination file conflicts
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -15,7 +15,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 26
-MICRO_VERSION = 1
+MICRO_VERSION = 2
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 DESCRIPTION = Simple DirectMedia Layer 2

--- a/Makefile.w32
+++ b/Makefile.w32
@@ -6,7 +6,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 26
-MICRO_VERSION = 1
+MICRO_VERSION = 2
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)

 LIBHOME = .
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.26.1</string>
+	<string>2.26.2</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.26.1</string>
+	<string>2.26.2</string>
 </dict>
 </plist>
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -9529,7 +9529,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
-				DYLIB_CURRENT_VERSION = 2601.1.0;
+				DYLIB_CURRENT_VERSION = 2601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9614,7 +9614,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
-				DYLIB_CURRENT_VERSION = 2601.1.0;
+				DYLIB_CURRENT_VERSION = 2601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -9863,7 +9863,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
-				DYLIB_CURRENT_VERSION = 2601.1.0;
+				DYLIB_CURRENT_VERSION = 2601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -9915,7 +9915,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
-				DYLIB_CURRENT_VERSION = 2601.1.0;
+				DYLIB_CURRENT_VERSION = 2601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
    private static final int SDL_MINOR_VERSION = 26;
-    private static final int SDL_MICRO_VERSION = 1;
+    private static final int SDL_MICRO_VERSION = 2;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
--- a/2
+++ b/2
@@ -3454,7 +3454,7 @@ orig_CFLAGS="$CFLAGS"
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=26
-SDL_MICRO_VERSION=1
+SDL_MICRO_VERSION=2
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=26
-SDL_MICRO_VERSION=1
+SDL_MICRO_VERSION=2
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
--- a/include/SDL_config.h.cmake
+++ b/include/SDL_config.h.cmake
@@ -539,7 +539,7 @@
 #cmakedefine SDL_VIDEO_VITA_PVR @SDL_VIDEO_VITA_PVR@
 #cmakedefine SDL_VIDEO_VITA_PVR_OGL @SDL_VIDEO_VITA_PVR_OGL@

-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if !defined(HAVE_STDINT_H) && !defined(_STDINT_H_)
 /* Most everything except Visual Studio 2008 and earlier has stdint.h now */
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef signed __int8 int8_t;
--- a/include/SDL_config_minimal.h
+++ b/include/SDL_config_minimal.h
@@ -34,7 +34,7 @@
 #define HAVE_STDARG_H   1
 #define HAVE_STDDEF_H   1

-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if !defined(HAVE_STDINT_H) && !defined(_STDINT_H_)
 /* Most everything except Visual Studio 2008 and earlier has stdint.h now */
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef signed __int8 int8_t;
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -52,7 +52,7 @@

 /* This is a set of defines to configure the SDL features */

-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if !defined(HAVE_STDINT_H) && !defined(_STDINT_H_)
 /* Most everything except Visual Studio 2008 and earlier has stdint.h now */
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 typedef signed __int8 int8_t;
--- a/include/SDL_thread.h
+++ b/include/SDL_thread.h
@@ -142,7 +142,7 @@ SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn,
 #define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
 #else
 #define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
-#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)SDL_endthread)
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
 #endif

 #elif defined(__OS2__)
@@ -175,7 +175,7 @@ SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const siz
 #undef SDL_CreateThread
 #define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
 #undef SDL_CreateThreadWithStackSize
-#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
 #else
 #define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
 #define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread)
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   26
-#define SDL_PATCHLEVEL      1
+#define SDL_PATCHLEVEL      2

 /**
 * Macro to determine SDL version program was compiled against.
--- a/src/audio/wasapi/SDL_wasapi_winrt.cpp
+++ b/src/audio/wasapi/SDL_wasapi_winrt.cpp
@@ -189,14 +189,14 @@ SDL_WasapiDeviceEventHandler::OnEnumerationCompleted(DeviceWatcher^ sender, Plat
 void
 SDL_WasapiDeviceEventHandler::OnDefaultRenderDeviceChanged(Platform::Object^ sender, DefaultAudioRenderDeviceChangedEventArgs^ args)
 {
-    SDL_assert(this->iscapture);
+    SDL_assert(!this->iscapture);
    SDL_AtomicAdd(&SDL_IMMDevice_DefaultPlaybackGeneration, 1);
 }

 void
 SDL_WasapiDeviceEventHandler::OnDefaultCaptureDeviceChanged(Platform::Object^ sender, DefaultAudioCaptureDeviceChangedEventArgs^ args)
 {
-    SDL_assert(!this->iscapture);
+    SDL_assert(this->iscapture);
    SDL_AtomicAdd(&SDL_IMMDevice_DefaultCaptureGeneration, 1);
 }

--- a/src/core/linux/SDL_dbus.c
+++ b/src/core/linux/SDL_dbus.c
@@ -54,6 +54,7 @@ LoadDBUSSyms(void)
    SDL_DBUS_SYM(connection_send);
    SDL_DBUS_SYM(connection_send_with_reply_and_block);
    SDL_DBUS_SYM(connection_close);
+    SDL_DBUS_SYM(connection_ref);
    SDL_DBUS_SYM(connection_unref);
    SDL_DBUS_SYM(connection_flush);
    SDL_DBUS_SYM(connection_read_write);
--- a/src/core/linux/SDL_dbus.h
+++ b/src/core/linux/SDL_dbus.h
@@ -46,6 +46,7 @@ typedef struct SDL_DBusContext {
    dbus_bool_t (*connection_send)(DBusConnection *, DBusMessage *, dbus_uint32_t *);
    DBusMessage *(*connection_send_with_reply_and_block)(DBusConnection *, DBusMessage *, int, DBusError *);
    void (*connection_close)(DBusConnection *);
+    void (*connection_ref)(DBusConnection *);
    void (*connection_unref)(DBusConnection *);
    void (*connection_flush)(DBusConnection *);
    dbus_bool_t (*connection_read_write)(DBusConnection *, int);
--- a/src/core/linux/SDL_ibus.c
+++ b/src/core/linux/SDL_ibus.c
@@ -477,6 +477,9 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
        result = SDL_DBus_CallMethodOnConnection(ibus_conn, ibus_service, IBUS_PATH, ibus_interface, "CreateInputContext",
                                                 DBUS_TYPE_STRING, &client_name, DBUS_TYPE_INVALID,
                                                 DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
+    } else {
+        /* re-using dbus->session_conn */
+        dbus->connection_ref(ibus_conn);
    }

    if (result) {
--- a/src/events/SDL_keysym_to_scancode.c
+++ b/src/events/SDL_keysym_to_scancode.c
@@ -238,8 +238,8 @@ static const Uint32 LinuxKeycodeKeysyms[] = {
    /* 176, 0x0b0 */    0x0, /* NoSymbol */
    /* 177, 0x0b1 */    0x1008FF78, /* XF86ScrollUp */
    /* 178, 0x0b2 */    0x1008FF79, /* XF86ScrollDown */
-    /* 179, 0x0b3 */    0x28, /* parenleft */
-    /* 180, 0x0b4 */    0x29, /* parenright */
+    /* 179, 0x0b3 */    0x0, /* NoSymbol */
+    /* 180, 0x0b4 */    0x0, /* NoSymbol */
    /* 181, 0x0b5 */    0x1008FF68, /* XF86New */
    /* 182, 0x0b6 */    0xFF66, /* Redo */
    /* 183, 0x0b7 */    0xFFCA, /* F13 */
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -752,9 +752,12 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic

        if (SDL_memcmp(&guid, &mapping_guid, sizeof(guid)) == 0) {
            Uint16 mapping_crc = 0;
-            const char *crc_string = SDL_strstr(mapping->mapping, SDL_CONTROLLER_CRC_FIELD);
-            if (crc_string) {
-                mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_CONTROLLER_CRC_FIELD_SIZE, NULL, 16); 
+
+            if (match_crc) {
+                const char *crc_string = SDL_strstr(mapping->mapping, SDL_CONTROLLER_CRC_FIELD);
+                if (crc_string) {
+                    mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_CONTROLLER_CRC_FIELD_SIZE, NULL, 16);
+                }
            }
            if (crc == mapping_crc) {
                return mapping;
@@ -767,7 +770,7 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
 /*
 * Helper function to scan the mappings database for a controller with the specified GUID
 */
-static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID guid)
+static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool create_mapping)
 {
    ControllerMapping_t *mapping;
    Uint16 vendor, product, crc;
@@ -802,6 +805,10 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
        }
    }

+    if (!create_mapping) {
+        return NULL;
+    }
+
 #if SDL_JOYSTICK_XINPUT
    if (SDL_IsJoystickXInput(guid)) {
        /* This is an XInput device */
@@ -1269,7 +1276,7 @@ SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID, const char *mappingString,
        }
    }

-    pControllerMapping = SDL_PrivateMatchControllerMappingForGUID(jGUID, SDL_TRUE, SDL_TRUE);
+    pControllerMapping = SDL_PrivateGetControllerMappingForGUID(jGUID, SDL_FALSE);
    if (pControllerMapping) {
        /* Only overwrite the mapping if the priority is the same or higher. */
        if (pControllerMapping->priority <= priority) {
@@ -1329,7 +1336,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
 {
    ControllerMapping_t *mapping;

-    mapping = SDL_PrivateGetControllerMappingForGUID(guid);
+    mapping = SDL_PrivateGetControllerMappingForGUID(guid, SDL_TRUE);
 #ifdef __LINUX__
    if (!mapping && name) {
        if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) {
@@ -1744,7 +1751,7 @@ SDL_GameControllerMappingForIndex(int mapping_index)
 char *
 SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid)
 {
-    ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(guid);
+    ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(guid, SDL_TRUE);
    if (mapping) {
        return CreateMappingString(mapping, guid);
    } else {
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -1811,7 +1811,7 @@ void SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint16 *vendor, Uint16 *prod
    Uint16 *guid16 = (Uint16 *)guid.data;
    Uint16 bus = SDL_SwapLE16(guid16[0]);

-    if (bus < ' ' && guid16[3] == 0x0000 && guid16[5] == 0x0000) {
+    if ((bus < ' ' || bus == SDL_HARDWARE_BUS_VIRTUAL) && guid16[3] == 0x0000 && guid16[5] == 0x0000) {
        /* This GUID fits the standard form:
         * 16-bit bus
         * 16-bit CRC16 of the joystick name (can be zero)
@@ -2685,14 +2685,14 @@ SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid)
        /* Additional entries                                            */
        /*****************************************************************/

-        MAKE_VIDPID(0x04d9, 0x8008),  /* OBINLB USB-HID Keyboard (Anne Pro II) */
-        MAKE_VIDPID(0x04d9, 0x8009),  /* OBINLB USB-HID Keyboard (Anne Pro II) */
-        MAKE_VIDPID(0x04d9, 0xa292),  /* OBINLB USB-HID Keyboard (Anne Pro II) */
-        MAKE_VIDPID(0x04d9, 0xa293),  /* OBINLB USB-HID Keyboard (Anne Pro II) */
-        MAKE_VIDPID(0x1532, 0x0266),  /* Razer Huntman V2 Analog, non-functional DInput device */
-        MAKE_VIDPID(0x1532, 0x0282),  /* Razer Huntman Mini Analog, non-functional DInput device */
-        MAKE_VIDPID(0x26ce, 0x01a2),  /* ASRock LED Controller */
-        MAKE_VIDPID(0x20d6, 0x0002),  /* PowerA Enhanced Wireless Controller for Nintendo Switch (charging port only) */
+        MAKE_VIDPID(0x04d9, 0x8008), /* OBINLB USB-HID Keyboard (Anne Pro II) */
+        MAKE_VIDPID(0x04d9, 0x8009), /* OBINLB USB-HID Keyboard (Anne Pro II) */
+        MAKE_VIDPID(0x04d9, 0xa292), /* OBINLB USB-HID Keyboard (Anne Pro II) */
+        MAKE_VIDPID(0x04d9, 0xa293), /* OBINLB USB-HID Keyboard (Anne Pro II) */
+        MAKE_VIDPID(0x1532, 0x0266), /* Razer Huntsman V2 Analog, non-functional DInput device */
+        MAKE_VIDPID(0x1532, 0x0282), /* Razer Huntsman Mini Analog, non-functional DInput device */
+        MAKE_VIDPID(0x26ce, 0x01a2), /* ASRock LED Controller */
+        MAKE_VIDPID(0x20d6, 0x0002), /* PowerA Enhanced Wireless Controller for Nintendo Switch (charging port only) */
    };

    static Uint32 rog_chakram_list[] = {
--- a/src/joystick/usb_ids.h
+++ b/src/joystick/usb_ids.h
@@ -48,6 +48,11 @@
 #define USB_VENDOR_VALVE        0x28de
 #define USB_VENDOR_ZEROPLUS     0x0c12

+// Most Razer devices are not game controllers, and some of them lock up or reset
+// when we send them the Sony third-party query feature report, so don't include that
+// vendor here. Instead add devices as appropriate to controller_type.c
+// Reference: https://github.com/libsdl-org/SDL/issues/6733
+//            https://github.com/libsdl-org/SDL/issues/6799
 #define SONY_THIRDPARTY_VENDOR(X)       \
    (X == USB_VENDOR_DRAGONRISE     ||  \
     X == USB_VENDOR_HORI           ||  \
@@ -57,7 +62,6 @@
     X == USB_VENDOR_POWERA         ||  \
     X == USB_VENDOR_POWERA_ALT     ||  \
     X == USB_VENDOR_QANBA          ||  \
-     X == USB_VENDOR_RAZER          ||  \
     X == USB_VENDOR_SHANWAN        ||  \
     X == USB_VENDOR_SHANWAN_ALT    ||  \
     X == USB_VENDOR_THRUSTMASTER   ||  \
--- a/src/main/windows/version.rc
+++ b/src/main/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,26,1,0
- PRODUCTVERSION 2,26,1,0
+ FILEVERSION 2,26,2,0
+ PRODUCTVERSION 2,26,2,0
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x0L
 FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "2, 26, 1, 0\0"
+            VALUE "FileVersion", "2, 26, 2, 0\0"
            VALUE "InternalName", "SDL\0"
            VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0"
            VALUE "OriginalFilename", "SDL2.dll\0"
            VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 26, 1, 0\0"
+            VALUE "ProductVersion", "2, 26, 2, 0\0"
        END
    END
    BLOCK "VarFileInfo"
Author	SHA1	Message	Date
Sam Lantinga	f070c83a60	Updated to version 2.26.2 for release	2023-01-03 06:45:18 -08:00
Sam Lantinga	d992d4f23e	Fixed keyboard scancode mapping for parenthesis (thanks to @meyraud705 for tracking down the root cause!) Fixes https://github.com/libsdl-org/SDL/issues/6787 Closes https://github.com/libsdl-org/SDL/pull/6937 (cherry picked from commit `e1bd5bd071`) (cherry picked from commit `74229d4a41`)	2022-12-29 14:56:14 -08:00
Sam Lantinga	81975cc2d0	Fixed getting the VID/PID of a virtual joystick (cherry picked from commit `e40a96155f`) (cherry picked from commit `29a4c5ebc2`)	2022-12-28 12:53:07 -08:00
Sam Lantinga	278c78e34c	Make sure we match the same way when adding a mapping and looking up a mapping Fixes https://github.com/libsdl-org/SDL/issues/6898 (cherry picked from commit `3db9112ef4`)	2022-12-28 10:00:00 +03:00
Ozkan Sezer	2462262e0c	SDL_thread.h: fix SDL_CreateThreadWithStackSize macro for OS/2 (cherry-picked from commit `738442b82a`)	2022-12-27 00:15:37 +03:00
Ozkan Sezer	162f8e6ee7	SDL_thread.h: fix beginthread param of SDL_CreateThreadWithStackSize for win32 (cherry-picked from commit `29ba5f5d64`)	2022-12-27 00:15:37 +03:00
Vincent Hamm	d0f8e63ed6	Fix SDL_CreateThreadWithStackSize not passing staacksize with win32 static api	2022-12-27 00:15:37 +03:00
Sam Lantinga	690e2f21f2	Don't send Razer devices the Sony third-party query feature report Some of them lock up or reset, and the vast majority of devices are not actually game controllers. Fixes https://github.com/libsdl-org/SDL/issues/6733 (cherry picked from commit `83b29f9ce1`)	2022-12-20 00:28:00 +03:00
Sylvain Becker	52176e25e1	DBus: add a reference to the connection Fixed bug #6712	2022-12-14 17:58:57 +01:00
Ryan C. Gordon	40698ee33c	wasapi: Fixed incorrect assertions. Fixes #6795. (cherry-picked from commit `12486e144b`)	2022-12-13 14:00:20 +03:00
Sam Lantinga	6b5610752b	Don't try to open the Razer Huntsman Elite keyboard as a controller (cherry picked from commit `817454cfe6`)	2022-12-13 01:20:11 -08:00
Sam Lantinga	2d86b4ef76	Removed check for _HAVE_STDINT_H, which nobody defines Fixes https://github.com/libsdl-org/SDL/issues/6619 (cherry picked from commit `e29c0661cc`)	2022-12-01 12:54:59 -08:00