Windows startup window tweaks:

- Don't print osd.szCSDVersion when it is empty, preventing an extra space between the OS name and version number. (An example of what this field holds is "Service Pack 1".)
- Under SDL, allow the "console" edit field to repaint after "OK" is clicked. Important when a long def file is loading.

git-svn-id: https://svn.eduke32.com/eduke32@4086 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-10-07 10:05:41 +00:00
parent 333e0f26e2
commit 6bf0bd0c60
3 changed files with 12 additions and 3 deletions

View file

@ -509,6 +509,8 @@ void initprintf(const char *f, ...)
startwin_puts(dabuf); startwin_puts(dabuf);
#ifndef _WIN32 #ifndef _WIN32
startwin_idle(NULL); startwin_idle(NULL);
#else
handleevents();
#endif #endif
Bmemset(dabuf, 0, sizeof(dabuf)); Bmemset(dabuf, 0, sizeof(dabuf));
} }

View file

@ -90,8 +90,10 @@ static void win_printversion(void)
break; break;
} }
initprintf("Windows %s %s (build %lu.%lu.%lu)\n", ver, osv.szCSDVersion, initprintf("Windows %s", ver);
osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); if (osv.szCSDVersion && osv.szCSDVersion[0])
initprintf(" %s", osv.szCSDVersion);
initprintf(" (build %lu.%lu.%lu)\n", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber);
} }
// //
@ -254,6 +256,11 @@ LPTSTR GetWindowsErrorMsg(DWORD code)
return lpMsgBuf; return lpMsgBuf;
} }
//
// Miscellaneous
//
int32_t addsearchpath_ProgramFiles(const char *p) int32_t addsearchpath_ProgramFiles(const char *p)
{ {
int32_t returncode = -1, i; int32_t returncode = -1, i;

View file

@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "sounds.h" #include "sounds.h"
#include "build.h" #include "build.h"
#include "winlayer.h" #include "renderlayer.h"
#include "compat.h" #include "compat.h"
#include "grpscan.h" #include "grpscan.h"