Changeset 900 for trunk/include/win/commdlg.h

Timestamp:

Sep 9, 1999, 11:04:57 PM (26 years ago)

Author:

phaller

Message:

Fix: SHELL32\New now compiles.

File:

• trunk/include/win/commdlg.h (modified) (8 diffs)

trunk/include/win/commdlg.h

@@ -1 @@
-/* $Id: commdlg.h,v 1.1 1999-05-24 20:19:09 ktk Exp $ */
-
-/* 
+/* $Id: commdlg.h,v 1.2 1999-09-09 21:04:37 phaller Exp $ */
+
+/*
  * COMMDLG - Common Wine Dialog ... :-)
  */
@@ -32 +32 @@
 #define OFN_NOREADONLYRETURN         0x00008000
 #define OFN_NOTESTFILECREATE         0x00010000
-#define OFN_NONETWORKBUTTON          0x00020000 
+#define OFN_NONETWORKBUTTON          0x00020000
 #define OFN_NOLONGNAMES              0x00040000
 #define OFN_EXPLORER                 0x00080000
@@ -134 +134 @@
 DECL_WINELIB_TYPE_AW(OFNOTIFY)
 DECL_WINELIB_TYPE_AW(LPOFNOTIFY)
- 
+
 typedef UINT (* CALLBACK LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
 
@@ -257 +257 @@
 #include "pshpack1.h"
 
-typedef struct 
+typedef struct
 {
         DWORD                   lStructSize;
@@ -284 +284 @@
 typedef struct
 {
-        UINT    lStructSize; 
-        HWND            hwndOwner; 
-        HDC             hDC; 
-        LPLOGFONTA    lpLogFont; 
-        INT             iPointSize; 
-        DWORD           Flags; 
-        COLORREF        rgbColors; 
-        LPARAM          lCustData; 
-        WNDPROC         lpfnHook; 
-        LPCSTR          lpTemplateName; 
-        HINSTANCE       hInstance; 
-        LPSTR           lpszStyle; 
-        UINT16          nFontType; 
-        UINT16  ___MISSING_ALIGNMENT__; 
-        INT     nSizeMin; 
-        INT             nSizeMax; 
+        UINT    lStructSize;
+        HWND            hwndOwner;
+        HDC             hDC;
+        LPLOGFONTA    lpLogFont;
+        INT             iPointSize;
+        DWORD           Flags;
+        COLORREF        rgbColors;
+        LPARAM          lCustData;
+        WNDPROC         lpfnHook;
+        LPCSTR          lpTemplateName;
+        HINSTANCE       hInstance;
+        LPSTR           lpszStyle;
+        UINT16          nFontType;
+        UINT16  ___MISSING_ALIGNMENT__;
+        INT     nSizeMin;
+        INT             nSizeMax;
 } CHOOSEFONTA, *LPCHOOSEFONTA;
 
 typedef struct
 {
-        UINT    lStructSize; 
-        HWND            hwndOwner; 
-        HDC             hDC; 
-        LPLOGFONTW    lpLogFont; 
-        INT             iPointSize; 
-        DWORD           Flags; 
-        COLORREF        rgbColors; 
-        LPARAM          lCustData; 
-        WNDPROC         lpfnHook; 
-        LPCWSTR         lpTemplateName; 
-        HINSTANCE       hInstance; 
-        LPWSTR          lpszStyle; 
-        UINT16          nFontType; 
-        UINT16  ___MISSING_ALIGNMENT__; 
-        INT     nSizeMin; 
-        INT             nSizeMax; 
+        UINT    lStructSize;
+        HWND            hwndOwner;
+        HDC             hDC;
+        LPLOGFONTW    lpLogFont;
+        INT             iPointSize;
+        DWORD           Flags;
+        COLORREF        rgbColors;
+        LPARAM          lCustData;
+        WNDPROC         lpfnHook;
+        LPCWSTR         lpTemplateName;
+        HINSTANCE       hInstance;
+        LPWSTR          lpszStyle;
+        UINT16          nFontType;
+        UINT16  ___MISSING_ALIGNMENT__;
+        INT     nSizeMin;
+        INT             nSizeMax;
 } CHOOSEFONTW, *LPCHOOSEFONTW;
 
@@ -500 +500 @@
 #define PD_HIDEPRINTTOFILE           0x00100000
 
+#ifndef __WINE_DOCOBJ_H
 typedef enum __MIDL_IPrint_0001
 {
@@ -510 +511 @@
         PRINTFLAG_PRINTTOFILE   = 64
 } PRINTFLAG;
- 
+#endif
+
 typedef struct {
         UINT16  wDriverOffset;
@@ -647 +649 @@
 #define FormatCharDlgProc WINELIB_NAME_AW(FormatCharDlgProc)
 
-void COMDLG32_SetCommDlgExtendedError(DWORD err); 
+void COMDLG32_SetCommDlgExtendedError(DWORD err);
 
 #ifdef __cplusplus