Changeset 21301 for trunk/include/win

Timestamp:

Jun 16, 2009, 3:47:05 PM (16 years ago)

Author:

ydario

Message:

Header updates.

Location:

trunk/include/win

Files:

• debugtools.h (modified) (2 diffs)
• oleauto.h (modified) (1 diff)
• windef.h (modified) (2 diffs)
• winuser.h (modified) (3 diffs)

trunk/include/win/debugtools.h

@@ -249 +249 @@
         return res;
   }
-
-#ifndef __WIN32OS2__
   if (n > sizeof(res)) return "(null)";
-#endif
+
   if (n < 0) n = 0;
-#ifdef __WIN32OS2__
-{
-  LPCSTR    s = src;
-  int       srcSize = n;
-  int       reqSize = 0;
-  BYTE      c;
-
-  reqSize++;
-  while (srcSize-- > 0 && *s)
-    {
-      c = *s++;
-      switch (c)
-   {
-   case '\n': reqSize++; reqSize++; break;
-   case '\r': reqSize++; reqSize++; break;
-   case '\t': reqSize++; reqSize++; break;
-   case '"': reqSize++; reqSize++; break;
-   case '\\': reqSize++; reqSize++; break;
-   default:
-     if (c >= ' ' && c <= 126)
-       reqSize++;
-     else
-       {
-         reqSize++;
-         reqSize++;
-         reqSize++;
-         reqSize++;
-       }
-   }
-    }
-  reqSize++;
-  if (*s)
-    {
-      reqSize++;
-      reqSize++;
-      reqSize++;
-    }
-  reqSize++;
-
-  if( reqSize > sizeof( res )) return "(null)";
-}
-#endif
-
   dst = res;
   *dst++ = '"';
@@ -350 +305 @@
   }
 
-#ifndef __WIN32OS2__
   if (n > sizeof(res)) return "(null)";
-#endif
   if (n < 0) n = 0;
-#ifdef __WIN32OS2__
-{
-  LPCWSTR   s = src;
-  int       srcSize = n;
-  int       reqSize = 0;
-  WORD      c;
-
-  reqSize++;
-  reqSize++;
-  while (srcSize-- > 0 && *s)
-    {
-      c = *s++;
-      switch (c)
-   {
-   case '\n': reqSize++; reqSize++; break;
-   case '\r': reqSize++; reqSize++; break;
-   case '\t': reqSize++; reqSize++; break;
-   case '"': reqSize++; reqSize++; break;
-   case '\\': reqSize++; reqSize++; break;
-   default:
-     if (c >= ' ' && c <= 126)
-       reqSize++;
-     else
-       {
-         reqSize++;
-         reqSize+=4;
-       }
-   }
-    }
-  reqSize++;
-  if (*s)
-    {
-      reqSize++;
-      reqSize++;
-      reqSize++;
-    }
-  reqSize++;
-
-  if( reqSize > sizeof( res )) return "(null)";
-}
-#endif
 
   dst = res;

trunk/include/win/oleauto.h

@@ -163 +163 @@
 #define V_ARRAYREF(A)    V_UNION(A, pparray)
 #define V_BYREF(A)               V_UNION(A, byref)
-#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
-#define V_DECIMAL(A)     ((A)->n1.decVal)
-#else
-#define V_DECIMAL(A)     ((A)->decVal)
-#endif
+#define V_DECIMAL(A)     V_UNION(A, decVal)
 #define V_DECIMALREF(A)  V_UNION(A, pdecVal)
-
-#ifndef LOCALE_USE_NLS
-/* This is missing from native winnls.h, but may be added at some point */
-#define LOCALE_USE_NLS          0x10000000
-#endif
-
 
 /*

trunk/include/win/windef.h

@@ -763 +763 @@
 
 /*
- * Cinc: added 29/09/2004
- */
-#if 0 /* for IDL only */
-typedef struct tagDEC {
-  USHORT wReserved;
-  BYTE scale;
-  BYTE sign;
-  ULONG Hi32;
-  ULONGLONG Lo64;
-} DECIMAL;
-#else /* C/C++ defs */
-typedef struct tagDEC {
-  USHORT wReserved;
-  union {
-    struct {
-      BYTE scale;
-      BYTE sign;
-    } DUMMYSTRUCTNAME;
-    USHORT signscale;
-  } DUMMYUNIONNAME;
-  ULONG Hi32;
-  union {
-    struct {
-#ifdef WORDS_BIGENDIAN
-      ULONG Mid32;
-      ULONG Lo32;
-#else
-      ULONG Lo32;
-      ULONG Mid32;
-#endif
-    } DUMMYSTRUCTNAME1;
-    ULONGLONG Lo64;
-  } DUMMYUNIONNAME1;
-} DECIMAL;
-#endif
-#define DECIMAL_NEG ((BYTE)0x80)
-#define DECIMAL_SETZERO(d) do{ memset(((char*)(d)) + sizeof(USHORT), 0, sizeof(ULONG) * 3u + sizeof(USHORT)); }while (0)
-
-typedef DECIMAL *LPDECIMAL;
-
-#if 0
-/*
  * 8.9.99 DJR DECIMAL support
  */
@@ -831 +789 @@
 } DECIMAL;
 typedef DECIMAL *LPDECIMAL;
-#endif
 
 #include <winbase.h>

trunk/include/win/winuser.h

@@ -2537 +2537 @@
 
 #define WM_SHOWWINDOW       0x0018
+
+/* AnimateWindow() flags */
+#define AW_SLIDE        0x00040000
+#define AW_ACTIVATE     0x00020000
+#define AW_BLEND        0x00080000
+#define AW_HIDE         0x00010000
+#define AW_CENTER       0x00000010
+#define AW_HOR_POSITIVE 0x00000001
+#define AW_HOR_NEGATIVE 0x00000002
+#define AW_VER_POSITIVE 0x00000004
+#define AW_VER_NEGATIVE 0x00000008
+
+/* FlashWindowEx() flags */
+#define FLASHW_STOP      0x00000000
+#define FLASHW_CAPTION   0x00000001
+#define FLASHW_TRAY      0x00000002
+#define FLASHW_ALL       (FLASHW_CAPTION|FLASHW_TRAY)
+#define FLASHW_TIMER     0x00000004
+#define FLASHW_TIMERNOFG 0x0000000C
+
+typedef struct {
+    UINT cbSize;
+    HWND hwnd;
+    DWORD dwFlags;
+    UINT uCount;
+    DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
 
 /* WM_SHOWWINDOW wParam codes */
@@ -3652 +3679 @@
 INT       WINAPI GetClassNameW(HWND,LPWSTR,INT);
 #define     GetClassName WINELIB_NAME_AW(GetClassName)
+INT       WINAPI RealGetWindowClassA(HWND,LPSTR,INT);
+INT       WINAPI RealGetWindowClassW(HWND,LPWSTR,INT);
+#define     RealGetWindowClass WINELIB_NAME_AW(RealGetWindowClass)
 WORD        WINAPI GetClassWord(HWND,INT);
 BOOL      WINAPI GetClientRect(HWND,LPRECT);
@@ -3731 +3761 @@
 LONG        WINAPI GetWindowLongW(HWND,INT);
 #define     GetWindowLong WINELIB_NAME_AW(GetWindowLong)
-
-#ifndef GetWindowLongPtr
-  #define GetWindowLongPtrA   GetWindowLongA
-  #define GetWindowLongPtrW   GetWindowLongW
-  #ifdef UNICODE
-    #define GetWindowLongPtr  GetWindowLongPtrW
-  #else
-    #define GetWindowLongPtr  GetWindowLongPtrA
-  #endif // !UNICODE
-#endif // !GetWindowLongPtr
-
-#ifndef SetWindowLongPtr
-  #define SetWindowLongPtrA   SetWindowLongA
-  #define SetWindowLongPtrW   SetWindowLongW
-  #ifdef UNICODE
-    #define SetWindowLongPtr  SetWindowLongPtrW
-  #else
-    #define SetWindowLongPtr  SetWindowLongPtrA
-  #endif // !UNICODE
-#endif // !SetWindowLongPtr
-
 BOOL      WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
 BOOL      WINAPI GetWindowRect(HWND,LPRECT);