Changeset 8544 for trunk/include/win/wine

Timestamp:

Jun 2, 2002, 12:10:33 PM (23 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win/wine

Files:

• port.h (added)
• wingdi16.h (modified) (2 diffs)
• winuser16.h (modified) (2 diffs)

trunk/include/win/wine/wingdi16.h

@@ -1 @@
-/* $Id: wingdi16.h,v 1.3 2000-08-30 13:56:39 sandervl Exp $ */
+/* $Id: wingdi16.h,v 1.4 2002-06-02 10:10:33 sandervl Exp $ */
 #ifndef __WINE_WINE_WINGDI16_H
 #define __WINE_WINE_WINGDI16_H
@@ -532 +532 @@
 
 
+#define CONV_RECT16TO32( r16, r32 )  \
+{                                    \
+    (r32)->left   = ((LPRECT16)r16)->left;         \
+    (r32)->top    = ((LPRECT16)r16)->top;          \
+    (r32)->right  = ((LPRECT16)r16)->right;        \
+    (r32)->bottom = ((LPRECT16)r16)->bottom;       \
+}
+
+#define CONV_RECT32TO16( r32, r16 )   \
+{                                     \
+    ((LPRECT16)r16)->left   = (INT16)(r32)->left;   \
+    ((LPRECT16)r16)->top    = (INT16)(r32)->top;    \
+    ((LPRECT16)r16)->right  = (INT16)(r32)->right;  \
+    ((LPRECT16)r16)->bottom = (INT16)(r32)->bottom; \
+}
+
 #endif /* __WINE_WINE_WINGDI16_H */

trunk/include/win/wine/winuser16.h

@@ -1 @@
-/* $Id: winuser16.h,v 1.7 2000-11-09 18:23:42 sandervl Exp $ */
+/* $Id: winuser16.h,v 1.8 2002-06-02 10:10:33 sandervl Exp $ */
 #ifndef __WINE_WINE_WINUSER16_H
 #define __WINE_WINE_WINUSER16_H
@@ -825 +825 @@
 HICON16     WINAPI LoadIcon16(HINSTANCE16,SEGPTR);
 HANDLE16    WINAPI LoadImage16(HINSTANCE16,LPCSTR,UINT16,INT16,INT16,UINT16);
-HMENU16     WINAPI LoadMenu16(HINSTANCE16,SEGPTR);
+HMENU16     WINAPI LoadMenu16(HINSTANCE16,LPCSTR);
 HMENU16     WINAPI LoadMenuIndirect16(LPCVOID);
 INT16       WINAPI LoadString16(HINSTANCE16,UINT16,LPSTR,INT16);