Author: dchapyshev
Date: Tue Feb 3 07:55:04 2009
New Revision: 39322
URL:
http://svn.reactos.org/svn/reactos?rev=39322&view=rev
Log:
- FIXME -> TRACE for InvalidateDriveType. Unimplemented in WinXP SP3
- Add stub for SHFindComputer, SHLimitInputEdit, SHLimitInputCombo
- Add comments
Modified:
trunk/reactos/dll/win32/shell32/shell32.spec
trunk/reactos/dll/win32/shell32/shellord.c
trunk/reactos/dll/win32/shell32/stubs.c
Modified: trunk/reactos/dll/win32/shell32/shell32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Tue Feb 3 07:55:04 2009
@@ -62,7 +62,7 @@
62 stdcall PickIconDlg(long long long long)
63 stdcall GetFileNameFromBrowse(long long long long str str str)
64 stdcall DriveType(long)
-65 stdcall -noname InvalidateDriveType(long) # Fixme
+65 stdcall -noname InvalidateDriveType(long)
66 stdcall IsNetDrive(long)
67 stdcall Shell_MergeMenus(long long long long long long)
68 stdcall SHGetSetSettings(ptr long long)
@@ -88,7 +88,7 @@
88 stdcall SHDoDragDrop(long ptr ptr long ptr)
89 stdcall SHCloneSpecialIDList(long long long)
90 stdcall SHFindFiles(ptr ptr)
-91 stub SHFindComputer # Fixme
+91 stdcall SHFindComputer(ptr ptr)
92 stdcall PathGetShortPath(ptr) PathGetShortPathAW
93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW
94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW
@@ -454,8 +454,8 @@
743 stub SHCreateFileExtractIconW
744 stub -noname Shell_744
745 stub -noname Shell_745
-747 stub SHLimitInputEdit
-748 stub -noname Shell_748 # Fixme
+747 stdcall SHLimitInputEdit(ptr ptr)
+748 stdcall -noname SHLimitInputCombo(ptr ptr)
749 stub SHGetShellStyleHInstance
750 stub SHGetAttributesFromDataObject
751 stub -noname Shell_751
@@ -469,35 +469,37 @@
@ stdcall SHCreateDefaultContextMenu(ptr ptr ptr)
@ stdcall SHCreateDefaultExtractIcon(ptr ptr)
-# Unknown functions. They need to be removed
-#@ stdcall FileMenu_DeleteAllItems(long)
-#@ stdcall FileMenu_DrawItem(long ptr)
-#@ stdcall FileMenu_FindSubMenuByPidl(long ptr)
-#@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr)
-#@ stdcall FileMenu_HandleMenuChar(long long)
-#@ stdcall FileMenu_InitMenuPopup(long)
-#@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr)
-#@ stdcall FileMenu_Invalidate(long)
-#@ stdcall FileMenu_MeasureItem(long ptr)
-#@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr)
-#@ stdcall FileMenu_Create(long long long long long)
-#@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW
-#@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long)
-#@ stdcall FileMenu_DeleteItemByCmd(long long)
-#@ stdcall FileMenu_Destroy(long)
-#@ stdcall FileMenu_AbortInitMenu()
-#@ stdcall FileMenu_AppendFilesForPidl(long ptr long)
-#@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr)
-#@ stdcall FileMenu_DeleteItemByIndex(long long)
-#@ stdcall FileMenu_DeleteItemByFirstID(long long)
-#@ stdcall FileMenu_DeleteSeparator(long)
-#@ stdcall FileMenu_EnableItemByCmd(long long long)
-#@ stdcall FileMenu_GetItemExtent(long long)
-#@ stdcall SHRegCloseKey (long)
-#@ stdcall SHRegOpenKeyA (long str long)
-#@ stdcall SHRegOpenKeyW (long wstr long)
-#@ stdcall SHRegQueryValueA(long str ptr ptr)
-#@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr)
-#@ stdcall SHRegQueryValueW (long long long long)
-#@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr)
-#@ stdcall SHRegDeleteKeyW (long wstr)
+# Discontinued in version 6.0. Until retired in WinVista and higher
+@ stdcall FileMenu_DeleteAllItems(long)
+@ stdcall FileMenu_DrawItem(long ptr)
+@ stdcall FileMenu_FindSubMenuByPidl(long ptr)
+@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr)
+@ stdcall FileMenu_HandleMenuChar(long long)
+@ stdcall FileMenu_InitMenuPopup(long)
+@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr)
+@ stdcall FileMenu_Invalidate(long)
+@ stdcall FileMenu_MeasureItem(long ptr)
+@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr)
+@ stdcall FileMenu_Create(long long long long long)
+@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW
+@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long)
+@ stdcall FileMenu_DeleteItemByCmd(long long)
+@ stdcall FileMenu_Destroy(long)
+@ stdcall FileMenu_AbortInitMenu()
+@ stdcall FileMenu_AppendFilesForPidl(long ptr long)
+@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr)
+@ stdcall FileMenu_DeleteItemByIndex(long long)
+@ stdcall FileMenu_DeleteItemByFirstID(long long)
+@ stdcall FileMenu_DeleteSeparator(long)
+@ stdcall FileMenu_EnableItemByCmd(long long long)
+@ stdcall FileMenu_GetItemExtent(long long)
+
+# 4.0 (NT) and higher. Until discontinued in 5.0
+@ stdcall SHRegCloseKey(long)
+@ stdcall SHRegOpenKeyA(long str long)
+@ stdcall SHRegOpenKeyW(long wstr long)
+@ stdcall SHRegQueryValueA(long str ptr ptr)
+@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr)
+@ stdcall SHRegQueryValueW (long long long long)
+@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr)
+@ stdcall SHRegDeleteKeyW(long wstr)
Modified: trunk/reactos/dll/win32/shell32/shellord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Feb 3 07:55:04 2009
@@ -1421,10 +1421,11 @@
}
/*************************************************************************
* InvalidateDriveType [SHELL32.65]
- *
+ * Unimplemented in XP SP3
*/
int WINAPI InvalidateDriveType(int u)
-{ FIXME("0x%08x stub\n",u);
+{
+ TRACE("0x%08x stub\n",u);
return 0;
}
/*************************************************************************
Modified: trunk/reactos/dll/win32/shell32/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Tue Feb 3 07:55:04 2009
@@ -69,5 +69,39 @@
WINAPI
ShortSizeFormatW(LONGLONG llNumber)
{
+ FIXME("ShortSizeFormatW() stub\n");
return NULL;
}
+
+/*
+ * Unimplemented
+ */
+BOOL
+WINAPI
+SHFindComputer(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
+{
+ FIXME("SHFindComputer() stub\n");
+ return FALSE;
+}
+
+/*
+ * Unimplemented
+ */
+BOOL
+WINAPI
+SHLimitInputEdit(HWND hWnd, LPVOID lpUnknown)
+{
+ FIXME("SHLimitInputEdit() stub\n");
+ return FALSE;
+}
+
+/*
+ * Unimplemented
+ */
+BOOL
+WINAPI
+SHLimitInputCombo(HWND hWnd, LPVOID lpUnknown)
+{
+ FIXME("SHLimitInputCombo() stub\n");
+ return FALSE;
+}