Deleted: trunk/reactos/include/wine/shtypes.h
Modified: trunk/reactos/regtests/winetests/directory.xml
Modified: trunk/reactos/w32api/include/shellapi.h
Modified: trunk/reactos/w32api/include/shlobj.h
Modified: trunk/reactos/w32api/include/shtypes.h
--- trunk/reactos/include/wine/shtypes.h 2005-08-10 20:35:15 UTC (rev 17268)
+++ trunk/reactos/include/wine/shtypes.h 2005-08-10 20:58:29 UTC (rev 17269)
@@ -1,22 +0,0 @@
-#include <rpc.h>
-#include <rpcndr.h>
-
-#include_next <shtypes.h>
-
-#ifndef __WIDL_SHTYPES_H
-#define __WIDL_SHTYPES_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <wtypes.h>
-
-typedef enum tagSTRRET_TYPE {
- STRRET_WSTR = 0,
- STRRET_OFFSET = 1,
- STRRET_CSTR = 2
-} STRRET_TYPE;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __WIDL_SHTYPES_H */
--- trunk/reactos/regtests/winetests/directory.xml 2005-08-10 20:35:15 UTC (rev 17268)
+++ trunk/reactos/regtests/winetests/directory.xml 2005-08-10 20:58:29 UTC (rev 17269)
@@ -23,6 +23,9 @@
<directory name="setupapi">
<xi:include href="setupapi/setupapi.xml" />
</directory>
+<directory name="shell32">
+ <xi:include href="shell32/shell32.xml" />
+</directory>
<directory name="shlwapi">
<xi:include href="shlwapi/shlwapi.xml" />
</directory>
--- trunk/reactos/w32api/include/shellapi.h 2005-08-10 20:35:15 UTC (rev 17268)
+++ trunk/reactos/w32api/include/shellapi.h 2005-08-10 20:58:29 UTC (rev 17269)
@@ -29,6 +29,7 @@
#define SEE_MASK_UNICODE 0x10000
#define SEE_MASK_ASYNCOK 0x100000
#define SEE_MASK_HMONITOR 0x200000
+#define SEE_MASK_NOZONECHECKS 0x00800000
#define ABM_NEW 0
#define ABM_REMOVE 1
#define ABM_QUERYPOS 2
--- trunk/reactos/w32api/include/shlobj.h 2005-08-10 20:35:15 UTC (rev 17268)
+++ trunk/reactos/w32api/include/shlobj.h 2005-08-10 20:58:29 UTC (rev 17269)
@@ -101,6 +101,7 @@
#define SFGAO_HASPROPSHEET 0x00000040L
#define SFGAO_DROPTARGET 0x00000100L
#define SFGAO_CAPABILITYMASK 0x00000177L
+#define SFGAO_ISSLOW 0x00004000L
#define SFGAO_GHOSTED 0x00008000L
#define SFGAO_LINK 0x00010000L
#define SFGAO_SHARE 0x00020000L
@@ -143,63 +144,72 @@
#define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
#endif
#define REGSTR_PATH_SPECIAL_FOLDERS REGSTR_PATH_EXPLORER TEXT("\\Shell Folders")
-#define CSIDL_DESKTOP 0
-#define CSIDL_INTERNET 1
-#define CSIDL_PROGRAMS 2
-#define CSIDL_CONTROLS 3
-#define CSIDL_PRINTERS 4
-#define CSIDL_PERSONAL 5
-#define CSIDL_FAVORITES 6
-#define CSIDL_STARTUP 7
-#define CSIDL_RECENT 8
-#define CSIDL_SENDTO 9
-#define CSIDL_BITBUCKET 10
-#define CSIDL_STARTMENU 11
-#define CSIDL_DESKTOPDIRECTORY 16
-#define CSIDL_DRIVES 17
-#define CSIDL_NETWORK 18
-#define CSIDL_NETHOOD 19
-#define CSIDL_FONTS 20
-#define CSIDL_TEMPLATES 21
-#define CSIDL_COMMON_STARTMENU 22
-#define CSIDL_COMMON_PROGRAMS 23
-#define CSIDL_COMMON_STARTUP 24
-#define CSIDL_COMMON_DESKTOPDIRECTORY 25
-#define CSIDL_APPDATA 26
-#define CSIDL_PRINTHOOD 27
-#define CSIDL_LOCAL_APPDATA 28
-#define CSIDL_ALTSTARTUP 29
-#define CSIDL_COMMON_ALTSTARTUP 30
-#define CSIDL_COMMON_FAVORITES 31
-#define CSIDL_INTERNET_CACHE 32
-#define CSIDL_COOKIES 33
-#define CSIDL_HISTORY 34
-#define CSIDL_COMMON_APPDATA 35
-#define CSIDL_WINDOWS 36
-#define CSIDL_SYSTEM 37
-#define CSIDL_PROGRAM_FILES 38
-#define CSIDL_MYPICTURES 39
-#define CSIDL_PROFILE 40
-#define CSIDL_SYSTEMX86 41
-#define CSIDL_PROGRAM_FILESX86 42
-#define CSIDL_PROGRAM_FILES_COMMON 43
-#define CSIDL_PROGRAM_FILES_COMMONX86 44
-#define CSIDL_COMMON_TEMPLATES 45
-#define CSIDL_COMMON_DOCUMENTS 46
-#define CSIDL_COMMON_ADMINTOOLS 47
-#define CSIDL_ADMINTOOLS 48
-#define CSIDL_CONNECTIONS 49
-#define CSIDL_COMMON_MUSIC 53
-#define CSIDL_COMMON_PICTURES 54
-#define CSIDL_COMMON_VIDEO 55
-#define CSIDL_RESOURCES 56
-#define CSIDL_RESOURCES_LOCALIZED 57
-#define CSIDL_COMMON_OEM_LINKS 58
-#define CSIDL_CDBURN_AREA 59
-#define CSIDL_COMPUTERSNEARME 61
+
+#define CSIDL_DESKTOP 0x0000
+#define CSIDL_INTERNET 0x0001
+#define CSIDL_PROGRAMS 0x0002
+#define CSIDL_CONTROLS 0x0003
+#define CSIDL_PRINTERS 0x0004
+#define CSIDL_PERSONAL 0x0005
+#define CSIDL_FAVORITES 0x0006
+#define CSIDL_STARTUP 0x0007
+#define CSIDL_RECENT 0x0008
+#define CSIDL_SENDTO 0x0009
+#define CSIDL_BITBUCKET 0x000a
+#define CSIDL_STARTMENU 0x000b
+#define CSIDL_MYDOCUMENTS 0x000c
+#define CSIDL_MYMUSIC 0x000d
+#define CSIDL_MYVIDEO 0x000e
+#define CSIDL_DESKTOPDIRECTORY 0x0010
+#define CSIDL_DRIVES 0x0011
+#define CSIDL_NETWORK 0x0012
+#define CSIDL_NETHOOD 0x0013
+#define CSIDL_FONTS 0x0014
+#define CSIDL_TEMPLATES 0x0015
+#define CSIDL_COMMON_STARTMENU 0x0016
+#define CSIDL_COMMON_PROGRAMS 0X0017
+#define CSIDL_COMMON_STARTUP 0x0018
+#define CSIDL_COMMON_DESKTOPDIRECTORY 0x0019
+#define CSIDL_APPDATA 0x001a
+#define CSIDL_PRINTHOOD 0x001b
+#define CSIDL_LOCAL_APPDATA 0x001c
+#define CSIDL_ALTSTARTUP 0x001d
+#define CSIDL_COMMON_ALTSTARTUP 0x001e
+#define CSIDL_COMMON_FAVORITES 0x001f
+#define CSIDL_INTERNET_CACHE 0x0020
+#define CSIDL_COOKIES 0x0021
+#define CSIDL_HISTORY 0x0022
+#define CSIDL_COMMON_APPDATA 0x0023
+#define CSIDL_WINDOWS 0x0024
+#define CSIDL_SYSTEM 0x0025
+#define CSIDL_PROGRAM_FILES 0x0026
+#define CSIDL_MYPICTURES 0x0027
+#define CSIDL_PROFILE 0x0028
+#define CSIDL_SYSTEMX86 0x0029
+#define CSIDL_PROGRAM_FILESX86 0x002a
+#define CSIDL_PROGRAM_FILES_COMMON 0x002b
+#define CSIDL_PROGRAM_FILES_COMMONX86 0x002c
+#define CSIDL_COMMON_TEMPLATES 0x002d
+#define CSIDL_COMMON_DOCUMENTS 0x002e
+#define CSIDL_COMMON_ADMINTOOLS 0x002f
+#define CSIDL_ADMINTOOLS 0x0030
+#define CSIDL_CONNECTIONS 0x0031
+#define CSIDL_COMMON_MUSIC 0x0035
+#define CSIDL_COMMON_PICTURES 0x0036
+#define CSIDL_COMMON_VIDEO 0x0037
+#define CSIDL_RESOURCES 0x0038
+#define CSIDL_RESOURCES_LOCALIZED 0x0039
+#define CSIDL_COMMON_OEM_LINKS 0x003a
+#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
#define CSIDL_FLAG_CREATE 0x8000
-#define CSIDL_FLAG_MASK 0xFF00
+#define CSIDL_FLAG_MASK 0xff00
+
#define CFSTR_SHELLIDLIST TEXT("Shell IDList Array")
#define CFSTR_SHELLIDLISTOFFSET TEXT("Shell Object Offsets")
#define CFSTR_NETRESOURCES TEXT("Net Resource")
@@ -507,8 +517,9 @@
SLR_INVOKE_MSI=128
} SLR_FLAGS;
typedef enum {
- SLGP_SHORTPATH=1,
- SLGP_UNCPRIORITY
+ SLGP_SHORTPATH=0x1,
+ SLGP_UNCPRIORITY=0x2,
+ SLGP_RAWPATH=0x4
} SLGP_FLAGS;
typedef PBYTE LPVIEWSETTINGS;
typedef enum {
--- trunk/reactos/w32api/include/shtypes.h 2005-08-10 20:35:15 UTC (rev 17268)
+++ trunk/reactos/w32api/include/shtypes.h 2005-08-10 20:58:29 UTC (rev 17269)
@@ -33,6 +33,12 @@
STRRET str;
} SHELLDETAILS, *LPSHELLDETAILS;
+typedef enum tagSTRRET_TYPE {
+ STRRET_WSTR = 0,
+ STRRET_OFFSET = 1,
+ STRRET_CSTR = 2
+} STRRET_TYPE;
+
#pragma pack(pop)
#ifdef __cplusplus
}