[SHELL32]

[reactos.git] / reactos / dll / win32 / shell32 / COpenWithMenu.cpp

diff --git a/reactos/dll/win32/shell32/COpenWithMenu.cpp b/reactos/dll/win32/shell32/COpenWithMenu.cpp
index 8e141e8..8812b73 100644 (file)
--- a/reactos/dll/win32/shell32/COpenWithMenu.cpp
+++ b/reactos/dll/win32/shell32/COpenWithMenu.cpp
@@ -600,8 +600,6 @@ VOID COpenWithList::LoadRecommendedFromHKCR(LPCWSTR pwszExt)
     dwSize = sizeof(wszBuf);
     if (RegGetValueW(hKey, NULL, L"PerceivedType", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) == ERROR_SUCCESS)
     {
-        RegCloseKey(hKey);
-
         StringCbPrintfW(wszBuf2, sizeof(wszBuf2), L"SystemFileAssociations\\%s", wszBuf);
         if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf2, 0, KEY_READ | KEY_WRITE, &hSubkey) == ERROR_SUCCESS)
         {
@@ -909,6 +907,7 @@ VOID COpenWithDialog::Browse()
     ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     ofn.nMaxFile = (sizeof(wszPath) / sizeof(WCHAR));
     ofn.lpstrFile = wszPath;
+    ofn.lpstrInitialDir = L"%programfiles%";
 
     /* Init title */
     if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH, wszTitle, sizeof(wszTitle) / sizeof(WCHAR)))
@@ -981,7 +980,7 @@ VOID COpenWithDialog::Init(HWND hwnd)
 
         /* Init treeview */
         m_hTreeView = GetDlgItem(hwnd, 14002);
-        m_hImgList = ImageList_Create(16, 16,  ILC_COLOR24 | ILC_MASK, m_pAppList->GetCount() + 1, m_pAppList->GetCount() + 1);
+        m_hImgList = ImageList_Create(16, 16,  ILC_COLOR32 | ILC_MASK, m_pAppList->GetCount() + 1, m_pAppList->GetCount() + 1);
         (void)TreeView_SetImageList(m_hTreeView, m_hImgList, TVSIL_NORMAL);
 
         /* If there are some recommendations add parent nodes: Recommended and Others */
@@ -995,7 +994,7 @@ VOID COpenWithDialog::Init(HWND hwnd)
             tvins.item.mask = TVIF_TEXT|TVIF_STATE|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
             tvins.item.pszText = (LPWSTR)wszBuf;
             tvins.item.state = tvins.item.stateMask = TVIS_EXPANDED;
-            hFolderIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, 0);
+            hFolderIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_PROGRAMS_FOLDER), IMAGE_ICON, 0, 0, 0);
             tvins.item.iImage = tvins.item.iSelectedImage = ImageList_AddIcon(m_hImgList, hFolderIcon);
 
             LoadStringW(shell32_hInstance, IDS_OPEN_WITH_RECOMMENDED, wszBuf, _countof(wszBuf));