dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Just load the library

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7293 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-08-17 18:30:33 +00:00
parent 0be4164270
commit 1768555f2b
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Makensisw/toolbar.cpp
View file

@ -87,7 +87,7 @@ static void LoadToolBarImages()
HWND hTB = g_toolbar.hwnd; HWND hTB = g_toolbar.hwnd;
// Comctl32.dll version detection // Comctl32.dll version detection
#ifndef _WIN64 #ifndef _WIN64
HMODULE hMod = GetModuleHandle(_T("comctl32.dll")); HMODULE hMod = LoadSysLibrary("COMCTL32");
const FARPROC hasCC4_70 = (SupportsW95()) ? GetProcAddress(hMod, "InitCommonControlsEx") : (FARPROC) TRUE; // NT4 shipped with v4.70 const FARPROC hasCC4_70 = (SupportsW95()) ? GetProcAddress(hMod, "InitCommonControlsEx") : (FARPROC) TRUE; // NT4 shipped with v4.70
const FARPROC hasCC4_71 = (SupportsWNT4() || SupportsW95()) ? GetProcAddress(hMod, "DllGetVersion") : (FARPROC) TRUE; // IE4 shipped with v4.71 const FARPROC hasCC4_71 = (SupportsWNT4() || SupportsW95()) ? GetProcAddress(hMod, "DllGetVersion") : (FARPROC) TRUE; // IE4 shipped with v4.71
#else #else

4
Contrib/Makensisw/update.cpp
View file

@ -13,11 +13,11 @@ static LPSTR InetGetErrorStringAllocA(DWORD ec)
DWORD flags = FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_IGNORE_INSERTS; DWORD flags = FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_IGNORE_INSERTS;
if (FormatMessageA(flags|FORMAT_MESSAGE_FROM_SYSTEM, 0, ec, 0, (LPSTR) &buf, 0, 0)) if (FormatMessageA(flags|FORMAT_MESSAGE_FROM_SYSTEM, 0, ec, 0, (LPSTR) &buf, 0, 0))
return buf; return buf;
HMODULE hMod = GetModuleHandle(TEXT("WinInet")); HMODULE hMod = LoadSysLibrary("WinInet");
if (hMod && FormatMessageA(flags|FORMAT_MESSAGE_FROM_HMODULE, hMod, ec, 0, (LPSTR) &buf, 0, 0)) if (hMod && FormatMessageA(flags|FORMAT_MESSAGE_FROM_HMODULE, hMod, ec, 0, (LPSTR) &buf, 0, 0))
return buf; return buf;
#if 0 // We are not using WinHttp* functions #if 0 // We are not using WinHttp* functions
hMod = GetModuleHandle(TEXT("WinHTTP")); hMod = LoadSysLibrary("WinHTTP");
if (hMod && FormatMessageA(flags|FORMAT_MESSAGE_FROM_HMODULE, hMod, ec, 0, (LPSTR) &buf, 0, 0)) if (hMod && FormatMessageA(flags|FORMAT_MESSAGE_FROM_HMODULE, hMod, ec, 0, (LPSTR) &buf, 0, 0))
return buf; return buf;
#endif #endif

4
Contrib/Makensisw/utils.cpp
View file

@ -713,11 +713,11 @@ void InitTooltips(HWND h) {
InitCommonControlsEx(&icx); InitCommonControlsEx(&icx);
DWORD dwStyle = WS_POPUP | WS_BORDER | TTS_ALWAYSTIP; DWORD dwStyle = WS_POPUP | WS_BORDER | TTS_ALWAYSTIP;
DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_TOPMOST; DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
g_tip.tip = CreateWindowEx(dwExStyle,TOOLTIPS_CLASS,NULL,dwStyle,0,0,0,0,h,NULL,GetModuleHandle(NULL),NULL); g_tip.tip = CreateWindowEx(dwExStyle,TOOLTIPS_CLASS,NULL,dwStyle,0,0,0,0,h,NULL,HINST_APPLICATION,NULL);
if (!g_tip.tip) return; if (!g_tip.tip) return;
g_tip.hook = SetWindowsHookEx(WH_GETMESSAGE,TipHookProc,NULL, GetCurrentThreadId()); g_tip.hook = SetWindowsHookEx(WH_GETMESSAGE,TipHookProc,NULL, GetCurrentThreadId());
AddTip(GetDlgItem(h,IDCANCEL),_T("Close MakeNSISW")); AddTip(GetDlgItem(h,IDCANCEL),_T("Close MakeNSISW"));
AddTip(GetDlgItem(h,IDC_TEST),_T("Test the installer generated by MakeNSISW")); AddTip(GetDlgItem(h,IDC_TEST),_T("Test the generated installer"));
AddToolBarTooltips(); AddToolBarTooltips();
} }