Nikolay Sivov : include: Use existing DISPID values instead of magic numbers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1eb7cca1b9cd065c29c1f412d26a4e4f62aa86d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1eb7cca1b9cd065c29c1f412d2...

Author: Nikolay Sivov 
Date:   Mon Feb 24 08:16:59 2014 +0400

include: Use existing DISPID values instead of magic numbers.

---

include/stdole2.idl |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/include/stdole2.idl b/include/stdole2.idl
index 9537fd3..432314f 100644
--- a/include/stdole2.idl
+++ b/include/stdole2.idl
@@ -20,6 +20,8 @@

#pragma makedep typelib

+#include <olectl.h>
+
 [
   uuid(00020430-0000-0000-C000-000000000046),
   version(2.0),
@@ -272,14 +274,14 @@ library stdole
     ]
     dispinterface Font {
     properties:
-        [id(0x0)] BSTR Name;
-        [id(0x2)] CURRENCY Size;
-        [id(0x3)] VARIANT_BOOL Bold;
-        [id(0x4)] VARIANT_BOOL Italic;
-        [id(0x5)] VARIANT_BOOL Underline;
-        [id(0x6)] VARIANT_BOOL Strikethrough;
-        [id(0x7)] short Weight;
-        [id(0x8)] short Charset;
+        [id(DISPID_FONT_NAME)] BSTR Name;
+        [id(DISPID_FONT_SIZE)] CURRENCY Size;
+        [id(DISPID_FONT_BOLD)] VARIANT_BOOL Bold;
+        [id(DISPID_FONT_ITALIC)] VARIANT_BOOL Italic;
+        [id(DISPID_FONT_UNDER)] VARIANT_BOOL Underline;
+        [id(DISPID_FONT_STRIKE)] VARIANT_BOOL Strikethrough;
+        [id(DISPID_FONT_WEIGHT)] short Weight;
+        [id(DISPID_FONT_CHARSET)] short Charset;
     methods:
     }

@@ -351,13 +353,14 @@ library stdole
     ]
     dispinterface Picture {
     properties:
-        [id(0x0), readonly] OLE_HANDLE Handle;
-        [id(0x2)] OLE_HANDLE hPal;
-        [id(0x3), readonly] short Type; 
-        [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width;
-        [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height;
+        [id(DISPID_PICT_HANDLE), readonly] OLE_HANDLE Handle;
+        [id(DISPID_PICT_HPAL)] OLE_HANDLE hPal;
+        [id(DISPID_PICT_TYPE), readonly] short Type;
+        [id(DISPID_PICT_WIDTH), readonly] OLE_XSIZE_HIMETRIC Width;
+        [id(DISPID_PICT_HEIGHT), readonly] OLE_YSIZE_HIMETRIC Height;
     methods:
-        [id(0x6)] void Render(int hdc,
+        [id(DISPID_PICT_RENDER)]
+                  void Render(int hdc,
                               long x,
                               long y,
                               long cx,
@@ -424,7 +427,7 @@ library stdole
     dispinterface FontEvents {
     properties:
     methods:
-        [id(0x9)] void FontChanged([in] BSTR PropertyName);
+        [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName);
     };

typedef [public] FontEvents IFontEventsDisp;