Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Win64 cleanups #329

Merged
merged 26 commits into from Dec 29, 2018
Merged

Win64 cleanups #329

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4b23645
Protect buffer underflow
nicolas-cellier-aka-nice Dec 25, 2018
e9bfeef
Make icon setting 64bits compatible
nicolas-cellier-aka-nice Dec 25, 2018
8df05ee
remove a warning about a control path not returning a value
nicolas-cellier-aka-nice Dec 25, 2018
b2a8bd8
Use TEXT macro for generic (ASCII or WIDE) string method
nicolas-cellier-aka-nice Dec 25, 2018
a08c1fe
Provides a high resolution clock for MSVC
nicolas-cellier-aka-nice Dec 25, 2018
57d09ae
Define some UNIX constants in sqWin32Directory.c, MSVC oblige
nicolas-cellier-aka-nice Dec 25, 2018
ad71bd0
Remove a few printf warnings
nicolas-cellier-aka-nice Dec 26, 2018
8c04d9a
Prefer DirectX8 in MSVC
nicolas-cellier-aka-nice Dec 26, 2018
e0d70a9
Workaround S_ISFIFO to let MSVC compile FilePlugin
nicolas-cellier-aka-nice Dec 27, 2018
9aea67d
Backport Unicode compatibility patches from minheadless variant
nicolas-cellier-aka-nice Dec 27, 2018
f6d2d56
Yet another printLastError Unicode compatibility fix in SoundPlugin
nicolas-cellier-aka-nice Dec 27, 2018
67980fc
Fix another bunch of usage of printLastError uncompatible with Unicode
nicolas-cellier-aka-nice Dec 27, 2018
b52caab
Fix sqWin32Security.c UNICODE problems
nicolas-cellier-aka-nice Dec 27, 2018
28cf9c6
Fix TEXT(VMOPTION('foo"))
nicolas-cellier-aka-nice Dec 27, 2018
9e82899
Concatenate TEXT constants rather than TEXT concatenated constants
nicolas-cellier-aka-nice Dec 27, 2018
4e947da
printLastError & warnPrintf take a TCHAR *, not a char *
nicolas-cellier-aka-nice Dec 27, 2018
3227fcf
DPRINTF takes a TCHAR * when it is a warnPrintf in disguise
nicolas-cellier-aka-nice Dec 27, 2018
8d44470
Splash file and title may use Unicode variant
nicolas-cellier-aka-nice Dec 28, 2018
0eeffa0
windowTitle is not a TCHAR *, it is a UTF8 encoded char *
nicolas-cellier-aka-nice Dec 28, 2018
3d55c5d
make win23OpenGL UNICODE friendly
nicolas-cellier-aka-nice Dec 28, 2018
001d21a
Invoke LoadLibraryA when there's no point to internationalize library…
nicolas-cellier-aka-nice Dec 28, 2018
616cacb
GetProcAddress takes simple byte string procedure name
nicolas-cellier-aka-nice Dec 28, 2018
4b32803
Use GetLocaleInfoA rather than generic version
nicolas-cellier-aka-nice Dec 28, 2018
539c769
remove unused LongFileNameFromPossiblyShortName
nicolas-cellier-aka-nice Dec 28, 2018
7c5fe91
the DPRINTF used in sqWin32PluginSupport.c takes a TCHAR *, not a char *
nicolas-cellier-aka-nice Dec 28, 2018
19ebd67
Handle failure to convert WindowTitle preference to UTF8
nicolas-cellier-aka-nice Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion platforms/win32/vm/sqWin32Prefs.c
View file
Open in desktop
Expand Up @@ -212,7 +212,10 @@ void LoadPreferences()
TCHAR windowTitleT[MAX_PATH];
GetPrivateProfileString(U_GLOBAL, TEXT("WindowTitle"),
TEXT(""), windowTitleT, MAX_PATH, squeakIniName);
WideCharToMultiByte(CP_UTF8, 0, windowTitleT, -1, windowTitle, MAX_PATH, NULL, NULL);
if (WideCharToMultiByte(CP_UTF8, 0, windowTitleT, -1, windowTitle, MAX_PATH, NULL, NULL) == 0) {
printLastError(TEXT("Failed to convert WindowTitle preference to UTF-8"));
windowTitle[0] = 0;
};
}
#else
GetPrivateProfileString(U_GLOBAL, TEXT("WindowTitle"),
Expand Down