Merge commit '227021b6470d07f86e209d89f176ec8e6d952a17' into main

This commit is contained in:
Sam Lantinga 2021-05-07 12:28:37 -07:00
commit 1e208c6418

View File

@ -117,7 +117,7 @@ static SDL_bool GetButtonIndex(const SDL_MessageBoxData *messageboxdata, Uint32
return SDL_FALSE; return SDL_FALSE;
} }
static INT_PTR MessageBoxDialogProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK MessageBoxDialogProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
{ {
const SDL_MessageBoxData *messageboxdata; const SDL_MessageBoxData *messageboxdata;
size_t buttonindex; size_t buttonindex;
@ -742,7 +742,7 @@ WIN_ShowOldMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
ParentWindow = ((SDL_WindowData*)messageboxdata->window->driverdata)->hwnd; ParentWindow = ((SDL_WindowData*)messageboxdata->window->driverdata)->hwnd;
} }
result = DialogBoxIndirectParam(NULL, (DLGTEMPLATE*)dialog->lpDialog, ParentWindow, (DLGPROC)MessageBoxDialogProc, (LPARAM)messageboxdata); result = DialogBoxIndirectParam(NULL, (DLGTEMPLATE*)dialog->lpDialog, ParentWindow, MessageBoxDialogProc, (LPARAM)messageboxdata);
if (result >= IDBUTTONINDEX0 && result - IDBUTTONINDEX0 < messageboxdata->numbuttons) { if (result >= IDBUTTONINDEX0 && result - IDBUTTONINDEX0 < messageboxdata->numbuttons) {
*buttonid = messageboxdata->buttons[result - IDBUTTONINDEX0].buttonid; *buttonid = messageboxdata->buttons[result - IDBUTTONINDEX0].buttonid;
retval = 0; retval = 0;