From a7ed10087c8a380d1c6d46ebaa2ed02a9e21ebb9 Mon Sep 17 00:00:00 2001 From: eccles Date: Thu, 30 Oct 2003 23:51:44 +0000 Subject: [PATCH] - Icon and bitmap controls were being passed the file name string on creation which the control would interpret as the name of a resource, and fail. - Now passes hInstance to LoadImage call which seems to solve a bizarre sporadic possible Windows bug where the LR_LOADFROMFILE parameter seems to be ignored. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3078 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 8 ++++++-- Plugins/InstallOptions.dll | Bin 13312 -> 13312 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 38f64e00..ae7ea6b0 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -689,7 +689,7 @@ LRESULT WMCommandProc(HWND hWnd, UINT id, HWND hwndCtl, UINT codeNotify) { ShellExecute(hMainWindow, NULL, pFields[nIdx].pszState, NULL, NULL, SW_SHOWDEFAULT); } } - break; + break; } return 0; } @@ -1043,6 +1043,10 @@ int createCfgDlg() char *title = pFields[nIdx].pszText; switch (nType) { + case FIELD_ICON: + case FIELD_BITMAP: + title = NULL; // otherwise it is treated as the name of a resource + break; case FIELD_CHECKBOX: case FIELD_RADIOBUTTON: if (pFields[nIdx].nFlags & FLAG_RIGHT) @@ -1184,7 +1188,7 @@ int createCfgDlg() LPARAM nImage = 0; if (pFields[nIdx].pszText) { pFields[nIdx].hImage = LoadImage( - 0, + m_hInstance, pFields[nIdx].pszText, nImageType, (pFields[nIdx].nFlags & FLAG_RESIZETOFIT) diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 82b12499185b95c7d126e04e09157f4515f65438..159fc5e61700df88a115b0d85792eb0877d74e36 100644 GIT binary patch delta 1476 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 MYF7?xa1U+$4_z@ZFaQ7m