dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use LoadLibraryW ()

This commit is contained in:
Luca Bacci 2022-12-30 13:32:10 +01:00 committed by Jehan
parent c98ffb7e0e
commit f7be0cf68e
8 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/gimpbacktrace-windows.c
View File

@ -285,7 +285,7 @@ gimp_backtrace_start (void)
HMODULE hModule; HMODULE hModule;
DWORD options; DWORD options;
hModule = LoadLibraryA ("mgwhelp.dll"); hModule = LoadLibraryW (L"mgwhelp.dll");
#define INIT_PROC(name) \ #define INIT_PROC(name) \
G_STMT_START \ G_STMT_START \

2
modules/gimpinputdevicestore-dx.c
View File

@ -216,7 +216,7 @@ gimp_input_device_store_init (GimpInputDeviceStore *store)
return; return;
} }
if ((dinput8 = LoadLibrary ("dinput8.dll")) == NULL) if ((dinput8 = LoadLibraryW (L"dinput8.dll")) == NULL)
{ {
g_set_error_literal (&store->error, GIMP_MODULE_ERROR, GIMP_MODULE_FAILED, g_set_error_literal (&store->error, GIMP_MODULE_ERROR, GIMP_MODULE_FAILED,
"Could not load dinput8.dll"); "Could not load dinput8.dll");

2
plug-ins/screenshot/screenshot-win32-dwm-api.h
View File

@ -61,7 +61,7 @@ LoadRequiredDwmFunctions (void)
{ {
if (dwmApi) return TRUE; if (dwmApi) return TRUE;
dwmApi = LoadLibrary ("dwmapi"); dwmApi = LoadLibraryW (L"dwmapi");
if (! dwmApi) return FALSE; if (! dwmApi) return FALSE;
DwmGetWindowAttribute = (DWMGETWINDOWATTRIBUTE) GetProcAddress (dwmApi, "DwmGetWindowAttribute"); DwmGetWindowAttribute = (DWMGETWINDOWATTRIBUTE) GetProcAddress (dwmApi, "DwmGetWindowAttribute");

2
plug-ins/screenshot/screenshot-win32-magnification-api.h
View File

@ -112,7 +112,7 @@ BOOL LoadMagnificationLibrary(void)
{ {
if (magnificationLibrary) return TRUE; if (magnificationLibrary) return TRUE;
magnificationLibrary = LoadLibrary("Magnification"); magnificationLibrary = LoadLibraryW(L"Magnification");
if (!magnificationLibrary) return FALSE; if (!magnificationLibrary) return FALSE;
MagInitialize = (MAGINITIALIZE)GetProcAddress(magnificationLibrary,"MagInitialize"); MagInitialize = (MAGINITIALIZE)GetProcAddress(magnificationLibrary,"MagInitialize");

2
plug-ins/screenshot/screenshot-win32.c
View File

@ -1207,7 +1207,7 @@ BOOL
InitInstance (HINSTANCE hInstance, InitInstance (HINSTANCE hInstance,
int nCmdShow) int nCmdShow)
{ {
HINSTANCE User32Library = LoadLibrary ("user32.dll"); HINSTANCE User32Library = LoadLibraryW (L"user32.dll");
if (User32Library) if (User32Library)
{ {

15
plug-ins/script-fu/libscriptfu/tinyscheme/dynload.c
View File

@ -9,6 +9,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <glib/glib.h>
#ifndef MAXPATHLEN #ifndef MAXPATHLEN
# define MAXPATHLEN 1024 # define MAXPATHLEN 1024
#endif #endif
@ -44,8 +46,17 @@ typedef void (*FARPROC)();
} }
static HMODULE dl_attach(const char *module) { static HMODULE dl_attach(const char *module) {
HMODULE dll = LoadLibrary(module); wchar_t *module_utf16 = g_utf8_to_utf16 (module, -1, NULL, NULL, NULL);
if (!dll) display_w32_error_msg(module); HMODULE dll = NULL;
if (!module_utf16)
return NULL;
dll = LoadLibraryW (module_utf16);
if (!dll)
display_w32_error_msg (module);
free (module_utf16);
return dll; return dll;
} }

1
plug-ins/twain/tw_platform.h
View File

@ -25,6 +25,7 @@
#include "twain.h" #include "twain.h"
/* The DLL to be loaded for TWAIN support */ /* The DLL to be loaded for TWAIN support */
#define TWAIN_DLL_NAME_W L"TWAIN_32.DLL"
#define TWAIN_DLL_NAME "TWAIN_32.DLL" #define TWAIN_DLL_NAME "TWAIN_32.DLL"
#define DEBUG_LOGFILE "c:\\twain.log" #define DEBUG_LOGFILE "c:\\twain.log"
#define DUMP_FILE "C:\\TWAINCAP.BIN" #define DUMP_FILE "C:\\TWAINCAP.BIN"

2
plug-ins/twain/tw_win.c
View File

@ -92,7 +92,7 @@ twainIsAvailable(void)
} }
/* Attempt to load the library */ /* Attempt to load the library */
hDLL = LoadLibrary(TWAIN_DLL_NAME); hDLL = LoadLibraryW (TWAIN_DLL_NAME_W);
if (hDLL == NULL) if (hDLL == NULL)
return FALSE; return FALSE;