Changeset 6508 for trunk/include

Timestamp:

Aug 10, 2001, 9:30:13 PM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win

Files:

• oleauto.h (modified) (2 diffs)
• olectl.h (modified) (1 diff)
• unistd.h (added)
• wine/obj_oleaut.h (modified) (2 diffs)
• wine/obj_picture.h (modified) (2 diffs)

trunk/include/win/oleauto.h

@@ -527 +527 @@
     DISPID dispid;      /* method ID */
     UINT iMeth;         /* method index */
-    CALLCONV_OLE2 cc;        /* calling convention */
+    CALLCONV cc;        /* calling convention */
     UINT cArgs;         /* count of arguments */
     WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */
@@ -562 +562 @@
 HRESULT WINAPI CreateStdDispatch(IUnknown* punkOuter, void* pvThis,
             ITypeInfo* ptinfo, IUnknown** ppunkStdDisp);
-HRESULT WINAPI DispCallFunc(void* pvInstance, ULONG oVft, CALLCONV_OLE2 cc,
+HRESULT WINAPI DispCallFunc(void* pvInstance, ULONG oVft, CALLCONV cc,
             VARTYPE vtReturn, UINT  cActuals, VARTYPE* prgvt,
             VARIANTARG** prgpvarg, VARIANT* pvargResult);

trunk/include/win/olectl.h

@@ -228 +228 @@
 #define DISPID_FONT_WEIGHT 7
 #define DISPID_FONT_CHARSET 8
+
+/* IPicture */
+#define DISPID_PICT_HANDLE      0
+#define DISPID_PICT_HPAL        2
+#define DISPID_PICT_TYPE        3
+#define DISPID_PICT_WIDTH       4
+#define DISPID_PICT_HEIGHT      5
+#define DISPID_PICT_RENDER      6
  
 /* Reflected Window Message IDs */

trunk/include/win/wine/obj_oleaut.h

@@ -100 +100 @@
         CC_MPWPASCAL  = CC_MPWCDECL + 1,
         CC_MAX    = CC_MPWPASCAL + 1
-} CALLCONV_OLE2;
+} CALLCONV;
 
 typedef CY CURRENCY;
@@ -361 +361 @@
         FUNCKIND funckind;
         INVOKEKIND invkind;
-        CALLCONV_OLE2 callconv;
+        CALLCONV callconv;
         SHORT cParams;
         SHORT cParamsOpt;

trunk/include/win/wine/obj_picture.h

@@ -1 @@
-/* $Id: obj_picture.h,v 1.5 1999-08-22 22:52:09 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs related to OLE picture support.
@@ -25 +24 @@
 typedef LONG OLE_YSIZE_HIMETRIC;
 
+typedef enum tagPicture { /* bitmasks */
+    PICTURE_SCALABLE    = 0x1,
+    PICTURE_TRANSPARENT = 0x2
+} PICTUREATTRIBUTES;