Changeset 9521 for trunk/include

Timestamp:

Dec 18, 2002, 1:24:32 PM (23 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win

Files:

• combo.h (deleted)
• local.h (modified) (2 diffs)
• win.h (modified) (1 diff)
• windef.h (modified) (4 diffs)
• winnt.h (modified) (1 diff)
• winuser.h (modified) (1 diff)

trunk/include/win/local.h

@@ -1 @@
-/* $Id: local.h,v 1.1 1999-05-24 20:19:13 ktk Exp $ */
+/* $Id: local.h,v 1.2 2002-12-18 12:24:32 sandervl Exp $ */
 
 /*
@@ -10 +10 @@
 #define __WINE_LOCAL_H
 
-#include "windef.h"
-
-  /* These function are equivalent to the Local* API functions, */
-  /* excepted that they need DS as the first parameter. This    */
-  /* allows managing several heaps from the emulation library.  */
-
-extern HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size );
-extern HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle,
-                               WORD size, UINT16 flags );
-extern HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle );
-extern HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD addr );
-extern UINT16 LOCAL_Size( HANDLE16 ds, HLOCAL16 handle );
-extern UINT16 LOCAL_Flags( HANDLE16 ds, HLOCAL16 handle );
-extern UINT16 LOCAL_HeapSize( HANDLE16 ds );
-extern UINT16 LOCAL_CountFree( HANDLE16 ds );
-extern LPSTR LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle );
-extern SEGPTR LOCAL_LockSegptr( HANDLE16 ds, HLOCAL16 handle );
-extern BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL16 handle );
-extern WORD LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags );
-
 #endif  /* __WINE_LOCAL_H */

trunk/include/win/win.h

@@ -219 +219 @@
 
 
-/* Built-in class descriptor */
-struct builtin_class_descr
-{
-    LPCSTR  name;    /* class name */
-    UINT    style;   /* class style */
-    WNDPROC procA;   /* ASCII window procedure */
-    WNDPROC procW;   /* Unicode window procedure */
-    INT     extra;   /* window extra bytes */
-    LPCSTR  cursor;  /* cursor name */
-    HBRUSH  brush;   /* brush or system color */
-};
-
 #endif  /* __WINE_WIN_H */

trunk/include/win/windef.h

@@ -8 +8 @@
 #define __WINE_WINDEF_H
 
-#ifdef __WINE__
+#if (defined(__WINE__)) && (!defined(__WIN32OS2__))
 # include "config.h"
 # undef UNICODE
@@ -284 +284 @@
 typedef float           FLOAT;
 #ifdef __WIN32OS2__
-#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__)
+#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
 typedef double          __int64;
+#elif defined (__EMX__)
+typedef long long       __int64;
 #endif
 #else
@@ -621 +623 @@
 #define MAX_PATH   260
 #define _MAX_DRIVE 3
-#if !defined(__WATCOMC__) || !defined(_MAX_DIR)
+#if !defined(__WATCOMC__) && !defined(_MAX_DIR)
 #define _MAX_DIR   256
 #endif
@@ -627 +629 @@
 #define _MAX_FNAME 255
 #endif
-#if !defined(__WATCOMC__) || !defined(_MAX_EXT)
+#if !defined(__WATCOMC__) && !defined(_MAX_EXT)
 #define _MAX_EXT   256
 #endif

trunk/include/win/winnt.h

@@ -676 +676 @@
 #ifdef __i386__
 #define _DEFINE_REGS_ENTRYPOINT( name, fn, args ) \
-  __asm__(".align 4\n\t"                         \
-          ".globl " #name "\n\t"                 \
-          ".type " #name ",@function\n\t"        \
-          #name ":\n\t"                          \
-          "call CALL32_Regs\n\t"                 \
-          ".long " #fn "\n\t"                    \
-          ".byte " #args ", " #args "\n\t");
-
+    __ASM_GLOBAL_FUNC( name, \
+                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
+                       ".long " __ASM_NAME(#fn) "\n\t" \
+                       ".byte " #args ", " "0")
 #define DEFINE_REGS_ENTRYPOINT_0( name, fn ) \
+  extern void WINAPI name(void); \
   _DEFINE_REGS_ENTRYPOINT( name, fn, 0 )
 #define DEFINE_REGS_ENTRYPOINT_1( name, fn, t1 ) \
+  extern void WINAPI name( t1 a1 ); \
   _DEFINE_REGS_ENTRYPOINT( name, fn, 4 )
 #define DEFINE_REGS_ENTRYPOINT_2( name, fn, t1, t2 ) \
+  extern void WINAPI name( t1 a1, t2 a2 ); \
   _DEFINE_REGS_ENTRYPOINT( name, fn, 8 )
 #define DEFINE_REGS_ENTRYPOINT_3( name, fn, t1, t2, t3 ) \
+  extern void WINAPI name( t1 a1, t2 a2, t3 a3 ); \
   _DEFINE_REGS_ENTRYPOINT( name, fn, 12 )
 #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \
+  extern void WINAPI name( t1 a1, t2 a2, t3 a3, t4 a4 ); \
   _DEFINE_REGS_ENTRYPOINT( name, fn, 16 )
 

trunk/include/win/winuser.h

@@ -1494 +1494 @@
     RECT   rcExclude;
 } TPMPARAMS, *LPTPMPARAMS;
+
+/*
+ * Combobox information
+ */
+typedef struct tagCOMBOBOXINFO
+{
+    DWORD cbSize;
+    RECT  rcItem;
+    RECT  rcButton;
+    DWORD stateButton;
+    HWND  hwndCombo;
+    HWND  hwndItem;
+    HWND  hwndList;
+} COMBOBOXINFO, *PCOMBOBOXINFO, *LPCOMBOBOXINFO;
 
 /* FIXME: not sure this one is correct */