Renamed *FromID() to *ForID()

While it makes sense to get an object pointer from an object ID, you want to get object attributes for an ID, otherwise e.g. GetNameFromID() sounds like it's a name ID, not an object ID. This is also consistent with the function naming convention in SDL2.

src/dynapi/SDL_dynapi.sym

@@ -242,24 +242,24 @@ SDL3_0.0.0 {
     SDL_GetGamepadFirmwareVersion;
     SDL_GetGamepadFromID;
     SDL_GetGamepadFromPlayerIndex;
-    SDL_GetGamepadGUIDFromID;
+    SDL_GetGamepadGUIDForID;
     SDL_GetGamepadID;
     SDL_GetGamepadJoystick;
     SDL_GetGamepadMapping;
     SDL_GetGamepadMappingForGUID;
-    SDL_GetGamepadMappingFromID;
+    SDL_GetGamepadMappingForID;
     SDL_GetGamepadMappings;
     SDL_GetGamepadName;
-    SDL_GetGamepadNameFromID;
+    SDL_GetGamepadNameForID;
     SDL_GetGamepadPath;
-    SDL_GetGamepadPathFromID;
+    SDL_GetGamepadPathForID;
     SDL_GetGamepadPlayerIndex;
-    SDL_GetGamepadPlayerIndexFromID;
+    SDL_GetGamepadPlayerIndexForID;
     SDL_GetGamepadPowerInfo;
     SDL_GetGamepadProduct;
-    SDL_GetGamepadProductFromID;
+    SDL_GetGamepadProductForID;
     SDL_GetGamepadProductVersion;
-    SDL_GetGamepadProductVersionFromID;
+    SDL_GetGamepadProductVersionForID;
     SDL_GetGamepadProperties;
     SDL_GetGamepadSensorData;
     SDL_GetGamepadSensorDataRate;
@@ -270,10 +270,10 @@ SDL3_0.0.0 {
     SDL_GetGamepadStringForType;
     SDL_GetGamepadTouchpadFinger;
     SDL_GetGamepadType;
-    SDL_GetGamepadTypeFromID;
+    SDL_GetGamepadTypeForID;
     SDL_GetGamepadTypeFromString;
     SDL_GetGamepadVendor;
-    SDL_GetGamepadVendorFromID;
+    SDL_GetGamepadVendorForID;
     SDL_GetGamepads;
     SDL_GetGlobalMouseState;
     SDL_GetGlobalProperties;
@@ -283,7 +283,7 @@ SDL3_0.0.0 {
     SDL_GetHapticFromID;
     SDL_GetHapticID;
     SDL_GetHapticName;
-    SDL_GetHapticNameFromID;
+    SDL_GetHapticNameForID;
     SDL_GetHaptics;
     SDL_GetHint;
     SDL_GetHintBoolean;
@@ -299,35 +299,35 @@ SDL3_0.0.0 {
     SDL_GetJoystickFromID;
     SDL_GetJoystickFromPlayerIndex;
     SDL_GetJoystickGUID;
-    SDL_GetJoystickGUIDFromID;
+    SDL_GetJoystickGUIDForID;
     SDL_GetJoystickGUIDFromString;
     SDL_GetJoystickGUIDInfo;
     SDL_GetJoystickGUIDString;
     SDL_GetJoystickHat;
     SDL_GetJoystickID;
     SDL_GetJoystickName;
-    SDL_GetJoystickNameFromID;
+    SDL_GetJoystickNameForID;
     SDL_GetJoystickPath;
-    SDL_GetJoystickPathFromID;
+    SDL_GetJoystickPathForID;
     SDL_GetJoystickPlayerIndex;
-    SDL_GetJoystickPlayerIndexFromID;
+    SDL_GetJoystickPlayerIndexForID;
     SDL_GetJoystickPowerInfo;
     SDL_GetJoystickProduct;
-    SDL_GetJoystickProductFromID;
+    SDL_GetJoystickProductForID;
     SDL_GetJoystickProductVersion;
-    SDL_GetJoystickProductVersionFromID;
+    SDL_GetJoystickProductVersionForID;
     SDL_GetJoystickProperties;
     SDL_GetJoystickSerial;
     SDL_GetJoystickType;
-    SDL_GetJoystickTypeFromID;
+    SDL_GetJoystickTypeForID;
     SDL_GetJoystickVendor;
-    SDL_GetJoystickVendorFromID;
+    SDL_GetJoystickVendorForID;
     SDL_GetJoysticks;
     SDL_GetKeyFromName;
     SDL_GetKeyFromScancode;
     SDL_GetKeyName;
     SDL_GetKeyboardFocus;
-    SDL_GetKeyboardNameFromID;
+    SDL_GetKeyboardNameForID;
     SDL_GetKeyboardState;
     SDL_GetKeyboards;
     SDL_GetLogOutputFunction;
@@ -339,7 +339,7 @@ SDL3_0.0.0 {
     SDL_GetMice;
     SDL_GetModState;
     SDL_GetMouseFocus;
-    SDL_GetMouseNameFromID;
+    SDL_GetMouseNameForID;
     SDL_GetMouseState;
     SDL_GetNaturalDisplayOrientation;
     SDL_GetNumAllocations;
@@ -380,7 +380,7 @@ SDL3_0.0.0 {
     SDL_GetRGB;
     SDL_GetRGBA;
     SDL_GetRealGamepadType;
-    SDL_GetRealGamepadTypeFromID;
+    SDL_GetRealGamepadTypeForID;
     SDL_GetRectAndLineIntersection;
     SDL_GetRectAndLineIntersectionFloat;
     SDL_GetRectEnclosingPoints;
@@ -421,12 +421,12 @@ SDL3_0.0.0 {
     SDL_GetSensorFromID;
     SDL_GetSensorID;
     SDL_GetSensorName;
-    SDL_GetSensorNameFromID;
+    SDL_GetSensorNameForID;
     SDL_GetSensorNonPortableType;
-    SDL_GetSensorNonPortableTypeFromID;
+    SDL_GetSensorNonPortableTypeForID;
     SDL_GetSensorProperties;
     SDL_GetSensorType;
-    SDL_GetSensorTypeFromID;
+    SDL_GetSensorTypeForID;
     SDL_GetSensors;
     SDL_GetSilenceValueForFormat;
     SDL_GetStorageFileSize;

src/dynapi/SDL_dynapi_overrides.h

@@ -267,24 +267,24 @@
 #define SDL_GetGamepadFirmwareVersion SDL_GetGamepadFirmwareVersion_REAL
 #define SDL_GetGamepadFromID SDL_GetGamepadFromID_REAL
 #define SDL_GetGamepadFromPlayerIndex SDL_GetGamepadFromPlayerIndex_REAL
-#define SDL_GetGamepadGUIDFromID SDL_GetGamepadGUIDFromID_REAL
+#define SDL_GetGamepadGUIDForID SDL_GetGamepadGUIDForID_REAL
 #define SDL_GetGamepadID SDL_GetGamepadID_REAL
 #define SDL_GetGamepadJoystick SDL_GetGamepadJoystick_REAL
 #define SDL_GetGamepadMapping SDL_GetGamepadMapping_REAL
 #define SDL_GetGamepadMappingForGUID SDL_GetGamepadMappingForGUID_REAL
-#define SDL_GetGamepadMappingFromID SDL_GetGamepadMappingFromID_REAL
+#define SDL_GetGamepadMappingForID SDL_GetGamepadMappingForID_REAL
 #define SDL_GetGamepadMappings SDL_GetGamepadMappings_REAL
 #define SDL_GetGamepadName SDL_GetGamepadName_REAL
-#define SDL_GetGamepadNameFromID SDL_GetGamepadNameFromID_REAL
+#define SDL_GetGamepadNameForID SDL_GetGamepadNameForID_REAL
 #define SDL_GetGamepadPath SDL_GetGamepadPath_REAL
-#define SDL_GetGamepadPathFromID SDL_GetGamepadPathFromID_REAL
+#define SDL_GetGamepadPathForID SDL_GetGamepadPathForID_REAL
 #define SDL_GetGamepadPlayerIndex SDL_GetGamepadPlayerIndex_REAL
-#define SDL_GetGamepadPlayerIndexFromID SDL_GetGamepadPlayerIndexFromID_REAL
+#define SDL_GetGamepadPlayerIndexForID SDL_GetGamepadPlayerIndexForID_REAL
 #define SDL_GetGamepadPowerInfo SDL_GetGamepadPowerInfo_REAL
 #define SDL_GetGamepadProduct SDL_GetGamepadProduct_REAL
-#define SDL_GetGamepadProductFromID SDL_GetGamepadProductFromID_REAL
+#define SDL_GetGamepadProductForID SDL_GetGamepadProductForID_REAL
 #define SDL_GetGamepadProductVersion SDL_GetGamepadProductVersion_REAL
-#define SDL_GetGamepadProductVersionFromID SDL_GetGamepadProductVersionFromID_REAL
+#define SDL_GetGamepadProductVersionForID SDL_GetGamepadProductVersionForID_REAL
 #define SDL_GetGamepadProperties SDL_GetGamepadProperties_REAL
 #define SDL_GetGamepadSensorData SDL_GetGamepadSensorData_REAL
 #define SDL_GetGamepadSensorDataRate SDL_GetGamepadSensorDataRate_REAL
@@ -295,10 +295,10 @@
 #define SDL_GetGamepadStringForType SDL_GetGamepadStringForType_REAL
 #define SDL_GetGamepadTouchpadFinger SDL_GetGamepadTouchpadFinger_REAL
 #define SDL_GetGamepadType SDL_GetGamepadType_REAL
-#define SDL_GetGamepadTypeFromID SDL_GetGamepadTypeFromID_REAL
+#define SDL_GetGamepadTypeForID SDL_GetGamepadTypeForID_REAL
 #define SDL_GetGamepadTypeFromString SDL_GetGamepadTypeFromString_REAL
 #define SDL_GetGamepadVendor SDL_GetGamepadVendor_REAL
-#define SDL_GetGamepadVendorFromID SDL_GetGamepadVendorFromID_REAL
+#define SDL_GetGamepadVendorForID SDL_GetGamepadVendorForID_REAL
 #define SDL_GetGamepads SDL_GetGamepads_REAL
 #define SDL_GetGlobalMouseState SDL_GetGlobalMouseState_REAL
 #define SDL_GetGlobalProperties SDL_GetGlobalProperties_REAL
@@ -308,7 +308,7 @@
 #define SDL_GetHapticFromID SDL_GetHapticFromID_REAL
 #define SDL_GetHapticID SDL_GetHapticID_REAL
 #define SDL_GetHapticName SDL_GetHapticName_REAL
-#define SDL_GetHapticNameFromID SDL_GetHapticNameFromID_REAL
+#define SDL_GetHapticNameForID SDL_GetHapticNameForID_REAL
 #define SDL_GetHaptics SDL_GetHaptics_REAL
 #define SDL_GetHint SDL_GetHint_REAL
 #define SDL_GetHintBoolean SDL_GetHintBoolean_REAL
@@ -324,35 +324,35 @@
 #define SDL_GetJoystickFromID SDL_GetJoystickFromID_REAL
 #define SDL_GetJoystickFromPlayerIndex SDL_GetJoystickFromPlayerIndex_REAL
 #define SDL_GetJoystickGUID SDL_GetJoystickGUID_REAL
-#define SDL_GetJoystickGUIDFromID SDL_GetJoystickGUIDFromID_REAL
+#define SDL_GetJoystickGUIDForID SDL_GetJoystickGUIDForID_REAL
 #define SDL_GetJoystickGUIDFromString SDL_GetJoystickGUIDFromString_REAL
 #define SDL_GetJoystickGUIDInfo SDL_GetJoystickGUIDInfo_REAL
 #define SDL_GetJoystickGUIDString SDL_GetJoystickGUIDString_REAL
 #define SDL_GetJoystickHat SDL_GetJoystickHat_REAL
 #define SDL_GetJoystickID SDL_GetJoystickID_REAL
 #define SDL_GetJoystickName SDL_GetJoystickName_REAL
-#define SDL_GetJoystickNameFromID SDL_GetJoystickNameFromID_REAL
+#define SDL_GetJoystickNameForID SDL_GetJoystickNameForID_REAL
 #define SDL_GetJoystickPath SDL_GetJoystickPath_REAL
-#define SDL_GetJoystickPathFromID SDL_GetJoystickPathFromID_REAL
+#define SDL_GetJoystickPathForID SDL_GetJoystickPathForID_REAL
 #define SDL_GetJoystickPlayerIndex SDL_GetJoystickPlayerIndex_REAL
-#define SDL_GetJoystickPlayerIndexFromID SDL_GetJoystickPlayerIndexFromID_REAL
+#define SDL_GetJoystickPlayerIndexForID SDL_GetJoystickPlayerIndexForID_REAL
 #define SDL_GetJoystickPowerInfo SDL_GetJoystickPowerInfo_REAL
 #define SDL_GetJoystickProduct SDL_GetJoystickProduct_REAL
-#define SDL_GetJoystickProductFromID SDL_GetJoystickProductFromID_REAL
+#define SDL_GetJoystickProductForID SDL_GetJoystickProductForID_REAL
 #define SDL_GetJoystickProductVersion SDL_GetJoystickProductVersion_REAL
-#define SDL_GetJoystickProductVersionFromID SDL_GetJoystickProductVersionFromID_REAL
+#define SDL_GetJoystickProductVersionForID SDL_GetJoystickProductVersionForID_REAL
 #define SDL_GetJoystickProperties SDL_GetJoystickProperties_REAL
 #define SDL_GetJoystickSerial SDL_GetJoystickSerial_REAL
 #define SDL_GetJoystickType SDL_GetJoystickType_REAL
-#define SDL_GetJoystickTypeFromID SDL_GetJoystickTypeFromID_REAL
+#define SDL_GetJoystickTypeForID SDL_GetJoystickTypeForID_REAL
 #define SDL_GetJoystickVendor SDL_GetJoystickVendor_REAL
-#define SDL_GetJoystickVendorFromID SDL_GetJoystickVendorFromID_REAL
+#define SDL_GetJoystickVendorForID SDL_GetJoystickVendorForID_REAL
 #define SDL_GetJoysticks SDL_GetJoysticks_REAL
 #define SDL_GetKeyFromName SDL_GetKeyFromName_REAL
 #define SDL_GetKeyFromScancode SDL_GetKeyFromScancode_REAL
 #define SDL_GetKeyName SDL_GetKeyName_REAL
 #define SDL_GetKeyboardFocus SDL_GetKeyboardFocus_REAL
-#define SDL_GetKeyboardNameFromID SDL_GetKeyboardNameFromID_REAL
+#define SDL_GetKeyboardNameForID SDL_GetKeyboardNameForID_REAL
 #define SDL_GetKeyboardState SDL_GetKeyboardState_REAL
 #define SDL_GetKeyboards SDL_GetKeyboards_REAL
 #define SDL_GetLogOutputFunction SDL_GetLogOutputFunction_REAL
@@ -364,7 +364,7 @@
 #define SDL_GetMice SDL_GetMice_REAL
 #define SDL_GetModState SDL_GetModState_REAL
 #define SDL_GetMouseFocus SDL_GetMouseFocus_REAL
-#define SDL_GetMouseNameFromID SDL_GetMouseNameFromID_REAL
+#define SDL_GetMouseNameForID SDL_GetMouseNameForID_REAL
 #define SDL_GetMouseState SDL_GetMouseState_REAL
 #define SDL_GetNaturalDisplayOrientation SDL_GetNaturalDisplayOrientation_REAL
 #define SDL_GetNumAllocations SDL_GetNumAllocations_REAL
@@ -405,7 +405,7 @@
 #define SDL_GetRGB SDL_GetRGB_REAL
 #define SDL_GetRGBA SDL_GetRGBA_REAL
 #define SDL_GetRealGamepadType SDL_GetRealGamepadType_REAL
-#define SDL_GetRealGamepadTypeFromID SDL_GetRealGamepadTypeFromID_REAL
+#define SDL_GetRealGamepadTypeForID SDL_GetRealGamepadTypeForID_REAL
 #define SDL_GetRectAndLineIntersection SDL_GetRectAndLineIntersection_REAL
 #define SDL_GetRectAndLineIntersectionFloat SDL_GetRectAndLineIntersectionFloat_REAL
 #define SDL_GetRectEnclosingPoints SDL_GetRectEnclosingPoints_REAL
@@ -446,12 +446,12 @@
 #define SDL_GetSensorFromID SDL_GetSensorFromID_REAL
 #define SDL_GetSensorID SDL_GetSensorID_REAL
 #define SDL_GetSensorName SDL_GetSensorName_REAL
-#define SDL_GetSensorNameFromID SDL_GetSensorNameFromID_REAL
+#define SDL_GetSensorNameForID SDL_GetSensorNameForID_REAL
 #define SDL_GetSensorNonPortableType SDL_GetSensorNonPortableType_REAL
-#define SDL_GetSensorNonPortableTypeFromID SDL_GetSensorNonPortableTypeFromID_REAL
+#define SDL_GetSensorNonPortableTypeForID SDL_GetSensorNonPortableTypeForID_REAL
 #define SDL_GetSensorProperties SDL_GetSensorProperties_REAL
 #define SDL_GetSensorType SDL_GetSensorType_REAL
-#define SDL_GetSensorTypeFromID SDL_GetSensorTypeFromID_REAL
+#define SDL_GetSensorTypeForID SDL_GetSensorTypeForID_REAL
 #define SDL_GetSensors SDL_GetSensors_REAL
 #define SDL_GetSilenceValueForFormat SDL_GetSilenceValueForFormat_REAL
 #define SDL_GetStorageFileSize SDL_GetStorageFileSize_REAL

src/dynapi/SDL_dynapi_procs.h

@@ -287,24 +287,24 @@ SDL_DYNAPI_PROC(SDL_JoystickConnectionState,SDL_GetGamepadConnectionState,(SDL_G
 SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadFirmwareVersion,(SDL_Gamepad *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Gamepad*,SDL_GetGamepadFromID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_Gamepad*,SDL_GetGamepadFromPlayerIndex,(int a),(a),return)
-SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetGamepadGUIDFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetGamepadGUIDForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetGamepadID,(SDL_Gamepad *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Joystick*,SDL_GetGamepadJoystick,(SDL_Gamepad *a),(a),return)
 SDL_DYNAPI_PROC(char*,SDL_GetGamepadMapping,(SDL_Gamepad *a),(a),return)
 SDL_DYNAPI_PROC(char*,SDL_GetGamepadMappingForGUID,(SDL_JoystickGUID a),(a),return)
-SDL_DYNAPI_PROC(char*,SDL_GetGamepadMappingFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_GetGamepadMappingForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(char**,SDL_GetGamepadMappings,(int *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetGamepadName,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetGamepadNameFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetGamepadNameForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetGamepadPath,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetGamepadPathFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetGamepadPathForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetGamepadPlayerIndex,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_GetGamepadPlayerIndexFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetGamepadPlayerIndexForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_PowerState,SDL_GetGamepadPowerInfo,(SDL_Gamepad *a, int *b),(a,b),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProduct,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProductFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProductForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProductVersion,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProductVersionFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadProductVersionForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetGamepadProperties,(SDL_Gamepad *a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetGamepadSensorData,(SDL_Gamepad *a, SDL_SensorType b, float *c, int d),(a,b,c,d),return)
 SDL_DYNAPI_PROC(float,SDL_GetGamepadSensorDataRate,(SDL_Gamepad *a, SDL_SensorType b),(a,b),return)
@@ -315,10 +315,10 @@ SDL_DYNAPI_PROC(const char*,SDL_GetGamepadStringForButton,(SDL_GamepadButton a),
 SDL_DYNAPI_PROC(const char*,SDL_GetGamepadStringForType,(SDL_GamepadType a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetGamepadTouchpadFinger,(SDL_Gamepad *a, int b, int c, Uint8 *d, float *e, float *f, float *g),(a,b,c,d,e,f,g),return)
 SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadType,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadTypeFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadTypeForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetGamepadTypeFromString,(const char *a),(a),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadVendor,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadVendorFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetGamepadVendorForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickID*,SDL_GetGamepads,(int *a),(a),return)
 SDL_DYNAPI_PROC(SDL_MouseButtonFlags,SDL_GetGlobalMouseState,(float *a, float *b),(a,b),return)
 SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetGlobalProperties,(void),(),return)
@@ -328,7 +328,7 @@ SDL_DYNAPI_PROC(Uint32,SDL_GetHapticFeatures,(SDL_Haptic *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Haptic*,SDL_GetHapticFromID,(SDL_HapticID a),(a),return)
 SDL_DYNAPI_PROC(SDL_HapticID,SDL_GetHapticID,(SDL_Haptic *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetHapticName,(SDL_Haptic *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetHapticNameFromID,(SDL_HapticID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetHapticNameForID,(SDL_HapticID a),(a),return)
 SDL_DYNAPI_PROC(SDL_HapticID*,SDL_GetHaptics,(int *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetHint,(const char *a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_GetHintBoolean,(const char *a, SDL_bool b),(a,b),return)
@@ -344,35 +344,35 @@ SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickFirmwareVersion,(SDL_Joystick *a),(a),retu
 SDL_DYNAPI_PROC(SDL_Joystick*,SDL_GetJoystickFromID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_Joystick*,SDL_GetJoystickFromPlayerIndex,(int a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickGUID,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickGUIDFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickGUIDForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_GetJoystickGUIDFromString,(const char *a),(a),return)
 SDL_DYNAPI_PROC(void,SDL_GetJoystickGUIDInfo,(SDL_JoystickGUID a, Uint16 *b, Uint16 *c, Uint16 *d, Uint16 *e),(a,b,c,d,e),)
 SDL_DYNAPI_PROC(int,SDL_GetJoystickGUIDString,(SDL_JoystickGUID a, char *b, int c),(a,b,c),return)
 SDL_DYNAPI_PROC(Uint8,SDL_GetJoystickHat,(SDL_Joystick *a, int b),(a,b),return)
 SDL_DYNAPI_PROC(SDL_JoystickID,SDL_GetJoystickID,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetJoystickName,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetJoystickNameFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetJoystickNameForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetJoystickPath,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetJoystickPathFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetJoystickPathForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetJoystickPlayerIndex,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_GetJoystickPlayerIndexFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetJoystickPlayerIndexForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_PowerState,SDL_GetJoystickPowerInfo,(SDL_Joystick *a, int *b),(a,b),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProduct,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProductFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProductForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProductVersion,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProductVersionFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickProductVersionForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetJoystickProperties,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetJoystickSerial,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickType,SDL_GetJoystickType,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(SDL_JoystickType,SDL_GetJoystickTypeFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickType,SDL_GetJoystickTypeForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickVendor,(SDL_Joystick *a),(a),return)
-SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickVendorFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_GetJoystickVendorForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_JoystickID*,SDL_GetJoysticks,(int *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Keycode,SDL_GetKeyFromName,(const char *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Keycode,SDL_GetKeyFromScancode,(SDL_Scancode a, SDL_Keymod b),(a,b),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetKeyName,(SDL_Keycode a),(a),return)
 SDL_DYNAPI_PROC(SDL_Window*,SDL_GetKeyboardFocus,(void),(),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetKeyboardNameFromID,(SDL_KeyboardID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetKeyboardNameForID,(SDL_KeyboardID a),(a),return)
 SDL_DYNAPI_PROC(const Uint8*,SDL_GetKeyboardState,(int *a),(a),return)
 SDL_DYNAPI_PROC(SDL_KeyboardID*,SDL_GetKeyboards,(int *a),(a),return)
 SDL_DYNAPI_PROC(void,SDL_GetLogOutputFunction,(SDL_LogOutputFunction *a, void **b),(a,b),)
@@ -384,7 +384,7 @@ SDL_DYNAPI_PROC(void,SDL_GetMemoryFunctions,(SDL_malloc_func *a, SDL_calloc_func
 SDL_DYNAPI_PROC(SDL_MouseID*,SDL_GetMice,(int *a),(a),return)
 SDL_DYNAPI_PROC(SDL_Keymod,SDL_GetModState,(void),(),return)
 SDL_DYNAPI_PROC(SDL_Window*,SDL_GetMouseFocus,(void),(),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetMouseNameFromID,(SDL_MouseID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetMouseNameForID,(SDL_MouseID a),(a),return)
 SDL_DYNAPI_PROC(SDL_MouseButtonFlags,SDL_GetMouseState,(float *a, float *b),(a,b),return)
 SDL_DYNAPI_PROC(SDL_DisplayOrientation,SDL_GetNaturalDisplayOrientation,(SDL_DisplayID a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetNumAllocations,(void),(),return)
@@ -425,7 +425,7 @@ SDL_DYNAPI_PROC(SDL_PropertyType,SDL_GetPropertyType,(SDL_PropertiesID a, const
 SDL_DYNAPI_PROC(void,SDL_GetRGB,(Uint32 a, const SDL_PixelFormatDetails *b, const SDL_Palette *c, Uint8 *d, Uint8 *e, Uint8 *f),(a,b,c,d,e,f),)
 SDL_DYNAPI_PROC(void,SDL_GetRGBA,(Uint32 a, const SDL_PixelFormatDetails *b, const SDL_Palette *c, Uint8 *d, Uint8 *e, Uint8 *f, Uint8 *g),(a,b,c,d,e,f,g),)
 SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadType,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadTypeFromID,(SDL_JoystickID a),(a),return)
+SDL_DYNAPI_PROC(SDL_GamepadType,SDL_GetRealGamepadTypeForID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_GetRectAndLineIntersection,(const SDL_Rect *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_GetRectAndLineIntersectionFloat,(const SDL_FRect *a, float *b, float *c, float *d, float *e),(a,b,c,d,e),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_GetRectEnclosingPoints,(const SDL_Point *a, int b, const SDL_Rect *c, SDL_Rect *d),(a,b,c,d),return)
@@ -466,12 +466,12 @@ SDL_DYNAPI_PROC(int,SDL_GetSensorData,(SDL_Sensor *a, float *b, int c),(a,b,c),r
 SDL_DYNAPI_PROC(SDL_Sensor*,SDL_GetSensorFromID,(SDL_SensorID a),(a),return)
 SDL_DYNAPI_PROC(SDL_SensorID,SDL_GetSensorID,(SDL_Sensor *a),(a),return)
 SDL_DYNAPI_PROC(const char*,SDL_GetSensorName,(SDL_Sensor *a),(a),return)
-SDL_DYNAPI_PROC(const char*,SDL_GetSensorNameFromID,(SDL_SensorID a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetSensorNameForID,(SDL_SensorID a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetSensorNonPortableType,(SDL_Sensor *a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_GetSensorNonPortableTypeFromID,(SDL_SensorID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetSensorNonPortableTypeForID,(SDL_SensorID a),(a),return)
 SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetSensorProperties,(SDL_Sensor *a),(a),return)
 SDL_DYNAPI_PROC(SDL_SensorType,SDL_GetSensorType,(SDL_Sensor *a),(a),return)
-SDL_DYNAPI_PROC(SDL_SensorType,SDL_GetSensorTypeFromID,(SDL_SensorID a),(a),return)
+SDL_DYNAPI_PROC(SDL_SensorType,SDL_GetSensorTypeForID,(SDL_SensorID a),(a),return)
 SDL_DYNAPI_PROC(SDL_SensorID*,SDL_GetSensors,(int *a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetSilenceValueForFormat,(SDL_AudioFormat a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_GetStorageFileSize,(SDL_Storage *a, const char *b, Uint64 *c),(a,b,c),return)