Changeset 10162 for trunk/include/win/shellapi.h

Timestamp:

Jul 11, 2003, 5:38:31 PM (22 years ago)

Author:

sandervl

Message:

DT: Shell folder updates

File:

• trunk/include/win/shellapi.h (modified) (4 diffs)

trunk/include/win/shellapi.h

@@ -156 +156 @@
 #define FOF_NOCONFIRMMKDIR         0x0200
 #define FOF_NOERRORUI              0x0400
+#define FOF_NOCOPYSECURITYATTRIBS  0x0800
 
 typedef WORD FILEOP_FLAGS;
@@ -187 +188 @@
 } SHFILEOPSTRUCTW, *LPSHFILEOPSTRUCTW;
 
+#define  SHFILEOPSTRUCT WINELIB_NAME_AW(SHFILEOPSTRUCT)
+#define  LPSHFILEOPSTRUCT WINELIB_NAME_AW(LPSHFILEOPSTRUCT)
+
 DWORD   WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
 DWORD   WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
-
+#define  SHFileOperation WINELIB_NAME_AW(SHFileOperation)
 
 
@@ -209 +213 @@
 HINSTANCE       WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
 #define ShellExecute WINELIB_NAME_AW(ShellExecute)
-
-
 
 /******************************************
@@ -266 +268 @@
 HICON     WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,LPWORD);
 HICON     WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
-
-#ifdef __WIN32OS2__
-
 UINT WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
 UINT WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
+#define     ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
 UINT WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
-
-#else /* __WIN32OS2__ */
-
-/* Return types are wrong according to SDK docs. */
-HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
-HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
-HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
-
-#endif /* __WIN32OS2__ */
-
 HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
 HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);