[ros-diffs] [tkreuzer] 41049: Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h

Author: tkreuzer
Date: Sat May 23 04:15:56 2009
New Revision: 41049

URL: http://svn.reactos.org/svn/reactos?rev=41049&view=rev
Log:
Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c

Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 04:15:56 2009
@@ -81,7 +81,8 @@

#define MRUF_STRING_LIST 0

-typedef int (WINAPI *CREATEMRULISTW)(
+// FIXME: CREATEMRULISTW is also a structure, see explorer_new/undoc.h
+typedef HANDLE (WINAPI *CREATEMRULISTW)(
     LPMRUINFO lpmi
 );

@@ -105,7 +106,7 @@
 static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj);
 static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface);

-int OpenMRUList(HKEY hKey);
+HANDLE OpenMRUList(HKEY hKey);
 void LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, WCHAR * szExt);
 void LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, WCHAR * szExt);
 void InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName);
@@ -424,7 +425,7 @@
     WCHAR * pFileExt;
     HKEY hKey;
     LONG result;
-    int hList;
+    HANDLE hList;

/* get file extension */
     pFileExt = wcsrchr(szFileName, L'.');
@@ -448,10 +449,10 @@
     }

/* insert the entry */
-    result = (*AddMRUStringW)((HANDLE)hList, szAppName);
+    result = (*AddMRUStringW)(hList, szAppName);

/* close mru list */
-    (*FreeMRUList)((HANDLE)hList);
+    (*FreeMRUList)(hList);
     /* create mru list key */
     RegCloseKey(hKey);
 }
@@ -994,7 +995,7 @@
    FIXME("implement me :)))\n");
 }

-int
+HANDLE
 OpenMRUList(HKEY hKey)
 {
     MRUINFO info;
@@ -1031,7 +1032,7 @@
 void
 AddItemFromMRUList(POPEN_WITH_CONTEXT pContext, HKEY hKey)
 {
-    int hList;
+    HANDLE hList;
     int nItem, nCount, nResult;
     WCHAR szBuffer[MAX_PATH];