[REACTOS] Fix 64 bit issues

[reactos.git] / base / shell / explorer / startctxmnu.cpp

diff --git a/base/shell/explorer/startctxmnu.cpp b/base/shell/explorer/startctxmnu.cpp
index 4e625f1..ba5b766 100644 (file)
--- a/base/shell/explorer/startctxmnu.cpp
+++ b/base/shell/explorer/startctxmnu.cpp
@@ -29,23 +29,23 @@ class CStartMenuBtnCtxMenu :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IContextMenu
 {
-    HWND hWndOwner;
-    CComPtr<ITrayWindow> TrayWnd;
-    CComPtr<IContextMenu> pcm;
-    CComPtr<IShellFolder> psf;
-    LPITEMIDLIST pidl;
+    CComPtr<ITrayWindow>  m_TrayWnd;
+    CComPtr<IContextMenu> m_Inner;
+    CComPtr<IShellFolder> m_Folder;
+
+    HWND m_Owner;
+    LPITEMIDLIST m_FolderPidl;
 
     HRESULT CreateContextMenuFromShellFolderPidl(HMENU hPopup)
     {
-        CComPtr<IContextMenu> pcm;
         HRESULT hRet;
 
-        hRet = psf->GetUIObjectOf(hWndOwner, 1, (LPCITEMIDLIST *) &pidl, IID_NULL_PPV_ARG(IContextMenu, &pcm));
+        hRet = m_Folder->GetUIObjectOf(m_Owner, 1, (LPCITEMIDLIST *) &m_FolderPidl, IID_NULL_PPV_ARG(IContextMenu, &m_Inner));
         if (SUCCEEDED(hRet))
         {
             if (hPopup != NULL)
             {
-                hRet = pcm->QueryContextMenu(
+                hRet = m_Inner->QueryContextMenu(
                     hPopup,
                     0,
                     ID_SHELL_CMD_FIRST,
@@ -70,10 +70,10 @@ class CStartMenuBtnCtxMenu :
         HRESULT hRet;
 
         /* Add the "Open All Users" menu item */
-        if (LoadString(hExplorerInstance,
-            IDS_PROPERTIES,
-            szBuf,
-            sizeof(szBuf) / sizeof(szBuf[0])))
+        if (LoadStringW(hExplorerInstance,
+                        IDS_PROPERTIES,
+                        szBuf,
+                        _countof(szBuf)))
         {
             AppendMenu(hPopup,
                        MF_STRING,
@@ -84,7 +84,7 @@ class CStartMenuBtnCtxMenu :
         if (!SHRestricted(REST_NOCOMMONGROUPS))
         {
             /* Check if we should add menu items for the common start menu */
-            hRet = SHGetFolderPath(hWndOwner,
+            hRet = SHGetFolderPath(m_Owner,
                                    CSIDL_COMMON_STARTMENU,
                                    NULL,
                                    SHGFP_TYPE_CURRENT,
@@ -103,10 +103,10 @@ class CStartMenuBtnCtxMenu :
                                NULL);
 
                     /* Add the "Open All Users" menu item */
-                    if (LoadString(hExplorerInstance,
-                        IDS_OPEN_ALL_USERS,
-                        szBuf,
-                        sizeof(szBuf) / sizeof(szBuf[0])))
+                    if (LoadStringW(hExplorerInstance,
+                                    IDS_OPEN_ALL_USERS,
+                                    szBuf,
+                                    _countof(szBuf)))
                     {
                         AppendMenu(hPopup,
                                    MF_STRING,
@@ -115,10 +115,10 @@ class CStartMenuBtnCtxMenu :
                     }
 
                     /* Add the "Explore All Users" menu item */
-                    if (LoadString(hExplorerInstance,
-                        IDS_EXPLORE_ALL_USERS,
-                        szBuf,
-                        sizeof(szBuf) / sizeof(szBuf[0])))
+                    if (LoadStringW(hExplorerInstance,
+                                    IDS_EXPLORE_ALL_USERS,
+                                    szBuf,
+                                    _countof(szBuf)))
                     {
                         AppendMenu(hPopup,
                                    MF_STRING,
@@ -133,8 +133,8 @@ class CStartMenuBtnCtxMenu :
 public:
     HRESULT Initialize(ITrayWindow * pTrayWnd, IN HWND hWndOwner)
     {
-        this->TrayWnd = pTrayWnd;
-        this->hWndOwner = hWndOwner;
+        m_TrayWnd = pTrayWnd;
+        m_Owner = hWndOwner;
         return S_OK;
     }
 
@@ -150,21 +150,21 @@ public:
         HRESULT hRet;
 
         psfDesktop = NULL;
-        pcm = NULL;
+        m_Inner = NULL;
 
-        pidlStart = SHCloneSpecialIDList(hWndOwner, CSIDL_STARTMENU, TRUE);
+        pidlStart = SHCloneSpecialIDList(m_Owner, CSIDL_STARTMENU, TRUE);
 
         if (pidlStart != NULL)
         {
-            pidl = ILClone(ILFindLastID(pidlStart));
+            m_FolderPidl = ILClone(ILFindLastID(pidlStart));
             ILRemoveLastID(pidlStart);
 
-            if (pidl != NULL)
+            if (m_FolderPidl != NULL)
             {
                 hRet = SHGetDesktopFolder(&psfDesktop);
                 if (SUCCEEDED(hRet))
                 {
-                    hRet = psfDesktop->BindToObject(pidlStart, NULL, IID_PPV_ARG(IShellFolder, &psf));
+                    hRet = psfDesktop->BindToObject(pidlStart, NULL, IID_PPV_ARG(IShellFolder, &m_Folder));
                     if (SUCCEEDED(hRet))
                     {
                         CreateContextMenuFromShellFolderPidl(hPopup);
@@ -176,13 +176,13 @@ public:
             ILFree(pidlStart);
         }
 
-        return NULL;
+        return S_OK;
     }
 
     virtual HRESULT STDMETHODCALLTYPE
         InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
     {
-        UINT uiCmdId = (UINT)lpici->lpVerb;
+        UINT uiCmdId = PtrToUlong(lpici->lpVerb);
         if (uiCmdId != 0)
         {
             if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST))
@@ -192,21 +192,21 @@ public:
 
                 /* Setup and invoke the shell command */
                 cmici.cbSize = sizeof(cmici);
-                cmici.hwnd = hWndOwner;
+                cmici.hwnd = m_Owner;
                 cmici.lpVerb = MAKEINTRESOURCEA(uiCmdId - ID_SHELL_CMD_FIRST);
                 cmici.nShow = SW_NORMAL;
 
                 /* FIXME: Support Unicode!!! */
-                if (SHGetPathFromIDListA(pidl, szDir))
+                if (SHGetPathFromIDListA(m_FolderPidl, szDir))
                 {
                     cmici.lpDirectory = szDir;
                 }
 
-                pcm->InvokeCommand(&cmici);
+                m_Inner->InvokeCommand(&cmici);
             }
             else
             {
-                TrayWnd->ExecContextMenuCmd(uiCmdId);
+                m_TrayWnd->ExecContextMenuCmd(uiCmdId);
             }
         }
         return S_OK;
@@ -228,18 +228,19 @@ public:
 
     virtual ~CStartMenuBtnCtxMenu()
     {
-        if (pidl)
-            ILFree(pidl);
+        if (m_FolderPidl)
+            ILFree(m_FolderPidl);
     }
 
     BEGIN_COM_MAP(CStartMenuBtnCtxMenu)
         COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
     END_COM_MAP()
 };
-HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu)
+
+HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu)
 {
     CStartMenuBtnCtxMenu * mnu = new CComObject<CStartMenuBtnCtxMenu>();
-    mnu->Initialize(TrayWnd, hWndOwner);
+    mnu->Initialize(m_TrayWnd, m_Owner);
     *ppCtxMenu = mnu;
     return S_OK;
 }