From 10625f9d8901123175245a214e3f72c1891a67f5 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 17 Dec 2020 23:50:00 +0300 Subject: [PATCH] SDL_windowsmessagebox.c: go back to hg rev 14458 state. encountering a NULL caption in AddDialogString() is intended, i.e. AddDialogStaticIcon() sends it as NULL on purpose. --- src/video/windows/SDL_windowsmessagebox.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/video/windows/SDL_windowsmessagebox.c b/src/video/windows/SDL_windowsmessagebox.c index 5bf464fa5..3382a2de8 100644 --- a/src/video/windows/SDL_windowsmessagebox.c +++ b/src/video/windows/SDL_windowsmessagebox.c @@ -256,6 +256,10 @@ static SDL_bool AddDialogString(WIN_DialogData *dialog, const char *string) size_t count; SDL_bool status; + if (!string) { + string = ""; + } + wstring = WIN_UTF8ToString(string); if (!wstring) { return SDL_FALSE; @@ -314,7 +318,7 @@ static SDL_bool AddDialogControl(WIN_DialogData *dialog, WORD type, DWORD style, if (!AddDialogData(dialog, &type, sizeof(type))) { return SDL_FALSE; } - if (type == DLGITEMTYPEBUTTON || (type == DLGITEMTYPESTATIC && caption != NULL && caption[0])) { + if (type == DLGITEMTYPEBUTTON || (type == DLGITEMTYPESTATIC && caption != NULL)) { if (!AddDialogString(dialog, caption)) { return SDL_FALSE; } @@ -580,7 +584,6 @@ WIN_ShowOldMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) } /* Jan 25th, 2013 - dant@fleetsa.com - * * * I've tried to make this more reasonable, but I've run in to a lot * of nonsense. @@ -605,8 +608,6 @@ WIN_ShowOldMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) * somewhat correct. * * Honestly, a long term solution is to use CreateWindow, not CreateDialog. - * - * * In order to get text dimensions we need to have a DC with the desired font. * I'm assuming a dialog box in SDL is rare enough we can to the create.