80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Reverted the win_dynld.c "fix".

Browse Source
This commit is contained in:
OBattler
2022-11-02 14:47:08 +01:00
parent 3720077d6d
commit b95de093aa
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/win_dynld.c
View File

@@ -23,7 +23,6 @@
#include <windows.h> #include <windows.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h> #include <86box/plat_dynld.h>
@@ -53,11 +52,9 @@ dynld_module(const char *name, dllimp_t *table)
HMODULE h; HMODULE h;
dllimp_t *imp; dllimp_t *imp;
void *func; void *func;
WCHAR uname[512];
/* See if we can load the desired module. */ /* See if we can load the desired module. */
mbstoc16s(uname, name, strlen(name) + 1); if ((h = LoadLibrary((WCHAR *) name)) == NULL) {
if ((h = LoadLibrary(uname)) == NULL) {
dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError()); dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
return(NULL); return(NULL);
} }

5
src/win/win_dynld.c
View File

@@ -23,7 +23,6 @@
#include <windows.h> #include <windows.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h> #include <86box/plat_dynld.h>
@@ -53,11 +52,9 @@ dynld_module(const char *name, dllimp_t *table)
HMODULE h; HMODULE h;
dllimp_t *imp; dllimp_t *imp;
void *func; void *func;
WCHAR uname[512];
/* See if we can load the desired module. */ /* See if we can load the desired module. */
mbstoc16s(uname, name, strlen(name) + 1); if ((h = LoadLibrary((WCHAR *) name)) == NULL) {
if ((h = LoadLibrary(uname)) == NULL) {
dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError()); dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
return(NULL); return(NULL);
} }