TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 15:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update sdl to https://github.com/libsdl-org/SDL 22March 2022

Browse source
This commit is contained in:
AzaezelX 2022-03-23 01:43:08 -05:00
parent ee4253c982
commit 2614274639
1225 changed files with 148950 additions and 51674 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/lib/sdl/visualtest/src/action_configparser.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file action_configparser.c
*
@ -36,6 +36,9 @@ FreeAction(SDLVisualTest_Action* action)
action->extra.process.args = NULL;
}
break;
default:
break;
}
}
@ -54,7 +57,7 @@ SDLVisualTest_EnqueueAction(SDLVisualTest_ActionQueue* queue,
sizeof(SDLVisualTest_ActionNode));
if(!node)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return 0;
}
node->action = action;
@ -220,10 +223,10 @@ SDLVisualTest_InsertIntoActionQueue(SDLVisualTest_ActionQueue* queue,
return 1;
}
newnode = (SDLVisualTest_ActionNode*)malloc(sizeof(SDLVisualTest_ActionNode));
newnode = (SDLVisualTest_ActionNode*)SDL_malloc(sizeof(SDLVisualTest_ActionNode));
if(!newnode)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return 0;
}
newnode->action = action;
@ -256,7 +259,7 @@ SDLVisualTest_InsertIntoActionQueue(SDLVisualTest_ActionQueue* queue,
}
int
SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue)
SDLVisualTest_ParseActionConfig(const char* file, SDLVisualTest_ActionQueue* queue)
{
char line[MAX_ACTION_LINE_LENGTH];
SDLVisualTest_RWHelperBuffer buffer;
@ -344,7 +347,7 @@ SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue)
path = (char*)SDL_malloc(sizeof(char) * (len + 1));
if(!path)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
SDLVisualTest_EmptyActionQueue(queue);
SDL_RWclose(rw);
return 0;
@ -358,7 +361,7 @@ SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue)
args = (char*)SDL_malloc(sizeof(char) * (len + 1));
if(!args)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
SDL_free(path);
SDLVisualTest_EmptyActionQueue(queue);
SDL_RWclose(rw);
@ -393,4 +396,4 @@ SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue)
SDL_RWclose(rw);
return 1;
}
}

10
Engine/lib/sdl/visualtest/src/harness_argparser.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file harness_argparser.c
*
@ -19,7 +19,7 @@
/* String compare s1 and s2 ignoring leading hyphens */
static int
StrCaseCmpIgnoreHyphen(char* s1, char* s2)
StrCaseCmpIgnoreHyphen(const char* s1, const char* s2)
{
/* treat NULL pointer as empty strings */
if(!s1)
@ -199,7 +199,7 @@ ParseArg(char** argv, int index, SDLVisualTest_HarnessState* state)
/* TODO: Trailing/leading spaces and spaces between equals sign not supported. */
static int
ParseConfig(char* file, SDLVisualTest_HarnessState* state)
ParseConfig(const char* file, SDLVisualTest_HarnessState* state)
{
SDL_RWops* rw;
SDLVisualTest_RWHelperBuffer buffer;
@ -234,7 +234,7 @@ ParseConfig(char* file, SDLVisualTest_HarnessState* state)
argv = (char**)SDL_malloc((num_params + 1) * sizeof(char*));
if(!argv)
{
SDLTest_LogError("malloc() failed.");
SDLTest_LogError("SDL_malloc() failed.");
SDL_RWclose(rw);
return 0;
}
@ -355,4 +355,4 @@ SDLVisualTest_FreeHarnessState(SDLVisualTest_HarnessState* state)
SDLVisualTest_EmptyActionQueue(&state->action_queue);
SDLVisualTest_FreeSUTConfig(&state->sut_config);
}
}
}

25
Engine/lib/sdl/visualtest/src/linux/linux_process.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file linux_process.c
*
@ -8,23 +8,23 @@
#include <SDL.h>
#include <SDL_test.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <errno.h>
#include "SDL_visualtest_process.h"
#include "SDL_visualtest_harness_argparser.h"
#include "SDL_visualtest_parsehelper.h"
#if defined(__LINUX__)
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <errno.h>
static void
LogLastError(char* str)
LogLastError(const char* str)
{
char* error = (char*)strerror(errno);
const char* error = strerror(errno);
if(!str || !error)
return;
return;
SDLTest_LogError("%s: %s", str, error);
}
@ -196,4 +196,13 @@ SDL_KillProcess(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps)
return 1;
}
/* each window of the process will have a screenshot taken. The file name will be
prefix-i.png for the i'th window. */
int
SDLVisualTest_ScreenshotProcess(SDL_ProcessInfo* pinfo, char* prefix)
{
SDLTest_LogError("Screenshot process not implemented");
return 0;
}
#endif

4
Engine/lib/sdl/visualtest/src/mischelper.c
View file

@ -1,5 +1,5 @@
/**
* \file mischelper.c
* \file mischelper.c
*
* Source file with miscellaneous helper functions.
*/
@ -25,4 +25,4 @@ SDLVisualTest_HashString(char* str, char hash[33])
/* convert the md5 hash to an array of hexadecimal digits */
for(i = 0; i < 16; i++)
SDL_snprintf(hash + 2 * i, 33 - 2 * i, "%02x", (int)md5c.digest[i]);
}
}

8
Engine/lib/sdl/visualtest/src/parsehelper.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file parsehelper.c
*
@ -18,7 +18,7 @@ CountTokens(char* args)
int state; /* current state of the DFA */
if(!args)
return -1;
return -1;
index = 0;
state = 0;
@ -96,7 +96,7 @@ TokenizeHelper(char* str, char** tokens, int num_tokens, int max_token_len)
if(!tokens[index])
{
int i;
SDLTest_LogError("malloc() failed.");
SDLTest_LogError("SDL_malloc() failed.");
for(i = 0; i < index; i++)
SDL_free(tokens[i]);
return 0;
@ -215,7 +215,7 @@ SDLVisualTest_ParseArgsToArgv(char* args)
argv = (char**)SDL_malloc((num_tokens + 2) * sizeof(char*));
if(!argv)
{
SDLTest_LogError("malloc() failed.");
SDLTest_LogError("SDL_malloc() failed.");
return NULL;
}

4
Engine/lib/sdl/visualtest/src/rwhelper.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file rwhelper.c
*
@ -128,4 +128,4 @@ SDLVisualTest_RWHelperCountNonEmptyLines(SDL_RWops* rw,
buffer, comment_char))
num_lines++;
return num_lines;
}
}

8
Engine/lib/sdl/visualtest/src/screenshot.c
View file

@ -1,6 +1,6 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file screenshot.c
* \file screenshot.c
*
* Source file for the screenshot API.
*/
@ -48,7 +48,7 @@ SDLVisualTest_VerifyScreenshots(char* args, char* test_dir, char* verify_dir)
verify_path = (char*)SDL_malloc(verify_len * sizeof(char));
if(!verify_path)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return_code = -1;
goto verifyscreenshots_cleanup_generic;
}
@ -78,7 +78,7 @@ SDLVisualTest_VerifyScreenshots(char* args, char* test_dir, char* verify_dir)
test_path = (char*)SDL_malloc(test_len * sizeof(char));
if(!test_path)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return_code = -1;
goto verifyscreenshots_cleanup_verifybmp;
}

4
Engine/lib/sdl/visualtest/src/sut_configparser.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file sut_configparser.c
*
@ -61,7 +61,7 @@ SDLVisualTest_ParseSUTConfig(char* file, SDLVisualTest_SUTConfig* config)
sizeof(SDLVisualTest_SUTOption));
if(!config->options)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
SDL_RWclose(rw);
return 0;
}

19
Engine/lib/sdl/visualtest/src/testharness.c
View file

@ -1,6 +1,6 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file testharness.c
* \file testharness.c
*
* Source file for the test harness.
*/
@ -49,8 +49,8 @@ static SDLVisualTest_ActionNode* current; /* the current action being performed
static SDL_TimerID action_timer, kill_timer;
/* returns a char* to be passed as the format argument of a printf-style function. */
static char*
usage()
static const char*
usage(void)
{
return "Usage: \n%s --sutapp xyz"
" [--sutargs abc | --parameter-config xyz.parameters"
@ -82,10 +82,10 @@ ActionTimerCallback(Uint32 interval, void* param)
Uint32 next_action_time;
/* push an event to handle the action */
SDL_zero(userevent);
userevent.type = SDL_USEREVENT;
userevent.code = ACTION_TIMER_EVENT;
userevent.data1 = &current->action;
userevent.data2 = NULL;
event.type = SDL_USEREVENT;
event.user = userevent;
@ -110,10 +110,9 @@ KillTimerCallback(Uint32 interval, void* param)
SDL_Event event;
SDL_UserEvent userevent;
SDL_zero(userevent);
userevent.type = SDL_USEREVENT;
userevent.code = KILL_TIMER_EVENT;
userevent.data1 = NULL;
userevent.data2 = NULL;
event.type = SDL_USEREVENT;
event.user = userevent;
@ -181,7 +180,7 @@ ProcessAction(SDLVisualTest_Action* action, int* sut_running, char* args)
if(SDL_IsProcessRunning(&action_process) > 0)
{
SDLTest_LogError("Process %s took too long too complete."
" Force killing...", action->extra);
" Force killing...", action->extra.process.path);
if(!SDL_KillProcess(&action_process, &ps))
{
SDLTest_LogError("SDL_KillProcess() failed");
@ -463,7 +462,7 @@ main(int argc, char* argv[])
if(state.sut_config.num_options > 0)
{
char* variator_name = state.variator_type == SDL_VARIATOR_RANDOM ?
const char* variator_name = (state.variator_type == SDL_VARIATOR_RANDOM) ?
"RANDOM" : "EXHAUSTIVE";
if(state.num_variations > 0)
SDLTest_Log("Testing SUT with variator: %s for %d variations",
@ -519,7 +518,7 @@ main(int argc, char* argv[])
}
goto cleanup_variator;
}
goto cleanup_sdl;
cleanup_variator:

6
Engine/lib/sdl/visualtest/src/variator_common.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file variator_common.c
*
@ -189,7 +189,7 @@ SDLVisualTest_InitVariation(SDLVisualTest_Variation* variation,
sizeof(SDLVisualTest_SUTOptionValue));
if(!variation->vars)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return 0;
}
variation->num_vars = config->num_options;
@ -222,4 +222,4 @@ SDLVisualTest_InitVariation(SDLVisualTest_Variation* variation,
}
}
return 1;
}
}

5
Engine/lib/sdl/visualtest/src/variator_exhaustive.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file variator_exhaustive.c
*
@ -39,6 +39,7 @@ NextVariation(SDLVisualTest_Variation* variation,
return 0;
if(carry == 0)
return 1;
SDLTest_LogError("NextVariation() failed");
return -1;
}
@ -129,4 +130,4 @@ SDLVisualTest_FreeExhaustiveVariator(SDLVisualTest_ExhaustiveVariator* variator)
}
SDL_free(variator->variation.vars);
variator->variation.vars = NULL;
}
}

8
Engine/lib/sdl/visualtest/src/variator_random.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file variator_random.c
*
@ -47,12 +47,13 @@ SDLVisualTest_GetNextRandomVariation(SDLVisualTest_RandomVariator* variator)
SDLVisualTest_SUTOptionValue* vars;
SDLVisualTest_SUTOption* options;
int i;
if(!variator)
{
SDLTest_LogError("variator argument cannot be NULL");
return NULL;
}
/* to save typing */
vars = variator->variation.vars;
options = variator->config.options;
@ -106,6 +107,7 @@ void SDLVisualTest_FreeRandomVariator(SDLVisualTest_RandomVariator* variator)
SDLTest_LogError("variator argument cannot be NULL");
return;
}
SDL_free(variator->variation.vars);
variator->variation.vars = NULL;
}
}

6
Engine/lib/sdl/visualtest/src/variators.c
View file

@ -1,4 +1,4 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file variators.c
*
@ -53,6 +53,7 @@ SDLVisualTest_GetNextVariation(SDLVisualTest_Variator* variator)
SDLTest_LogError("variator argument cannot be NULL");
return NULL;
}
switch(variator->type)
{
case SDL_VARIATOR_EXHAUSTIVE:
@ -77,6 +78,7 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator)
SDLTest_LogError("variator argument cannot be NULL");
return;
}
switch(variator->type)
{
case SDL_VARIATOR_EXHAUSTIVE:
@ -90,4 +92,4 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator)
default:
SDLTest_LogError("Invalid value for variator type");
}
}
}

13
Engine/lib/sdl/visualtest/src/windows/windows_process.c
View file

@ -1,11 +1,10 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file windows_process.c
* \file windows_process.c
*
* Source file for the process API on windows.
*/
#include <SDL.h>
#include <SDL_test.h>
#include <string.h>
@ -16,7 +15,7 @@
#if defined(__WIN32__)
void
LogLastError(char* str)
LogLastError(const char* str)
{
LPVOID buffer;
DWORD dw = GetLastError();
@ -61,7 +60,7 @@ SDL_LaunchProcess(char* file, char* args, SDL_ProcessInfo* pinfo)
working_directory = (char*)SDL_malloc(path_length + 1);
if(!working_directory)
{
SDLTest_LogError("Could not allocate working_directory - malloc() failed.");
SDLTest_LogError("Could not allocate working_directory - SDL_malloc() failed.");
return 0;
}
@ -80,7 +79,7 @@ SDL_LaunchProcess(char* file, char* args, SDL_ProcessInfo* pinfo)
command_line = (char*)SDL_malloc(path_length + args_length + 2);
if(!command_line)
{
SDLTest_LogError("Could not allocate command_line - malloc() failed.");
SDLTest_LogError("Could not allocate command_line - SDL_malloc() failed.");
return 0;
}
SDL_memcpy(command_line, file, path_length);
@ -175,7 +174,7 @@ CloseWindowCallback(HWND hwnd, LPARAM lparam)
GetWindowThreadProcessId(hwnd, &pid);
if(pid == pinfo->pi.dwProcessId)
{
DWORD result;
DWORD_PTR result;
if(!SendMessageTimeout(hwnd, WM_CLOSE, 0, 0, SMTO_BLOCK,
1000, &result))
{

12
Engine/lib/sdl/visualtest/src/windows/windows_screenshot.c
View file

@ -1,6 +1,6 @@
/* See COPYING.txt for the full license governing this code. */
/* See LICENSE.txt for the full license governing this code. */
/**
* \file windows_screenshot.c
* \file windows_screenshot.c
*
* Source file for the screenshot API on windows.
*/
@ -14,9 +14,9 @@
#endif
#if defined(__WIN32__)
#include <Windows.h>
#include <windows.h>
void LogLastError(char* str);
void LogLastError(const char* str);
static int img_num;
static SDL_ProcessInfo screenshot_pinfo;
@ -241,7 +241,7 @@ ScreenshotWindow(HWND hwnd, char* filename, SDL_bool only_client_area)
goto screenshotwindow_cleanup_capturebitmap;
}
/* free resources */
/* Free resources */
screenshotwindow_cleanup_capturebitmap:
if(!DeleteObject(capturebitmap))
@ -297,7 +297,7 @@ ScreenshotHwnd(HWND hwnd, LPARAM lparam)
filename = (char*)SDL_malloc(len * sizeof(char));
if(!filename)
{
SDLTest_LogError("malloc() failed");
SDLTest_LogError("SDL_malloc() failed");
return FALSE;
}