Changeset 801 for trunk/include/win

Timestamp:

Sep 2, 1999, 9:07:18 PM (26 years ago)

Author:

phaller

Message:

Add: missing definitions in WINUSER.H

Location:

trunk/include/win

Files:

• wine/obj_dataobject.h (modified) (1 diff)
• wine/obj_oleview.h (modified) (3 diffs)
• winuser.h (modified) (2 diffs)

trunk/include/win/wine/obj_dataobject.h

@@ -1 @@
-/* $Id: obj_dataobject.h,v 1.5 1999-08-22 22:52:07 sandervl Exp $ */
+/* $Id: obj_dataobject.h,v 1.6 1999-09-02 19:07:18 phaller Exp $ */
 /*
  * Defines the COM interfaces and APIs related to IDataObject.
  *
- * Depends on 'obj_moniker.h', 'obj_storage.h' and 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
 #define __WINE_WINE_OBJ_DATAOBJECT_H
+
+#include "wine/obj_base.h"
+#include "wine/obj_moniker.h"
+#include "wine/obj_storage.h"
 
 #if defined(__cplusplus) && !defined(NONAMELESSUNION)

trunk/include/win/wine/obj_oleview.h

@@ -1 @@
-/* $Id: obj_oleview.h,v 1.5 1999-08-22 22:52:09 sandervl Exp $ */
+/* $Id: obj_oleview.h,v 1.6 1999-09-02 19:07:18 phaller Exp $ */
 /*
  * Defines the COM interfaces and APIs related to ViewObject
  *
- * Depends on 'obj_base.h'.
  */
 
@@ -10 +9 @@
 
 
-#include "winbase.h"
+#include "wine/obj_base.h"
+#include "wine/obj_dataobject.h"
+
+struct tagLOGPALETTE;
 
 #ifdef __cplusplus
@@ -39 +41 @@
 #define IViewObject_METHODS \
         ICOM_METHOD10(HRESULT,Draw, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hdcTargetDev, HDC,hdcDraw, LPCRECTL,lprcBounds, LPCRECTL,lprcWBounds, IVO_ContCallback, pfnContinue, DWORD,dwContinue) \
-        ICOM_METHOD6(HRESULT,GetColorSet, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hicTargetDevice, LOGPALETTE**,ppColorSet) \
+        ICOM_METHOD6(HRESULT,GetColorSet, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hicTargetDevice, struct tagLOGPALETTE**,ppColorSet) \
         ICOM_METHOD4(HRESULT,Freeze, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DWORD*,pdwFreeze) \
         ICOM_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \

trunk/include/win/winuser.h

@@ -1 @@
-/* $Id: winuser.h,v 1.6 1999-08-05 19:47:22 phaller Exp $ */
+/* $Id: winuser.h,v 1.7 1999-09-02 19:07:17 phaller Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -2333 +2333 @@
 #define MFS_TOPGAPDROP      0x80000000L
 #define MFS_GAPDROP         0xC0000000L
+
+
+/* for GetMenuDefaultItem */
+#define GMDI_USEDISABLED    0x0001L
+#define GMDI_GOINTOPOPUPS   0x0002L
+
 
 #define DT_TOP 0