Changeset 6381 for trunk/include

Timestamp:

Jul 21, 2001, 11:10:49 AM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win

Files:

• debugstr.h (modified) (2 diffs)
• debugtools.h (modified) (2 diffs)
• winuser.h (modified) (1 diff)

trunk/include/win/debugstr.h

@@ -1 @@
-/* $Id: debugstr.h,v 1.3 2000-08-30 13:56:37 sandervl Exp $ */
 #ifndef __WINE_DEBUGSTR_H
 #define __WINE_DEBUGSTR_H
@@ -9 +8 @@
    as strings are re-used.  */
 
-#define debugstr_a(a) a
-#define debugstr_w(a) a
+#define debugstr_a(a) debugstr_an(a, 80)
+#define debugstr_w(a) debugstr_wn(a, 80)
 
 //extern LPSTR debugstr_a (LPCSTR s);

trunk/include/win/debugtools.h

@@ -200 +200 @@
   static char res[128];
 
-  if (!src) return "(null)";
+  if (!HIWORD(src))
+  {
+        if (!src) return "(null)";
+        sprintf(res, "#%04x", LOWORD(src) );
+        return res;
+  }
   if (n > sizeof(res)) return "(null)";
 
@@ -246 +251 @@
   static char res[128];
 
-  if (!src) return "(null)";
+  if (!HIWORD(src))
+  {
+        if (!src) return "(null)";
+        sprintf(res, "#%04x", LOWORD(src) );
+        return res;
+  }
   if (n > sizeof(res)) return "(null)";
   if (n < 0) n = 0;

trunk/include/win/winuser.h

@@ -1290 +1290 @@
     POINT   pt;
 } MSG, *PMSG, *NPMSG, *LPMSG;
+
+#define POINTSTOPOINT(pt, pts)                          \
+        { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts);   \
+          (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); }          
+
+#define POINTTOPOINTS(pt)      (MAKELONG((short)((pt).x), (short)((pt).y)))