ChangeLog: Normalize win2000, nt2k, nt2000 to win2k, normalize win2k3 to win2003 (spotted by Vincent Beron) diff -ur --exclude-from=diff-exclusions ../head/programs/winecfg/main.c programs/winecfg/main.c --- ../head/programs/winecfg/main.c 2003-09-08 20:29:28.000000000 +0100 +++ programs/winecfg/main.c 2003-09-11 17:37:22.000000000 +0100 @@ -64,6 +64,17 @@ char *curDOSVer = getConfigValue("Version", "DOS", "6.22"); char *curWineLook = getConfigValue("Tweak.Layout", "WineLook", "win95"); + /* normalize the version strings */ + if (!strcmp(curWinVer, "win2000") || !strcmp(curWinVer, "nt2k") || !strcmp(curWinVer, "nt2000")) { + free(curWinVer); + curWinVer = strdup("win2k"); + } + + if (!strcmp(curWinVer, "win2k3")) { + free(curWinVer); + curWinVer = strdup("win2003"); + } + if ((pVer = getWinVersions ())) { for (i = 0; *pVer->szVersion; i++, pVer++) diff -ur --exclude-from=diff-exclusions ../head/programs/winecfg/properties.c programs/winecfg/properties.c --- ../head/programs/winecfg/properties.c 2003-09-08 19:58:07.000000000 +0100 +++ programs/winecfg/properties.c 2003-09-11 17:30:56.000000000 +0100 @@ -34,8 +34,8 @@ {"win98", "Windows 98"}, {"winme", "Windows ME"}, {"win2k", "Windows 2000"}, - {"win2k3", "Windows 2003"}, {"winxp", "Windows XP"}, + {"win2003", "Windows 2003"}, {"", ""} }; Only in programs/winecfg: winecfg