diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym index 1c647630e..21c185be5 100644 --- a/src/dynapi/SDL_dynapi.sym +++ b/src/dynapi/SDL_dynapi.sym @@ -351,18 +351,11 @@ SDL3_0.0.0 { SDL_GetOriginalMemoryFunctions; SDL_GetPathInfo; SDL_GetPenCapabilities; - SDL_GetPenCapabilities; - SDL_GetPenFromGUID; SDL_GetPenFromGUID; SDL_GetPenGUID; - SDL_GetPenGUID; - SDL_GetPenName; SDL_GetPenName; SDL_GetPenStatus; - SDL_GetPenStatus; SDL_GetPenType; - SDL_GetPenType; - SDL_GetPens; SDL_GetPens; SDL_GetPerformanceCounter; SDL_GetPerformanceFrequency; @@ -599,7 +592,6 @@ SDL3_0.0.0 { SDL_PauseHaptic; SDL_PeepEvents; SDL_PenConnected; - SDL_PenConnected; SDL_PlayHapticRumble; SDL_PollEvent; SDL_PostSemaphore; @@ -682,7 +674,6 @@ SDL3_0.0.0 { SDL_SetAssertionHandler; SDL_SetAudioPostmixCallback; SDL_SetAudioStreamFormat; - SDL_SetAudioStreamFormat; SDL_SetAudioStreamFrequencyRatio; SDL_SetAudioStreamGetCallback; SDL_SetAudioStreamPutCallback; diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index b54048d1b..342c0f380 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -36,15 +36,15 @@ #define SDL_AddTimer SDL_AddTimer_REAL #define SDL_AddVulkanRenderSemaphores SDL_AddVulkanRenderSemaphores_REAL #define SDL_AllocateEventMemory SDL_AllocateEventMemory_REAL -#define SDL_AndroidBackButton SDL_AndroidBackButton_REAL -#define SDL_AndroidGetActivity SDL_AndroidGetActivity_REAL -#define SDL_AndroidGetExternalStoragePath SDL_AndroidGetExternalStoragePath_REAL -#define SDL_AndroidGetExternalStorageState SDL_AndroidGetExternalStorageState_REAL -#define SDL_AndroidGetInternalStoragePath SDL_AndroidGetInternalStoragePath_REAL -#define SDL_AndroidGetJNIEnv SDL_AndroidGetJNIEnv_REAL -#define SDL_AndroidRequestPermission SDL_AndroidRequestPermission_REAL -#define SDL_AndroidSendMessage SDL_AndroidSendMessage_REAL -#define SDL_AndroidShowToast SDL_AndroidShowToast_REAL +#define SDL_AndroidBackButton SDL_AndroidBackButton_REAL +#define SDL_AndroidGetActivity SDL_AndroidGetActivity_REAL +#define SDL_AndroidGetExternalStoragePath SDL_AndroidGetExternalStoragePath_REAL +#define SDL_AndroidGetExternalStorageState SDL_AndroidGetExternalStorageState_REAL +#define SDL_AndroidGetInternalStoragePath SDL_AndroidGetInternalStoragePath_REAL +#define SDL_AndroidGetJNIEnv SDL_AndroidGetJNIEnv_REAL +#define SDL_AndroidRequestPermission SDL_AndroidRequestPermission_REAL +#define SDL_AndroidSendMessage SDL_AndroidSendMessage_REAL +#define SDL_AndroidShowToast SDL_AndroidShowToast_REAL #define SDL_AtomicAdd SDL_AtomicAdd_REAL #define SDL_AtomicCompareAndSwap SDL_AtomicCompareAndSwap_REAL #define SDL_AtomicCompareAndSwapPointer SDL_AtomicCompareAndSwapPointer_REAL @@ -138,7 +138,7 @@ #define SDL_DestroyWindowSurface SDL_DestroyWindowSurface_REAL #define SDL_DetachThread SDL_DetachThread_REAL #define SDL_DetachVirtualJoystick SDL_DetachVirtualJoystick_REAL -#define SDL_Direct3D9GetAdapterIndex SDL_Direct3D9GetAdapterIndex_REAL +#define SDL_Direct3D9GetAdapterIndex SDL_Direct3D9GetAdapterIndex_REAL #define SDL_DisableScreenSaver SDL_DisableScreenSaver_REAL #define SDL_DuplicateSurface SDL_DuplicateSurface_REAL #define SDL_EGL_GetCurrentEGLConfig SDL_EGL_GetCurrentEGLConfig_REAL @@ -163,7 +163,7 @@ #define SDL_FlushRenderer SDL_FlushRenderer_REAL #define SDL_GDKGetDefaultUser SDL_GDKGetDefaultUser_REAL #define SDL_GDKGetTaskQueue SDL_GDKGetTaskQueue_REAL -#define SDL_GDKSuspendComplete SDL_GDKSuspendComplete_REAL +#define SDL_GDKSuspendComplete SDL_GDKSuspendComplete_REAL #define SDL_GL_CreateContext SDL_GL_CreateContext_REAL #define SDL_GL_DeleteContext SDL_GL_DeleteContext_REAL #define SDL_GL_ExtensionSupported SDL_GL_ExtensionSupported_REAL @@ -187,7 +187,7 @@ #define SDL_GamepadHasButton SDL_GamepadHasButton_REAL #define SDL_GamepadHasSensor SDL_GamepadHasSensor_REAL #define SDL_GamepadSensorEnabled SDL_GamepadSensorEnabled_REAL -#define SDL_GetAndroidSDKVersion SDL_GetAndroidSDKVersion_REAL +#define SDL_GetAndroidSDKVersion SDL_GetAndroidSDKVersion_REAL #define SDL_GetAssertionHandler SDL_GetAssertionHandler_REAL #define SDL_GetAssertionReport SDL_GetAssertionReport_REAL #define SDL_GetAudioCaptureDevices SDL_GetAudioCaptureDevices_REAL @@ -376,18 +376,11 @@ #define SDL_GetOriginalMemoryFunctions SDL_GetOriginalMemoryFunctions_REAL #define SDL_GetPathInfo SDL_GetPathInfo_REAL #define SDL_GetPenCapabilities SDL_GetPenCapabilities_REAL -#define SDL_GetPenCapabilities SDL_GetPenCapabilities_REAL -#define SDL_GetPenFromGUID SDL_GetPenFromGUID_REAL #define SDL_GetPenFromGUID SDL_GetPenFromGUID_REAL #define SDL_GetPenGUID SDL_GetPenGUID_REAL -#define SDL_GetPenGUID SDL_GetPenGUID_REAL -#define SDL_GetPenName SDL_GetPenName_REAL #define SDL_GetPenName SDL_GetPenName_REAL #define SDL_GetPenStatus SDL_GetPenStatus_REAL -#define SDL_GetPenStatus SDL_GetPenStatus_REAL #define SDL_GetPenType SDL_GetPenType_REAL -#define SDL_GetPenType SDL_GetPenType_REAL -#define SDL_GetPens SDL_GetPens_REAL #define SDL_GetPens SDL_GetPens_REAL #define SDL_GetPerformanceCounter SDL_GetPerformanceCounter_REAL #define SDL_GetPerformanceFrequency SDL_GetPerformanceFrequency_REAL @@ -558,7 +551,7 @@ #define SDL_IsTablet SDL_IsTablet_REAL #define SDL_JoystickConnected SDL_JoystickConnected_REAL #define SDL_JoystickEventsEnabled SDL_JoystickEventsEnabled_REAL -#define SDL_LinuxSetThreadPriority SDL_LinuxSetThreadPriority_REAL +#define SDL_LinuxSetThreadPriority SDL_LinuxSetThreadPriority_REAL #define SDL_LinuxSetThreadPriorityAndPolicy SDL_LinuxSetThreadPriorityAndPolicy_REAL #define SDL_LoadBMP SDL_LoadBMP_REAL #define SDL_LoadBMP_IO SDL_LoadBMP_IO_REAL @@ -598,7 +591,7 @@ #define SDL_MinimizeWindow SDL_MinimizeWindow_REAL #define SDL_MixAudioFormat SDL_MixAudioFormat_REAL #define SDL_OnApplicationDidBecomeActive SDL_OnApplicationDidBecomeActive_REAL -#define SDL_OnApplicationDidChangeStatusBarOrientation SDL_OnApplicationDidChangeStatusBarOrientation_REAL +#define SDL_OnApplicationDidChangeStatusBarOrientation SDL_OnApplicationDidChangeStatusBarOrientation_REAL #define SDL_OnApplicationDidEnterBackground SDL_OnApplicationDidEnterBackground_REAL #define SDL_OnApplicationDidReceiveMemoryWarning SDL_OnApplicationDidReceiveMemoryWarning_REAL #define SDL_OnApplicationWillEnterForeground SDL_OnApplicationWillEnterForeground_REAL @@ -624,7 +617,6 @@ #define SDL_PauseHaptic SDL_PauseHaptic_REAL #define SDL_PeepEvents SDL_PeepEvents_REAL #define SDL_PenConnected SDL_PenConnected_REAL -#define SDL_PenConnected SDL_PenConnected_REAL #define SDL_PlayHapticRumble SDL_PlayHapticRumble_REAL #define SDL_PollEvent SDL_PollEvent_REAL #define SDL_PostSemaphore SDL_PostSemaphore_REAL @@ -796,7 +788,7 @@ #define SDL_SetWindowShape SDL_SetWindowShape_REAL #define SDL_SetWindowSize SDL_SetWindowSize_REAL #define SDL_SetWindowTitle SDL_SetWindowTitle_REAL -#define SDL_SetWindowsMessageHook SDL_SetWindowsMessageHook_REAL +#define SDL_SetWindowsMessageHook SDL_SetWindowsMessageHook_REAL #define SDL_SetX11EventHook SDL_SetX11EventHook_REAL #define SDL_ShowCursor SDL_ShowCursor_REAL #define SDL_ShowMessageBox SDL_ShowMessageBox_REAL @@ -838,7 +830,7 @@ #define SDL_UnlockSpinlock SDL_UnlockSpinlock_REAL #define SDL_UnlockSurface SDL_UnlockSurface_REAL #define SDL_UnlockTexture SDL_UnlockTexture_REAL -#define SDL_UnregisterApp SDL_UnregisterApp_REAL +#define SDL_UnregisterApp SDL_UnregisterApp_REAL #define SDL_UpdateGamepads SDL_UpdateGamepads_REAL #define SDL_UpdateHapticEffect SDL_UpdateHapticEffect_REAL #define SDL_UpdateJoysticks SDL_UpdateJoysticks_REAL @@ -864,8 +856,8 @@ #define SDL_WarpMouseGlobal SDL_WarpMouseGlobal_REAL #define SDL_WarpMouseInWindow SDL_WarpMouseInWindow_REAL #define SDL_WasInit SDL_WasInit_REAL -#define SDL_WinRTGetDeviceFamily SDL_WinRTGetDeviceFamily_REAL -#define SDL_WinRTGetFSPath SDL_WinRTGetFSPath_REAL +#define SDL_WinRTGetDeviceFamily SDL_WinRTGetDeviceFamily_REAL +#define SDL_WinRTGetFSPath SDL_WinRTGetFSPath_REAL #define SDL_WindowHasSurface SDL_WindowHasSurface_REAL #define SDL_WriteIO SDL_WriteIO_REAL #define SDL_WriteS16BE SDL_WriteS16BE_REAL @@ -939,8 +931,8 @@ #define SDL_hid_send_feature_report SDL_hid_send_feature_report_REAL #define SDL_hid_set_nonblocking SDL_hid_set_nonblocking_REAL #define SDL_hid_write SDL_hid_write_REAL -#define SDL_iOSSetAnimationCallback SDL_iOSSetAnimationCallback_REAL -#define SDL_iOSSetEventPump SDL_iOSSetEventPump_REAL +#define SDL_iOSSetAnimationCallback SDL_iOSSetAnimationCallback_REAL +#define SDL_iOSSetEventPump SDL_iOSSetEventPump_REAL #define SDL_iconv SDL_iconv_REAL #define SDL_iconv_close SDL_iconv_close_REAL #define SDL_iconv_open SDL_iconv_open_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 4d85f53e9..90dc1b6d0 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -289,7 +289,7 @@ SDL_DYNAPI_PROC(const char*,SDL_GetGamepadAppleSFSymbolsNameForAxis,(SDL_Gamepad SDL_DYNAPI_PROC(const char*,SDL_GetGamepadAppleSFSymbolsNameForButton,(SDL_Gamepad *a, SDL_GamepadButton b),(a,b),return) SDL_DYNAPI_PROC(Sint16,SDL_GetGamepadAxis,(SDL_Gamepad *a, SDL_GamepadAxis b),(a,b),return) SDL_DYNAPI_PROC(SDL_GamepadAxis,SDL_GetGamepadAxisFromString,(const char *a),(a),return) -SDL_DYNAPI_PROC(SDL_GamepadBinding **,SDL_GetGamepadBindings,(SDL_Gamepad *a, int *b),(a,b),return) +SDL_DYNAPI_PROC(SDL_GamepadBinding**,SDL_GetGamepadBindings,(SDL_Gamepad *a, int *b),(a,b),return) SDL_DYNAPI_PROC(Uint8,SDL_GetGamepadButton,(SDL_Gamepad *a, SDL_GamepadButton b),(a,b),return) SDL_DYNAPI_PROC(SDL_GamepadButton,SDL_GetGamepadButtonFromString,(const char *a),(a),return) SDL_DYNAPI_PROC(SDL_GamepadButtonLabel,SDL_GetGamepadButtonLabel,(SDL_Gamepad *a, SDL_GamepadButton b),(a,b),return) @@ -385,7 +385,7 @@ 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_GetKeyboardInstanceName,(SDL_KeyboardID a),(a),return) SDL_DYNAPI_PROC(const Uint8*,SDL_GetKeyboardState,(int *a),(a),return) -SDL_DYNAPI_PROC(SDL_MouseID*,SDL_GetKeyboards,(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),) SDL_DYNAPI_PROC(SDL_LogPriority,SDL_GetLogPriority,(int a),(a),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetMasksForPixelFormatEnum,(SDL_PixelFormatEnum a, int *b, Uint32 *c, Uint32 *d, Uint32 *e, Uint32 *f),(a,b,c,d,e,f),return) @@ -518,10 +518,10 @@ SDL_DYNAPI_PROC(const char*,SDL_GetVideoDriver,(int a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetWindowBordersSize,(SDL_Window *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return) SDL_DYNAPI_PROC(float,SDL_GetWindowDisplayScale,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_WindowFlags,SDL_GetWindowFlags,(SDL_Window *a),(a),return) -SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowFromID,(Uint32 a),(a),return) +SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowFromID,(SDL_WindowID a),(a),return) SDL_DYNAPI_PROC(const SDL_DisplayMode*,SDL_GetWindowFullscreenMode,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(void*,SDL_GetWindowICCProfile,(SDL_Window *a, size_t *b),(a,b),return) -SDL_DYNAPI_PROC(Uint32,SDL_GetWindowID,(SDL_Window *a),(a),return) +SDL_DYNAPI_PROC(SDL_WindowID,SDL_GetWindowID,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetWindowKeyboardGrab,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetWindowMaximumSize,(SDL_Window *a, int *b, int *c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_GetWindowMinimumSize,(SDL_Window *a, int *b, int *c),(a,b,c),return) @@ -696,7 +696,7 @@ SDL_DYNAPI_PROC(int,SDL_RenderLines,(SDL_Renderer *a, const SDL_FPoint *b, int c SDL_DYNAPI_PROC(int,SDL_RenderPoint,(SDL_Renderer *a, float b, float c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_RenderPoints,(SDL_Renderer *a, const SDL_FPoint *b, int c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_RenderPresent,(SDL_Renderer *a),(a),return) -SDL_DYNAPI_PROC(SDL_Surface *,SDL_RenderReadPixels,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return) +SDL_DYNAPI_PROC(SDL_Surface*,SDL_RenderReadPixels,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_RenderRect,(SDL_Renderer *a, const SDL_FRect *b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_RenderRects,(SDL_Renderer *a, const SDL_FRect *b, int c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_RenderTexture,(SDL_Renderer *a, SDL_Texture *b, const SDL_FRect *c, const SDL_FRect *d),(a,b,c,d),return) @@ -820,8 +820,8 @@ SDL_DYNAPI_PROC(void,SDL_SetWindowsMessageHook,(SDL_WindowsMessageHook a, void * SDL_DYNAPI_PROC(void,SDL_SetX11EventHook,(SDL_X11EventHook a, void *b),(a,b),) SDL_DYNAPI_PROC(int,SDL_ShowCursor,(void),(),return) SDL_DYNAPI_PROC(int,SDL_ShowMessageBox,(const SDL_MessageBoxData *a, int *b),(a,b),return) -SDL_DYNAPI_PROC(void,SDL_ShowOpenFileDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const SDL_DialogFileFilter *d, const char *e, int f),(a,b,c,d,e,f),) -SDL_DYNAPI_PROC(void,SDL_ShowOpenFolderDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const char *d, int e),(a,b,c,d,e),) +SDL_DYNAPI_PROC(void,SDL_ShowOpenFileDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const SDL_DialogFileFilter *d, const char *e, SDL_bool f),(a,b,c,d,e,f),) +SDL_DYNAPI_PROC(void,SDL_ShowOpenFolderDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const char *d, SDL_bool e),(a,b,c,d,e),) SDL_DYNAPI_PROC(void,SDL_ShowSaveFileDialog,(SDL_DialogFileCallback a, void *b, SDL_Window *c, const SDL_DialogFileFilter *d, const char *e),(a,b,c,d,e),) SDL_DYNAPI_PROC(int,SDL_ShowSimpleMessageBox,(SDL_MessageBoxFlags a, const char *b, const char *c, SDL_Window *d),(a,b,c,d),return) SDL_DYNAPI_PROC(int,SDL_ShowWindow,(SDL_Window *a),(a),return) @@ -958,7 +958,7 @@ SDL_DYNAPI_PROC(int,SDL_hid_read_timeout,(SDL_hid_device *a, unsigned char *b, s SDL_DYNAPI_PROC(int,SDL_hid_send_feature_report,(SDL_hid_device *a, const unsigned char *b, size_t c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_hid_set_nonblocking,(SDL_hid_device *a, int b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_hid_write,(SDL_hid_device *a, const unsigned char *b, size_t c),(a,b,c),return) -SDL_DYNAPI_PROC(int,SDL_iOSSetAnimationCallback,(SDL_Window *a, int b, void (SDLCALL *c)(void *), void *d),(a,b,c,d),return) +SDL_DYNAPI_PROC(int,SDL_iOSSetAnimationCallback,(SDL_Window *a, int b, void (SDLCALL *c)(void*), void *d),(a,b,c,d),return) SDL_DYNAPI_PROC(void,SDL_iOSSetEventPump,(SDL_bool a),(a),) SDL_DYNAPI_PROC(size_t,SDL_iconv,(SDL_iconv_t a, const char **b, size_t *c, char **d, size_t *e),(a,b,c,d,e),return) SDL_DYNAPI_PROC(int,SDL_iconv_close,(SDL_iconv_t a),(a),return)