diff options
Diffstat (limited to 'backends/platform/sdl/win32')
-rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.cpp | 6 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp index 844c6bad52..7efcb00aa1 100644 --- a/backends/platform/sdl/win32/win32_wrapper.cpp +++ b/backends/platform/sdl/win32/win32_wrapper.cpp @@ -81,7 +81,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion) { return VerifyVersionInfoFunc(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask); } -wchar_t *ansiToUnicode(const char *s, unsigned int codePage) { +wchar_t *ansiToUnicode(const char *s, uint codePage) { DWORD size = MultiByteToWideChar(codePage, 0, s, -1, NULL, 0); if (size > 0) { @@ -93,7 +93,7 @@ wchar_t *ansiToUnicode(const char *s, unsigned int codePage) { return NULL; } -char *unicodeToAnsi(const wchar_t *s, unsigned int codePage) { +char *unicodeToAnsi(const wchar_t *s, uint codePage) { DWORD size = WideCharToMultiByte(codePage, 0, s, -1, NULL, 0, 0, 0); if (size > 0) { @@ -105,7 +105,7 @@ char *unicodeToAnsi(const wchar_t *s, unsigned int codePage) { return NULL; } -unsigned int getCurrentCharset() { +uint getCurrentCharset() { #ifdef USE_TRANSLATION Common::String charset = TransMan.getCurrentCharset(); if (charset == "iso-8859-2") diff --git a/backends/platform/sdl/win32/win32_wrapper.h b/backends/platform/sdl/win32/win32_wrapper.h index f2e16faeb2..9fa1a16210 100644 --- a/backends/platform/sdl/win32/win32_wrapper.h +++ b/backends/platform/sdl/win32/win32_wrapper.h @@ -23,6 +23,8 @@ #ifndef PLATFORM_SDL_WIN32_WRAPPER_H #define PLATFORM_SDL_WIN32_WRAPPER_H +#include "common/scummsys.h" + HRESULT SHGetFolderPathFunc(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPSTR pszPath); // Helper functions @@ -45,7 +47,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion); * * @note Return value must be freed by the caller. */ -wchar_t *ansiToUnicode(const char *s, unsigned int codePage = CP_ACP); +wchar_t *ansiToUnicode(const char *s, uint codePage = CP_ACP); /** * Converts a Windows wide-character string into a C string. * Used to interact with Win32 Unicode APIs with no ANSI fallback. @@ -55,9 +57,9 @@ wchar_t *ansiToUnicode(const char *s, unsigned int codePage = CP_ACP); * * @note Return value must be freed by the caller. */ -char *unicodeToAnsi(const wchar_t *s, unsigned int codePage = CP_ACP); +char *unicodeToAnsi(const wchar_t *s, uint codePage = CP_ACP); -unsigned int getCurrentCharset(); +uint getCurrentCharset(); } |