encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Progress fixing bug 4100 - errors and warnings after changeset 11917 

Ozkan Sezer 2018-03-02 20:02:37 UTC
http://hg.libsdl.org/SDL/rev/d702b0c54e52 resulted in an error and
two warnings when compiled with mingw.

1.  Error from SDL_windowstaskdialog.h:
In file included from src/video/windows/SDL_windowsmessagebox.c:29:0:
src/video/windows/SDL_windowstaskdialog.h:23:54: error: expected ')' before 'HWND'

This is fixed by removing unnecessary annotations:

2.  Warning from SDL_assert.c:
src/SDL_assert.c: In function 'SDL_ExitProcess':
src/SDL_assert.c:138:1: warning: 'noreturn' function does return

Indeed ExitProcess() is prototyped with DECLSPEC_NORETURN, but
TerminateProcess() is not.  This can be rectified by adding an
exit() call in there. Do NOTE, however, that requires building
with a libc:

3.  Warning from SDL_windowsmessagebox.c:
src/video/windows/SDL_windowsmessagebox.c: In function 'WIN_ShowMessageBox':
src/video/windows/SDL_windowsmessagebox.c:513:9: warning: 'nCancelButton' may be used uninitialized in this function

My lazy solution was manually initializing nCancelButton to 0.
This commit is contained in:
Sam Lantinga 2018-03-02 22:53:25 -08:00
parent e9b29ed007
commit 2419d26724
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SDL_assert.c
View File

@ -120,7 +120,7 @@ static void SDL_GenerateAssertionReport(void)
} }
static SDL_NORETURN void SDL_ExitProcess(int exitcode) static void SDL_ExitProcess(int exitcode)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
/* "if you do not know the state of all threads in your process, it is /* "if you do not know the state of all threads in your process, it is
@ -138,7 +138,7 @@ static SDL_NORETURN void SDL_ExitProcess(int exitcode)
} }
static SDL_NORETURN void SDL_AbortAssertion(void) static void SDL_AbortAssertion(void)
{ {
SDL_Quit(); SDL_Quit();
SDL_ExitProcess(42); SDL_ExitProcess(42);

1
src/video/windows/SDL_windowsmessagebox.c
View File

@ -560,6 +560,7 @@ WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
TaskConfig.cButtons = messageboxdata->numbuttons; TaskConfig.cButtons = messageboxdata->numbuttons;
pButtons = SDL_malloc(sizeof (TASKDIALOG_BUTTON) * messageboxdata->numbuttons); pButtons = SDL_malloc(sizeof (TASKDIALOG_BUTTON) * messageboxdata->numbuttons);
TaskConfig.nDefaultButton = 0; TaskConfig.nDefaultButton = 0;
nCancelButton = 0;
for (i = 0; i < messageboxdata->numbuttons; i++) for (i = 0; i < messageboxdata->numbuttons; i++)
{ {
pButton = &pButtons[messageboxdata->numbuttons-1-i]; pButton = &pButtons[messageboxdata->numbuttons-1-i];

2
src/video/windows/SDL_windowstaskdialog.h
View File

@ -20,7 +20,7 @@
*/ */
#include <pshpack1.h> #include <pshpack1.h>
typedef HRESULT(CALLBACK *PFTASKDIALOGCALLBACK)(_In_ HWND hwnd, _In_ UINT msg, _In_ WPARAM wParam, _In_ LPARAM lParam, _In_ LONG_PTR lpRefData); typedef HRESULT(CALLBACK *PFTASKDIALOGCALLBACK)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LONG_PTR lpRefData);
enum _TASKDIALOG_FLAGS enum _TASKDIALOG_FLAGS
{ {