libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 03:24:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIN32: Re-enable Win32PluginProvider

Browse Source 
In 2006, Win32PluginProvider was removed from Windows builds:
df5be194098e188f9cd3234af2bea34b67d19da2

Instead, SdlPluginProvider became the provider used in Window builds.
Currently, no code uses Win32PluginProvider.

The two classes are small and effectively do the same thing, but
Win32PluginProvider has the advantage of using our Windows string
conversion functions for paths, just like the rest of backend code.
We've seen problems before where SDL handles encoding differently:
0ab9653556f837ced66f73de8499170dcd3079be
This commit is contained in:
sluicebox 2023-04-17 11:51:52 -07:00 committed by Eugene Sandulenko
parent 0dab07df4a
commit dc0ba4e14a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backends/platform/sdl/win32/win32-main.cpp
View File

@ -35,7 +35,7 @@
#include "backends/platform/sdl/win32/win32.h"
#include "backends/platform/sdl/win32/win32_wrapper.h"
#include "backends/plugins/sdl/sdl-provider.h"
#include "backends/plugins/win32/win32-provider.h"
#include "base/main.h"
int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
g_system->init();
#ifdef DYNAMIC_MODULES
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
PluginManager::instance().addPluginProvider(new Win32PluginProvider());
#endif
// Invoke the actual ScummVM main entry point:

9
backends/plugins/win32/win32-provider.cpp
View File

@ -59,7 +59,7 @@ public:
free(tFilename);
if (!_dlHandle) {
debug("Failed loading plugin '%s' (error code %d)", _filename.c_str(), (int32) GetLastError());
warning("Failed loading plugin '%s' (error code %d)", _filename.c_str(), (int32) GetLastError());
return false;
} else {
debug(1, "Success loading plugin '%s', handle %p", _filename.c_str(), _dlHandle);
@ -72,7 +72,7 @@ public:
DynamicPlugin::unloadPlugin();
if (_dlHandle) {
if (!FreeLibrary((HMODULE)_dlHandle))
debug("Failed unloading plugin '%s'", _filename.c_str());
warning("Failed unloading plugin '%s'", _filename.c_str());
else
debug(1, "Success unloading plugin '%s'", _filename.c_str());
_dlHandle = 0;
@ -88,10 +88,7 @@ Plugin* Win32PluginProvider::createPlugin(const Common::FSNode &node) const {
bool Win32PluginProvider::isPluginFilename(const Common::FSNode &node) const {
// Check the plugin suffix
Common::String filename = node.getName();
if (!filename.hasSuffix(".dll"))
return false;
return true;
return filename.hasSuffix(".dll");
}