Changeset 11388

Timestamp:

Sep 2, 1999, 12:51:14 PM (26 years ago)

Author:

phaller

Message:

Fix: fixes in WINE macros and dependencies

File:

• tags/trunk/include/win/shlobj.h (modified) (10 diffs)

tags/trunk/include/win/shlobj.h ¶

@@ -1 @@
-/* $Id: shlobj.h,v 1.1 1999-05-24 20:19:19 ktk Exp $ */
+/* $Id: shlobj.h,v 1.2 1999-09-02 10:51:14 phaller Exp $ */
 
 #ifndef __WINE_SHLOBJ_H
@@ -131 +131 @@
 #define SEE_MASK_HMONITOR         0x00200000
 
+/*************************************
+ * code that is shared with shlobj.h *
+ *************************************/
+
+#ifndef _WINE_SHELLAPI_H
+
 typedef struct _SHELLEXECUTEINFOA
 {       DWORD cbSize;
@@ -146 +152 @@
         HKEY hkeyClass;
         DWORD dwHotKey;
-        union 
+        union
         { HANDLE hIcon;
           HANDLE hMonitor;
@@ -178 +184 @@
 #define LPSHELLEXECUTEINFO WINELIB_NAME_AW(LPSHELLEXECUTEINFO)
 
+#endif /* __WINE_SHELLAPI_H */
+
+
 BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA lpExecInfo);
 BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW lpExecInfo);
@@ -213 +222 @@
     LPARAM        lParam;
         INT         iImage;
-} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW; 
+} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW;
 
 #define BROWSEINFO   WINELIB_NAME_AW(BROWSEINFO)
@@ -226 +235 @@
 #define BIF_EDITBOX            0x0010
 #define BIF_VALIDATE           0x0020
- 
+
 #define BIF_BROWSEFORCOMPUTER  0x1000
 #define BIF_BROWSEFORPRINTER   0x2000
@@ -256 +265 @@
 #define BFFM_SETSELECTION   BFFM_SETSELECTIONA
 
-#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA 
-#endif 
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA
+#endif
 */
 
@@ -289 +298 @@
 #define SHDID_NET_OTHER             17
 
-typedef struct _SHDESCRIPTIONID 
+typedef struct _SHDESCRIPTIONID
 {   DWORD   dwDescriptionId;
     CLSID   clsid;
@@ -296 +305 @@
 HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb);
 HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb);
-#define  SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList)
-
+BOOL    WINAPI SHGetSpecialFolderPathA (HWND hwndOwner,LPSTR szPath,DWORD csidl,BOOL bCreate);
 
 /****************************************************************************
@@ -309 +317 @@
 *  are happening to the shellview (and ask for things too).
 *
-*  You don't have to support anything here - anything you don't want to 
+*  You don't have to support anything here - anything you don't want to
 *  handle, the shell will do itself if you just return E_NOTIMPL. This parameters
 *  that the shell passes to this function are entirely undocumented.