Skip to content

Commit 4a2124a

Browse files
jet2jetjet2jet
committed
Replace m_hInstance with m_hResInstance or corresponding function calls
1 parent f4a8c27 commit 4a2124a

8 files changed

Lines changed: 76 additions & 41 deletions

File tree

‎Common/AppClass.cpp‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ EXTERN_C int APIENTRY MyWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
2727
s_app.pMainApp->m_dwThreadID = ::GetCurrentThreadId();
2828
s_app.pMainApp->m_hThread = ::GetCurrentThread();
2929
s_app.pMainApp->m_hInstance = hInstance;
30+
s_app.pMainApp->m_hResInstance = hInstance;
3031
s_app.pMainApp->m_lpCmdLine = lpCmdLine;
3132
s_app.pMainApp->m_nCmdShow = nCmdShow;
3233
if (!s_app.pMainApp->InitInstance())
@@ -45,6 +46,7 @@ EXTERN_C BOOL APIENTRY MyDllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpR
4546
if (!s_app.pDLLApp)
4647
return FALSE;
4748
s_app.pDLLApp->m_hInstance = hInstance;
49+
s_app.pDLLApp->m_hResInstance = hInstance;
4850
if (!s_app.pDLLApp->InitInstance())
4951
{
5052
s_app.pDLLApp->ExitInstance();
@@ -89,6 +91,16 @@ EXTERN_C HINSTANCE WINAPI MyGetCurrentInstance()
8991
return NULL;
9092
}
9193

94+
EXTERN_C HINSTANCE WINAPI MyGetCurrentResourceInstance()
95+
{
96+
if (s_app.pMainApp)
97+
return s_app.pMainApp->GetResourceInstance();
98+
else if (s_app.pDLLApp)
99+
return s_app.pDLLApp->GetResourceInstance();
100+
else
101+
return NULL;
102+
}
103+
92104
////////////////////////////////////////////////////////////////////////////////
93105

94106
CMyThread::CMyThread()
@@ -270,6 +282,10 @@ bool CMyWinThread::PumpMessage()
270282
////////////////////////////////////////////////////////////////////////////////
271283

272284
CMyApplication::CMyApplication()
285+
: m_hInstance(nullptr)
286+
, m_hResInstance(nullptr)
287+
, m_lpCmdLine(nullptr)
288+
, m_nCmdShow(SW_SHOWNORMAL)
273289
{
274290
if (!s_app.pMainApp)
275291
s_app.pMainApp = this;
@@ -283,6 +299,8 @@ CMyApplication::~CMyApplication()
283299
////////////////////////////////////////////////////////////////////////////////
284300

285301
CMyDLLApplication::CMyDLLApplication()
302+
: m_hInstance(nullptr)
303+
, m_hResInstance(nullptr)
286304
{
287305
if (!s_app.pDLLApp)
288306
s_app.pDLLApp = this;

‎Common/AppClass.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,15 @@ class DECLSPEC_NOVTABLE CMyApplication : public CMyWinThread
6262
virtual ~CMyApplication();
6363

6464
HINSTANCE m_hInstance;
65+
HINSTANCE m_hResInstance;
6566
LPTSTR m_lpCmdLine;
6667
int m_nCmdShow;
6768

69+
inline HINSTANCE GetResourceInstance() const
70+
{
71+
return m_hResInstance ? m_hResInstance : m_hInstance;
72+
}
73+
6874
public:
6975
//virtual bool InitInstance() = 0;
7076
};
@@ -76,6 +82,12 @@ class DECLSPEC_NOVTABLE CMyDLLApplication : public CMyThread
7682
virtual ~CMyDLLApplication();
7783

7884
HINSTANCE m_hInstance;
85+
HINSTANCE m_hResInstance;
86+
87+
inline HINSTANCE GetResourceInstance() const
88+
{
89+
return m_hResInstance ? m_hResInstance : m_hInstance;
90+
}
7991

8092
public:
8193
virtual bool InitInstance() = 0;
@@ -86,6 +98,7 @@ CMyThread* WINAPI GetCurThread();
8698
CMyApplication* WINAPI GetCurApp();
8799
CMyDLLApplication* WINAPI GetCurDLLApp();
88100
EXTERN_C HINSTANCE WINAPI MyGetCurrentInstance();
101+
EXTERN_C HINSTANCE WINAPI MyGetCurrentResourceInstance();
89102

90103
EXTERN_C int APIENTRY MyWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
91104
LPTSTR lpCmdLine, int nCmdShow);

‎Common/MyDialog.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ INT_PTR CMyDialog::ModalDialogA(HWND hWndParent)
461461
return (INT_PTR) -1;
462462
HGLOBAL hGlobal;
463463
INT_PTR nRet;
464-
HINSTANCE hInst = MyGetCurrentInstance();
464+
HINSTANCE hInst = MyGetCurrentResourceInstance();
465465

466466
hGlobal = _DuplicateDialogTemplate(hInst, MAKEINTRESOURCE(m_uID));
467467
if (hGlobal == NULL)
@@ -491,7 +491,7 @@ INT_PTR CMyDialog::ModalDialogW(HWND hWndParent)
491491
return (INT_PTR) -1;
492492
HGLOBAL hGlobal;
493493
INT_PTR nRet;
494-
HINSTANCE hInst = MyGetCurrentInstance();
494+
HINSTANCE hInst = MyGetCurrentResourceInstance();
495495

496496
hGlobal = _DuplicateDialogTemplate(hInst, MAKEINTRESOURCE(m_uID));
497497
if (hGlobal == NULL)
@@ -527,7 +527,7 @@ HWND CMyDialog::CreateA(HWND hWndParent)
527527
return NULL;
528528
HGLOBAL hGlobal;
529529
HWND hRet;
530-
HINSTANCE hInst = MyGetCurrentInstance();
530+
HINSTANCE hInst = MyGetCurrentResourceInstance();
531531

532532
hGlobal = _DuplicateDialogTemplate(hInst, MAKEINTRESOURCE(m_uID));
533533
if (hGlobal == NULL)
@@ -557,7 +557,7 @@ HWND CMyDialog::CreateW(HWND hWndParent)
557557
return NULL;
558558
HGLOBAL hGlobal;
559559
HWND hRet;
560-
HINSTANCE hInst = MyGetCurrentInstance();
560+
HINSTANCE hInst = MyGetCurrentResourceInstance();
561561

562562
hGlobal = _DuplicateDialogTemplate(hInst, MAKEINTRESOURCE(m_uID));
563563
if (hGlobal == NULL)

‎Common/MyProp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ LPCWSTR CMyPropertyPage::GetPageTitle()
170170

171171
HGLOBAL CMyPropertyPage::GetDialogResource()
172172
{
173-
HINSTANCE hInst = MyGetCurrentInstance();
173+
HINSTANCE hInst = MyGetCurrentResourceInstance();
174174

175175
if (m_hGlobal)
176176
GlobalFree(m_hGlobal);

‎Common/unicode.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ static LPSTR __stdcall _MyLoadStringA(HINSTANCE hInstance, UINT uID)
3232
LPSTR szTemp, szRet;
3333
int nSize, nLen;
3434
if (!hInstance)
35-
hInstance = ::GetModuleHandle(NULL);
35+
{
36+
hInstance = MyGetCurrentResourceInstance();
37+
if (!hInstance)
38+
hInstance = ::GetModuleHandle(NULL);
39+
}
3640
szTemp = (LPSTR) malloc(sizeof(CHAR) * 256);
3741
szTemp[0] = 0;
3842
nSize = 256;
@@ -71,7 +75,7 @@ LPWSTR __stdcall UniLoadStringW(HINSTANCE hInstance, UINT uID)
7175
int nSize, nLen;
7276
if (!hInstance)
7377
{
74-
hInstance = MyGetCurrentInstance();
78+
hInstance = MyGetCurrentResourceInstance();
7579
if (!hInstance)
7680
hInstance = ::GetModuleHandle(NULL);
7781
}

‎EasySFTP/EasySFTP.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -727,26 +727,26 @@ HRESULT CMainApplication::InitGraphics()
727727
if (!m_hImageListFileIcon)
728728
return E_OUTOFMEMORY;
729729

730-
//m_hImageListToolBar = ::ImageList_LoadImage(m_hInstance, MAKEINTRESOURCE(IDB_TOOLBAR),
730+
//m_hImageListToolBar = ::ImageList_LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDB_TOOLBAR),
731731
// 16, 0, CLR_NONE, IMAGE_BITMAP, LR_LOADTRANSPARENT);
732732
//if (!m_hImageListToolBar)
733733
// return false;
734734
m_hImageListToolBar = ::ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
735735
if (!m_hImageListToolBar)
736736
return E_OUTOFMEMORY;
737-
::ImageList_Add(m_hImageListToolBar, ::LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_TOOLBAR)), NULL);
737+
::ImageList_Add(m_hImageListToolBar, ::LoadBitmap(GetResourceInstance(), MAKEINTRESOURCE(IDB_TOOLBAR)), NULL);
738738
m_hImageListToolBarL = ::ImageList_Create(32, 32, ILC_COLOR32 | ILC_MASK, 0, 0);
739739
if (!m_hImageListToolBarL)
740740
return E_OUTOFMEMORY;
741-
::ImageList_Add(m_hImageListToolBarL, ::LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_TOOLBAR_L)), NULL);
741+
::ImageList_Add(m_hImageListToolBarL, ::LoadBitmap(GetResourceInstance(), MAKEINTRESOURCE(IDB_TOOLBAR_L)), NULL);
742742
m_hImageListAddrButtons = ::ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
743743
if (!m_hImageListAddrButtons)
744744
return E_OUTOFMEMORY;
745-
::ImageList_Add(m_hImageListAddrButtons, ::LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_ADDRESS_BUTTONS)), NULL);
745+
::ImageList_Add(m_hImageListAddrButtons, ::LoadBitmap(GetResourceInstance(), MAKEINTRESOURCE(IDB_ADDRESS_BUTTONS)), NULL);
746746
m_hImageListAddrButtonsL = ::ImageList_Create(32, 32, ILC_COLOR32 | ILC_MASK, 0, 0);
747747
if (!m_hImageListAddrButtonsL)
748748
return E_OUTOFMEMORY;
749-
::ImageList_Add(m_hImageListAddrButtonsL, ::LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_ADDRESS_BUTTONS_L)), NULL);
749+
::ImageList_Add(m_hImageListAddrButtonsL, ::LoadBitmap(GetResourceInstance(), MAKEINTRESOURCE(IDB_ADDRESS_BUTTONS_L)), NULL);
750750

751751
return S_OK;
752752
}
@@ -771,13 +771,13 @@ HRESULT CMainApplication::InitWindowClasses()
771771
wcex.cbClsExtra = 0;
772772
wcex.cbWndExtra = 0;
773773
wcex.hInstance = m_hInstance;
774-
wcex.hIcon = LoadIcon(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP));
774+
wcex.hIcon = LoadIcon(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP));
775775
wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
776776
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
777777
//wcex.hbrBackground = NULL;
778778
wcex.lpszMenuName = NULL;
779779
wcex.lpszClassName = strC;
780-
wcex.hIconSm = (HICON) LoadImage(wcex.hInstance, MAKEINTRESOURCE(IDI_EASYFTP),
780+
wcex.hIconSm = (HICON) LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP),
781781
IMAGE_ICON, 16, 16, 0);
782782

783783
if (!::RegisterClassExW(&wcex))
@@ -887,7 +887,7 @@ HRESULT CMainApplication::InitAppData()
887887
m_strTempPath += L'\\';
888888
}
889889

890-
m_hMenuPopup = MyLoadMenuW(m_hInstance, MAKEINTRESOURCEW(IDR_POPUP));
890+
m_hMenuPopup = MyLoadMenuW(GetResourceInstance(), MAKEINTRESOURCEW(IDR_POPUP));
891891

892892
m_strTitle.LoadString(IDS_APP_TITLE);
893893

‎EasySFTP/MainWnd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ LRESULT CMainWindow::OnCreate(WPARAM wParam, LPARAM lParam)
12731273

12741274
m_uDpi = _MyGetDpiForWindow(m_hWnd);
12751275

1276-
m_hMenu = MyLoadMenuW(theApp.m_hInstance, MAKEINTRESOURCEW(IDC_EASYFTP));
1276+
m_hMenu = MyLoadMenuW(MyGetCurrentResourceInstance(), MAKEINTRESOURCEW(IDC_EASYFTP));
12771277
if (!m_hMenu)
12781278
return -1;
12791279
_SetMenuItemAllInfoIfNeed(m_hMenu);
@@ -1407,8 +1407,8 @@ LRESULT CMainWindow::OnCreate(WPARAM wParam, LPARAM lParam)
14071407
m_wndAddress.ChangeCurrentFolder(m_wndListViewLocal.m_lpidlAbsoluteMe);
14081408
m_wndServerAddress.ChangeCurrentFolder(m_wndListViewServer.m_lpidlAbsoluteMe);
14091409

1410-
m_hAccel = ::LoadAccelerators(theApp.m_hInstance, MAKEINTRESOURCE(IDC_EASYFTP));
1411-
m_hIconSecure = (HICON) ::LoadImage(theApp.m_hInstance, MAKEINTRESOURCE(ID_STATUS_SECURE),
1410+
m_hAccel = ::LoadAccelerators(MyGetCurrentResourceInstance(), MAKEINTRESOURCE(IDC_EASYFTP));
1411+
m_hIconSecure = (HICON) ::LoadImage(MyGetCurrentResourceInstance(), MAKEINTRESOURCE(ID_STATUS_SECURE),
14121412
IMAGE_ICON, 16, 16, 0);
14131413

14141414
//::SetMenu(m_hWnd, m_hMenu);
@@ -1930,7 +1930,7 @@ static INT_PTR CALLBACK _AboutDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP
19301930

19311931
void CMainWindow::ShowAboutDialog()
19321932
{
1933-
ExDialogBoxParam(theApp.m_hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), m_hWnd, _AboutDlgProc, 0);
1933+
ExDialogBoxParam(MyGetCurrentResourceInstance(), MAKEINTRESOURCE(IDD_ABOUTBOX), m_hWnd, _AboutDlgProc, 0);
19341934
}
19351935

19361936
void CMainWindow::OnResize()

‎ShellDLL/ShellDLL.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,101 +1303,101 @@ bool CMainDLL::InitInstance()
13031303
auto cxSysSmall = ::GetSystemMetrics(SM_CXSMICON);
13041304
auto cySysSmall = ::GetSystemMetrics(SM_CYSMICON);
13051305
HICON hi;
1306-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1306+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13071307
256, 256, LR_DEFAULTCOLOR);
13081308
if (!hi)
1309-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1309+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13101310
32, 32, LR_DEFAULTCOLOR);
13111311
::ImageList_AddIcon(m_himlIconJumbo, hi);
13121312
if (m_pimlSysIconJumbo)
13131313
m_pimlSysIconJumbo->ReplaceIcon(-1, hi, &m_iEasySFTPIconIndex[iconIndexJumbo]);
13141314
::DestroyIcon(hi);
1315-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1315+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13161316
48, 48, LR_DEFAULTCOLOR);
13171317
if (!hi)
1318-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1318+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13191319
32, 32, LR_DEFAULTCOLOR);
13201320
::ImageList_AddIcon(m_himlIconExtraLarge, hi);
13211321
if (m_pimlSysIconExtraLarge)
13221322
m_pimlSysIconExtraLarge->ReplaceIcon(-1, hi, &m_iEasySFTPIconIndex[iconIndexExtraLarge]);
13231323
::DestroyIcon(hi);
1324-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1324+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13251325
cxSysSmall, cySysSmall, LR_DEFAULTCOLOR);
13261326
if (!hi)
1327-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1327+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13281328
16, 16, LR_DEFAULTCOLOR);
13291329
if (m_pimlSysIconSysSmall)
13301330
m_pimlSysIconSysSmall->ReplaceIcon(-1, hi, &m_iEasySFTPIconIndex[iconIndexSysSmall]);
13311331
::DestroyIcon(hi);
1332-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1332+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13331333
32, 32, LR_DEFAULTCOLOR);
13341334
::ImageList_AddIcon(m_himlIconLarge, hi);
13351335
m_iEasySFTPIconIndex[iconIndexLarge] = ::ImageList_AddIcon(m_himlSysIconLarge, hi);
13361336
::DestroyIcon(hi);
1337-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
1337+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_EASYFTP), IMAGE_ICON,
13381338
16, 16, LR_DEFAULTCOLOR);
13391339
::ImageList_AddIcon(m_himlIconSmall, hi);
13401340
m_iEasySFTPIconIndex[iconIndexSmall] = ::ImageList_AddIcon(m_himlSysIconSmall, hi);
13411341
::DestroyIcon(hi);
13421342

1343-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1343+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13441344
256, 256, LR_DEFAULTCOLOR);
13451345
::ImageList_AddIcon(m_himlIconJumbo, hi);
13461346
if (m_pimlSysIconJumbo)
13471347
m_pimlSysIconJumbo->ReplaceIcon(-1, hi, &m_iNetDriveIconIndex[iconIndexJumbo]);
13481348
::DestroyIcon(hi);
1349-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1349+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13501350
48, 48, LR_DEFAULTCOLOR);
13511351
::ImageList_AddIcon(m_himlIconExtraLarge, hi);
13521352
if (m_pimlSysIconExtraLarge)
13531353
m_pimlSysIconExtraLarge->ReplaceIcon(-1, hi, &m_iNetDriveIconIndex[iconIndexExtraLarge]);
13541354
::DestroyIcon(hi);
1355-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1355+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13561356
cxSysSmall, cySysSmall, LR_DEFAULTCOLOR);
13571357
if (!hi)
1358-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1358+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13591359
16, 16, LR_DEFAULTCOLOR);
13601360
if (m_pimlSysIconSysSmall)
13611361
m_pimlSysIconSysSmall->ReplaceIcon(-1, hi, &m_iNetDriveIconIndex[iconIndexSysSmall]);
13621362
::DestroyIcon(hi);
1363-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1363+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13641364
32, 32, LR_DEFAULTCOLOR);
13651365
::ImageList_AddIcon(m_himlIconLarge, hi);
13661366
m_iNetDriveIconIndex[iconIndexLarge] = ::ImageList_AddIcon(m_himlSysIconLarge, hi);
13671367
::DestroyIcon(hi);
1368-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
1368+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NETDRIVE), IMAGE_ICON,
13691369
16, 16, LR_DEFAULTCOLOR);
13701370
::ImageList_AddIcon(m_himlIconSmall, hi);
13711371
m_iNetDriveIconIndex[iconIndexSmall] = ::ImageList_AddIcon(m_himlSysIconSmall, hi);
13721372
::DestroyIcon(hi);
13731373

1374-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1374+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
13751375
256, 256, LR_DEFAULTCOLOR);
13761376
::ImageList_AddIcon(m_himlIconJumbo, hi);
13771377
if (m_pimlSysIconJumbo)
13781378
m_pimlSysIconJumbo->ReplaceIcon(-1, hi, &m_iNewHostIconIndex[iconIndexJumbo]);
13791379
::DestroyIcon(hi);
13801380
m_iNewHostIconIndex[iconIndexJumbo] = -1;
1381-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1381+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
13821382
48, 48, LR_DEFAULTCOLOR);
13831383
::ImageList_AddIcon(m_himlIconExtraLarge, hi);
13841384
if (m_pimlSysIconExtraLarge)
13851385
m_pimlSysIconExtraLarge->ReplaceIcon(-1, hi, &m_iNewHostIconIndex[iconIndexExtraLarge]);
13861386
::DestroyIcon(hi);
1387-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1387+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
13881388
cxSysSmall, cySysSmall, LR_DEFAULTCOLOR);
13891389
if (!hi)
1390-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1390+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
13911391
16, 16, LR_DEFAULTCOLOR);
13921392
if (m_pimlSysIconSysSmall)
13931393
m_pimlSysIconSysSmall->ReplaceIcon(-1, hi, &m_iNewHostIconIndex[iconIndexSysSmall]);
13941394
::DestroyIcon(hi);
1395-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1395+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
13961396
32, 32, LR_DEFAULTCOLOR);
13971397
::ImageList_AddIcon(m_himlIconLarge, hi);
13981398
m_iNewHostIconIndex[iconIndexLarge] = ::ImageList_AddIcon(m_himlSysIconLarge, hi);
13991399
::DestroyIcon(hi);
1400-
hi = (HICON) ::LoadImage(m_hInstance, MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
1400+
hi = (HICON) ::LoadImage(GetResourceInstance(), MAKEINTRESOURCE(IDI_NEWHOST), IMAGE_ICON,
14011401
16, 16, LR_DEFAULTCOLOR);
14021402
::ImageList_AddIcon(m_himlIconSmall, hi);
14031403
m_iNewHostIconIndex[iconIndexSmall] = ::ImageList_AddIcon(m_himlSysIconSmall, hi);
@@ -1412,8 +1412,8 @@ bool CMainDLL::InitInstance()
14121412
m_hFontWindow = ::CreateFontIndirect(&ncm.lfMessageFont);
14131413
}
14141414

1415-
m_hMenuPopup = MyLoadMenuW(m_hInstance, MAKEINTRESOURCEW(IDR_POPUP));
1416-
m_hMenuContext = MyLoadMenuW(m_hInstance, MAKEINTRESOURCEW(IDR_SHELLMENU));
1415+
m_hMenuPopup = MyLoadMenuW(GetResourceInstance(), MAKEINTRESOURCEW(IDR_POPUP));
1416+
m_hMenuContext = MyLoadMenuW(GetResourceInstance(), MAKEINTRESOURCEW(IDR_SHELLMENU));
14171417

14181418
// Build the INI file name
14191419
{

0 commit comments

Comments
 (0)