From 5872be28a243acb3b5aafdf13248e07d30471893 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 2 Jan 2016 17:54:55 +0100 Subject: Windows: Fix Dll hijacking vulnerability affecting installer that allows arbitrary code execution with elevation of privilege (CVE-2016-1281) --- src/Mount/Mount.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Mount/Mount.c') diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index 6d88512f..59023200 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -4286,8 +4286,8 @@ void BuildTree (HWND hwndDlg, HWND hTree) return; hBitmapMask = LoadBitmap (hInst, MAKEINTRESOURCE (IDB_DRIVEICON_MASK)); - hList = ImageList_Create (16, 12, ILC_COLOR8|ILC_MASK, 2, 2); - if (ImageList_Add (hList, hBitmap, hBitmapMask) == -1) + hList = CreateImageList (16, 12, ILC_COLOR8|ILC_MASK, 2, 2); + if (AddBitmapToImageList (hList, hBitmap, hBitmapMask) == -1) { DeleteObject (hBitmap); DeleteObject (hBitmapMask); @@ -4306,7 +4306,7 @@ void BuildTree (HWND hwndDlg, HWND hTree) return; hBitmapMask = LoadBitmap (hInst, MAKEINTRESOURCE (IDB_SYS_DRIVEICON_MASK)); - if (ImageList_Add (hList, hBitmap, hBitmapMask) == -1) + if (AddBitmapToImageList (hList, hBitmap, hBitmapMask) == -1) { DeleteObject (hBitmap); DeleteObject (hBitmapMask); @@ -8663,7 +8663,6 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz if (BootEncObj == NULL) AbortProcess ("INIT_SYS_ENC"); - InitCommonControls (); InitApp (hInstance, lpszCommandLine); RegisterRedTick(hInstance); -- cgit v1.2.3