thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unicod-ify syscalls for ce backend

Browse source 
svn-id: r29299
This commit is contained in:
Kostas Nakos 2007-10-28 17:53:52 +00:00
parent b93f68405b
commit 1046213480
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backends/plugins/win32/win32-provider.cpp
View file

@ -37,12 +37,28 @@
class Win32Plugin : public DynamicPlugin { class Win32Plugin : public DynamicPlugin {
private:
static const TCHAR* toUnicode(const char *x) {
#ifndef _WIN32_WCE
return (const TCHAR *)x;
#else
static TCHAR unicodeString[MAX_PATH];
MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, unicodeString, sizeof(unicodeString) / sizeof(TCHAR));
return unicodeString;
#endif
}
protected: protected:
void *_dlHandle; void *_dlHandle;
Common::String _filename; Common::String _filename;
virtual VoidFunc findSymbol(const char *symbol) { virtual VoidFunc findSymbol(const char *symbol) {
#ifndef _WIN32_WCE
void *func = (void *)GetProcAddress((HMODULE)_dlHandle, symbol); void *func = (void *)GetProcAddress((HMODULE)_dlHandle, symbol);
#else
void *func = (void *)GetProcAddress((HMODULE)_dlHandle, toUnicode(symbol));
#endif
if (!func) if (!func)
warning("Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str()); warning("Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str());
@ -62,10 +78,14 @@ public:
bool loadPlugin() { bool loadPlugin() {
assert(!_dlHandle); assert(!_dlHandle);
#ifndef _WIN32_WCE
_dlHandle = LoadLibrary(_filename.c_str()); _dlHandle = LoadLibrary(_filename.c_str());
#else
_dlHandle = LoadLibrary(toUnicode(_filename.c_str()));
#endif
if (!_dlHandle) { if (!_dlHandle) {
warning("Failed loading plugin '%s'", _filename.c_str()); warning("Failed loading plugin '%s' (error code %d)", _filename.c_str(), GetLastError());
return false; return false;
} }