[ros-diffs] [janderwald] 35673: shell32 update (1/2) - The Fonts Shell Folder && Admin Shell Folder GUID is not documented in shlguid.h - Fix api declaration of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory, SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2, SHChangeNotifyRegister - Fix EXP_DARWIN_LINK && OPENASINFO structure - Remove CSIDL_FOLDER_MASK undocumented shellview ids

Author: janderwald
Date: Tue Aug 26 10:50:17 2008
New Revision: 35673

URL: http://svn.reactos.org/svn/reactos?rev=35673&view=rev
Log:
shell32 update (1/2)

- The Fonts Shell Folder && Admin Shell Folder GUID is not documented in
shlguid.h
- Fix api declaration of SHCreateStdEnumFmtEtc, GetFileNameFromBrowse, SHCreateDirectory,
SHCreateDirectoryExA, SHCreateDirectoryExW, Dad_AutoScroll, CDefFolderMenu_Create2,
SHChangeNotifyRegister
- Fix EXP_DARWIN_LINK && OPENASINFO structure
- Remove CSIDL_FOLDER_MASK undocumented shellview ids

Modified:
    trunk/reactos/include/psdk/shlguid.h
    trunk/reactos/include/psdk/shlobj.h
    trunk/reactos/include/psdk/winuser.h
    trunk/reactos/include/reactos/wine/winuser.h

Modified: trunk/reactos/include/psdk/shlguid.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Tue Aug 26 10:50:17 2008
@@ -116,8 +116,6 @@
 DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B,
0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36,
0x1b, 0x11, 0x03);
 DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, 0x32,
0xF1, 0xE9, 0x57, 0x5D);
-DEFINE_GUID(CLSID_FontsFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C,
0x50, 0x20, 0x52, 0x41,0x52);
-DEFINE_GUID(CLSID_AdminFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C,
0x50, 0x20, 0x52, 0x41, 0x53);
 DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00,
0xf8, 0x05, 0xca, 0x57);
 
 DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0,
0x4f, 0xd9, 0x18, 0xd0);

Modified: trunk/reactos/include/psdk/shlobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Aug 26 10:50:17 2008
@@ -46,12 +46,12 @@
 DWORD        WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*);
 DWORD        WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*);
 #define             SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString)
-HRESULT      WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**);
+HRESULT      WINAPI SHCreateStdEnumFmtEtc(UINT,const FORMATETC *,IEnumFORMATETC**);
 void         WINAPI SHDestroyPropSheetExtArray(HPSXA);
 BOOL         WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST);
 DWORD        WINAPI SHFormatDrive(HWND,UINT,UINT,UINT);
 void         WINAPI SHFree(LPVOID);
-BOOL         WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR);
+BOOL         WINAPI
GetFileNameFromBrowse(HWND,LPWSTR,UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
 HRESULT      WINAPI SHGetInstanceExplorer(IUnknown**);
 HRESULT      WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR);
 HRESULT      WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR);
@@ -151,44 +151,9 @@
 #define SV_CLASS_NAME   ("SHELLDLL_DefView")
 
 #define FCIDM_SHVIEWFIRST       0x0000
-/* undocumented */
-#define FCIDM_SHVIEW_ARRANGE    0x7001
-#define FCIDM_SHVIEW_DELETE     0x7011
-#define FCIDM_SHVIEW_PROPERTIES 0x7013
-#define FCIDM_SHVIEW_CUT        0x7018
-#define FCIDM_SHVIEW_COPY       0x7019
-#define FCIDM_SHVIEW_INSERT     0x701A
-#define FCIDM_SHVIEW_UNDO       0x701B
-#define FCIDM_SHVIEW_INSERTLINK 0x701C
-#define FCIDM_SHVIEW_SELECTALL  0x7021
-#define FCIDM_SHVIEW_INVERTSELECTION 0x7022
-
-#define FCIDM_SHVIEW_BIGICON    0x7029
-#define FCIDM_SHVIEW_SMALLICON  0x702A
-#define FCIDM_SHVIEW_LISTVIEW   0x702B
-#define FCIDM_SHVIEW_REPORTVIEW 0x702C
-/* 0x7030-0x703f are used by the shellbrowser */
-#define FCIDM_SHVIEW_AUTOARRANGE 0x7031
-#define FCIDM_SHVIEW_SNAPTOGRID 0x7032
-
-#define FCIDM_SHVIEW_HELP       0x7041
-#define FCIDM_SHVIEW_RENAME     0x7050
-#define FCIDM_SHVIEW_CREATELINK 0x7051
-#define FCIDM_SHVIEW_NEWLINK    0x7052
-#define FCIDM_SHVIEW_NEWFOLDER  0x7053
-
-#define FCIDM_SHVIEW_REFRESH    0x7100 /* FIXME */
-#define FCIDM_SHVIEW_EXPLORE    0x7101 /* FIXME */
-#define FCIDM_SHVIEW_OPEN       0x7102 /* FIXME */
-
 #define FCIDM_SHVIEWLAST        0x7fff
 #define FCIDM_BROWSERFIRST      0xA000
 /* undocumented toolbar items from stddlg's*/
-#define FCIDM_TB_UPFOLDER       0xA001
-#define FCIDM_TB_NEWFOLDER      0xA002
-#define FCIDM_TB_SMALLICON      0xA003
-#define FCIDM_TB_REPORTVIEW     0xA004
-#define FCIDM_TB_DESKTOP        0xA005  /* FIXME */
 
 #define FCIDM_BROWSERLAST       0xbf00
 #define FCIDM_GLOBALFIRST       0x8000
@@ -1147,7 +1112,13 @@
 } NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS;
 
 typedef struct {
+
+#ifdef __cplusplus
     DATABLOCK_HEADER dbh;
+#else
+    DWORD cbSize;
+    DWORD dwSignature;
+#endif
     CHAR szDarwinID[MAX_PATH];
     WCHAR szwDarwinID[MAX_PATH];
 } EXP_DARWIN_LINK, *LPEXP_DARWIN_LINK;
@@ -1188,7 +1159,7 @@
 } SHChangeProductKeyAsIDList, *LPSHChangeProductKeyAsIDList;
 
 ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg,
-                                    int cEntries, SHChangeNotifyEntry *pshcne);
+                                    int cEntries, const SHChangeNotifyEntry *pshcne);
 BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID);
 BOOL WINAPI SHChangeNotification_Unlock(HANDLE hLock);
 
@@ -1197,9 +1168,9 @@
 /****************************************************************************
 * SHCreateDirectory API
 */
-DWORD WINAPI SHCreateDirectory(HWND, LPCVOID);
-int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES);
-int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
+DWORD WINAPI SHCreateDirectory(HWND, LPCWSTR);
+int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, const SECURITY_ATTRIBUTES*);
+int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, const SECURITY_ATTRIBUTES*);
 
 /****************************************************************************
 * SHGetSpecialFolderLocation API
@@ -1277,7 +1248,6 @@
 #define CSIDL_CDBURN_AREA	0x003b
 #define CSIDL_COMPUTERSNEARME	0x003d
 #define CSIDL_PROFILES		0x003e
-#define CSIDL_FOLDER_MASK	0x00ff
 #define CSIDL_FLAG_PER_USER_INIT 0x0800
 #define CSIDL_FLAG_NO_ALIAS	0x1000
 #define CSIDL_FLAG_DONT_VERIFY	0x4000
@@ -1417,7 +1387,7 @@
 BOOL         WINAPI DAD_DragEnterEx2(HWND,POINT,IDataObject*);
 BOOL         WINAPI DAD_DragMove(POINT);
 BOOL         WINAPI DAD_DragLeave(void);
-BOOL         WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,LPPOINT);
+BOOL         WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,const POINT*);
 HRESULT      WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD);
 
 LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL);
@@ -1470,7 +1440,7 @@
 HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv);
 
 typedef HRESULT (CALLBACK *
LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM);
-INT WINAPI
CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,HKEY
*,IContextMenu **);
+HRESULT WINAPI
CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,const
HKEY *,IContextMenu **);
 
 /****************************************************************************
  * SHCreateDefaultContextMenu API
@@ -1522,8 +1492,8 @@
 
 
 typedef struct tagOPENASINFO {
-	LPCTSTR pcszFile;
-	LPCTSTR pcszClass;
+	LPCWSTR pcszFile;
+	LPCWSTR pcszClass;
 	OPEN_AS_INFO_FLAGS oaifInFlags;
 } OPENASINFO;
 

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Aug 26 10:50:17 2008
@@ -7,6 +7,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#if !defined(_USER32_)
+#define WINUSERAPI DECLSPEC_IMPORT
+#else
+#define WINUSERAPI
+#endif
+
 
 #define WC_DIALOG MAKEINTATOM(0x8002)
 #define FALT	16

Modified: trunk/reactos/include/reactos/wine/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus…
==============================================================================
--- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Tue Aug 26 10:50:17 2008
@@ -8,7 +8,7 @@
 #include <wingdi.h>
 
 #if !defined(_MSC_VER)
-#include "../../psdk/winuser.h"
+#include_next "winuser.h"
 #endif
 
 #define WS_EX_TRAYWINDOW 0x80000000L
@@ -16,8 +16,8 @@
 #define WS_EX_MANAGED    0x40000000L /* Window managed by the window system */
 #define LB_CARETOFF      0x01a4
 
-UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 
 typedef struct tagCWPSTRUCT *LPCWPSTRUCT;
 
@@ -31,12 +31,13 @@
 #endif
 
 /* MapVirtualKey translation types */
+#if 0
 #define MAPVK_VK_TO_VSC     0
 #define MAPVK_VSC_TO_VK     1
 #define MAPVK_VK_TO_CHAR    2
 #define MAPVK_VSC_TO_VK_EX  3
 #define MAPVK_VK_TO_VSC_EX  4
-
+#endif
 #define WM_SETVISIBLE           0x0009
 
 #define MAKEINTATOMA(atom)  ((LPCSTR)((ULONG_PTR)((WORD)(atom))))