Changeset 8420 for trunk/include

Timestamp:

May 15, 2002, 2:37:29 PM (23 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win

Files:

• prsht.h (modified) (8 diffs)
• winbase.h (modified) (1 diff)
• wine/unicode.h (modified) (1 diff)

trunk/include/win/prsht.h

@@ -1 @@
-/* $Id: prsht.h,v 1.6 2000-12-24 12:28:20 sandervl Exp $ */
+/* $Id: prsht.h,v 1.7 2002-05-15 12:37:28 sandervl Exp $ */
 
 #ifndef _WINE_PRSHT_H
@@ -47 +47 @@
         LPCSTR           pszTemplate;
         LPCDLGTEMPLATEA  pResource;
-    }DUMMYUNIONNAME1;
+    }DUMMYUNIONNAME;
     union
     {
@@ -58 +58 @@
     LPFNPSPCALLBACKA pfnCallback;
     UINT*            pcRefParent;
-    LPCWSTR            pszHeaderTitle;
-    LPCWSTR            pszHeaderSubTitle;
+    LPCSTR            pszHeaderTitle;
+    LPCSTR            pszHeaderSubTitle;
 } PROPSHEETPAGEA, *LPPROPSHEETPAGEA;
 
@@ -73 +73 @@
         LPCWSTR          pszTemplate;
         LPCDLGTEMPLATEW  pResource;
-    }DUMMYUNIONNAME1;
+    }DUMMYUNIONNAME;
     union
     {
@@ -101 +101 @@
       HICON                  hIcon;
       LPCSTR                   pszIcon;
-    }DUMMYUNIONNAME1;
+    }DUMMYUNIONNAME;
     LPCSTR                   pszCaption;
     UINT                   nPages;
@@ -139 +139 @@
     {
       HICON                  hIcon;
-      LPCSTR                   pszIcon;
-    }DUMMYUNIONNAME1;
+      LPCWSTR                   pszIcon;
+    }DUMMYUNIONNAME;
     LPCWSTR                  pszCaption;
     UINT                   nPages;
@@ -221 +221 @@
 #define PSH_USEICONID           0x0004
 #define PSH_PROPSHEETPAGE       0x0008
+#define PSH_WIZARDHASFINISH     0x0010
 #define PSH_WIZARD              0x0020
 #define PSH_USEPSTARTPAGE       0x0040
@@ -238 +239 @@
 #define PSH_USEHBMHEADER        0x00100000
 #define PSH_USEPAGELANG         0x00200000
+#define PSH_WIZARD_LITE         0x00400000
+#define PSH_NOCONTEXTHELP       0x02000000
 
 #define PSCB_INITIALIZED  1

trunk/include/win/winbase.h

@@ -1660 +1660 @@
 LONG        WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
 LONG        WINAPI InterlockedIncrement(LPLONG);
+
+/* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
+#define InterlockedCompareExchangePointer(dest, xchg, compare) \
+    (PVOID)InterlockedCompareExchange( (PLONG)dest, (LONG)xchg, (LONG)compare )
+
+#define InterlockedExchangePointer(dest, val) \
+    (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val )
+
 BOOL      WINAPI IsDBCSLeadByteEx(UINT,BYTE);
 BOOL      WINAPI IsProcessorFeaturePresent(DWORD);

trunk/include/win/wine/unicode.h

@@ -92 +92 @@
 {
     return get_char_typeW(wc) & C1_XDIGIT;
+}
+
+inline static int isspaceW( WCHAR wc )
+{
+    return get_char_typeW(wc) & C1_SPACE;
 }