Changeset 7822 for trunk/include/win/shlwapi.h

Timestamp:

Feb 7, 2002, 12:54:01 AM (24 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/shlwapi.h (modified) (5 diffs)

trunk/include/win/shlwapi.h

@@ -4 +4 @@
 #ifndef __WINE_SHLWAPI_H
 #define __WINE_SHLWAPI_H
+
+#include <stdarg.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <shell.h>
 
 #ifdef __cplusplus
@@ -651 +656 @@
 
 /* Undocumented */
-#if !defined(__WINE_WINE_OBJ_SHELLFOLDER_H) && !defined(__WINE_SHELL_H)
-//very ugly
-typedef struct _STRRET;
-typedef struct _ITEMIDLIST;
-
-#define LPSTRRET   struct _STRRET *
-#define ITEMIDLIST struct _ITEMIDLIST
-#endif
 HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len);
 HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
@@ -681 +678 @@
 
 /* Stream functions */
-#ifndef NO_SHLWAPI_STREAM
+#ifdef SHLWAPI_STREAM
 
 IStream * WINAPI SHOpenRegStreamA(HKEY,LPCSTR,LPCSTR,DWORD);
@@ -691 +688 @@
 #define SHOpenRegStream2 WINELIB_NAME_AW(SHOpenRegStream2)
 
-#endif /* NO_SHLWAPI_STREAM */
+#endif /* SHLWAPI_STREAM */
 
 
@@ -707 +704 @@
 #define DLLVER_PLATFORM_WINDOWS 0x01 /* Win9x */
 #define DLLVER_PLATFORM_NT      0x02 /* WinNT */
+
+typedef HRESULT (* CALLBACK DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+
 #endif
-
-typedef HRESULT (* CALLBACK DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 
 #ifdef __cplusplus