Mercurial > vim

comparison src/gui_w32.c @ 2612:fa5dee44df3f v7.3.034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.034 Problem: Win32: may be loading .dll from the wrong directory. Solution: Go to the Vim executable directory when opening a library.
author Bram Moolenaar <bram@vim.org>
date Sat, 23 Oct 2010 14:02:54 +0200
parents 6768ebd0bc04
children 56ecdb792c33
comparison
equal deleted inserted replaced
2611:5b154df6fcd8 2612:fa5dee44df3f
1258 os_version.dwOSVersionInfoSize = sizeof(os_version); 1258 os_version.dwOSVersionInfoSize = sizeof(os_version);
1259 GetVersionEx(&os_version); /* this call works on Win32s, Win95 and WinNT */ 1259 GetVersionEx(&os_version); /* this call works on Win32s, Win95 and WinNT */
1260 1260
1261 /* try and load the user32.dll library and get the entry points for 1261 /* try and load the user32.dll library and get the entry points for
1262 * multi-monitor-support. */ 1262 * multi-monitor-support. */
1263 if ((user32_lib = LoadLibrary("User32.dll")) != NULL) 1263 if ((user32_lib = vimLoadLib("User32.dll")) != NULL)
1264 { 1264 {
1265 pMonitorFromWindow = (TMonitorFromWindow)GetProcAddress(user32_lib, 1265 pMonitorFromWindow = (TMonitorFromWindow)GetProcAddress(user32_lib,
1266 "MonitorFromWindow"); 1266 "MonitorFromWindow");
1267 1267
1268 /* there are ...A and ...W version of GetMonitorInfo - looking at 1268 /* there are ...A and ...W version of GetMonitorInfo - looking at
4186 4186
4187 #if defined(FEAT_MBYTE_IME) && defined(DYNAMIC_IME) 4187 #if defined(FEAT_MBYTE_IME) && defined(DYNAMIC_IME)
4188 static void 4188 static void
4189 dyn_imm_load(void) 4189 dyn_imm_load(void)
4190 { 4190 {
4191 hLibImm = LoadLibrary("imm32.dll"); 4191 hLibImm = vimLoadLib("imm32.dll");
4192 if (hLibImm == NULL) 4192 if (hLibImm == NULL)
4193 return; 4193 return;
4194 4194
4195 pImmGetCompositionStringA 4195 pImmGetCompositionStringA
4196 = (void *)GetProcAddress(hLibImm, "ImmGetCompositionStringA"); 4196 = (void *)GetProcAddress(hLibImm, "ImmGetCompositionStringA");