Changeset 4054 for trunk/include

Timestamp:

Aug 20, 2000, 11:46:16 AM (25 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/include/win

Files:

• shlobj.h (modified) (3 diffs)
• wine/undocshell.h (modified) (4 diffs)

trunk/include/win/shlobj.h

@@ -1 @@
-/* $Id: shlobj.h,v 1.7 2000-08-18 02:04:08 phaller Exp $ */
+/* $Id: shlobj.h,v 1.8 2000-08-20 09:46:15 sandervl Exp $ */
 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
@@ -354 +354 @@
  */
 typedef struct
-{       BOOL fShowAllObjects : 1;
+{
+#ifdef __WIN32OS2__
+        UINT fShowAllObjects : 1;
+        UINT fShowExtensions : 1;
+        UINT fNoConfirmRecycle : 1;
+        UINT fShowSysFiles : 1;
+
+        UINT fShowCompColor : 1;
+        UINT fDoubleClickInWebView : 1;
+        UINT fDesktopHTML : 1;
+        UINT fWin95Classic : 1;
+
+        UINT fDontPrettyPath : 1;
+        UINT fShowAttribCol : 1;
+        UINT fMapNetDrvBtn : 1;
+        UINT fShowInfoTip : 1;
+
+        UINT fHideIcons : 1;
+        UINT fRestFlags : 3;
+#else
+        BOOL fShowAllObjects : 1;
         BOOL fShowExtensions : 1;
         BOOL fNoConfirmRecycle : 1;
@@ -371 +391 @@
         BOOL fHideIcons : 1;
         UINT fRestFlags : 3;
+#endif
 } SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
 

trunk/include/win/wine/undocshell.h

@@ -1 @@
-/* $Id: undocshell.h,v 1.4 2000-08-18 02:04:23 phaller Exp $ */
+/* $Id: undocshell.h,v 1.5 2000-08-20 09:46:16 sandervl Exp $ */
 #ifndef __WINE_UNDOCSHELL_H
 #define __WINE_UNDOCSHELL_H
@@ -385 +385 @@
 /* FileMenu_InsertUsingPidl callback function */
 //typedef void CALLBACK (*LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
-typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#ifdef __WIN32OS2__
+typedef void (* CALLBACK LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#else
+typedef void (CALLBACK * LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#endif
 
 int WINAPI FileMenu_InsertUsingPidl(
@@ -711 +715 @@
 
 /* SHCreateShellFolderViewEx callback function */
+#ifdef __WIN32OS2__
+typedef HRESULT (* CALLBACK LPFNSFVCALLBACK)(
+#else
 typedef HRESULT (CALLBACK* LPFNSFVCALLBACK)(
+#endif
         DWORD dwUser,
         LPSHELLFOLDER pshf,
@@ -903 +911 @@
 /* SHCreateDefClassObject callback function */
 //typedef HRESULT CALLBACK (*LPFNCDCOCALLBACK)(
+#ifdef __WIN32OS2__
+typedef HRESULT (* CALLBACK LPFNCDCOCALLBACK)(
+#else
 typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)(
+#endif
         LPUNKNOWN pUnkOuter,
         REFIID riidObject,