diff options
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.cpp | 6 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.h | 6 | ||||
-rw-r--r-- | backends/text-to-speech/windows/sphelper-scummvm.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp index 7efcb00aa1..844c6bad52 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, uint codePage) { +wchar_t *ansiToUnicode(const char *s, unsigned int codePage) { DWORD size = MultiByteToWideChar(codePage, 0, s, -1, NULL, 0); if (size > 0) { @@ -93,7 +93,7 @@ wchar_t *ansiToUnicode(const char *s, uint codePage) { return NULL; } -char *unicodeToAnsi(const wchar_t *s, uint codePage) { +char *unicodeToAnsi(const wchar_t *s, unsigned int 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, uint codePage) { return NULL; } -uint getCurrentCharset() { +unsigned int 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 8bd60239df..f2e16faeb2 100644 --- a/backends/platform/sdl/win32/win32_wrapper.h +++ b/backends/platform/sdl/win32/win32_wrapper.h @@ -45,7 +45,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion); * * @note Return value must be freed by the caller. */ -wchar_t *ansiToUnicode(const char *s, uint codePage = CP_ACP); +wchar_t *ansiToUnicode(const char *s, unsigned int 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 +55,9 @@ wchar_t *ansiToUnicode(const char *s, uint codePage = CP_ACP); * * @note Return value must be freed by the caller. */ -char *unicodeToAnsi(const wchar_t *s, uint codePage = CP_ACP); +char *unicodeToAnsi(const wchar_t *s, unsigned int codePage = CP_ACP); -uint getCurrentCharset(); +unsigned int getCurrentCharset(); } diff --git a/backends/text-to-speech/windows/sphelper-scummvm.h b/backends/text-to-speech/windows/sphelper-scummvm.h index d910a65f67..d622fda593 100644 --- a/backends/text-to-speech/windows/sphelper-scummvm.h +++ b/backends/text-to-speech/windows/sphelper-scummvm.h @@ -1371,7 +1371,7 @@ public: WAVEFORMATEX * m_pCoMemWaveFormatEx; - static CoMemCopyWFEX(const WAVEFORMATEX * pSrc, WAVEFORMATEX ** ppCoMemWFEX) + static HRESULT CoMemCopyWFEX(const WAVEFORMATEX * pSrc, WAVEFORMATEX ** ppCoMemWFEX) { ULONG cb = sizeof(WAVEFORMATEX) + pSrc->cbSize; *ppCoMemWFEX = (WAVEFORMATEX *)::CoTaskMemAlloc(cb); |