Alexandre Julliard : oleaut32: Replace long and unsigned long by more appropriate types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8fce9369b8609664a63b8d30a8b3791f93412ce3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8fce9369b8609664a63b8d30a8...

Author: Alexandre Julliard 
Date:   Fri Jul  3 13:48:54 2009 +0200

oleaut32: Replace long and unsigned long by more appropriate types.

---

dlls/oleaut32/olefont.c  |    4 ++--
 dlls/oleaut32/typelib.c  |    6 +++---
 dlls/oleaut32/typelib2.c |    2 +-
 dlls/oleaut32/variant.c  |    4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index 3e00844..a9b2c04 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -132,8 +132,8 @@ struct OLEFontImpl
   /*
    * Size ratio
    */
-  long cyLogical;
-  long cyHimetric;
+  LONG cyLogical;
+  LONG cyHimetric;

IConnectionPoint *pPropertyNotifyCP;
   IConnectionPoint *pFontEventsCP;
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 10f5e23..1f104f8 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -938,7 +938,7 @@ typedef struct tagITypeLibImpl
     BSTR DocString;
     BSTR HelpFile;
     BSTR HelpStringDll;
-    unsigned long  dwHelpContext;
+    DWORD dwHelpContext;
     int TypeInfoCount;          /* nr of typeinfo's in librarry */
     struct tagITypeInfoImpl *pTypeInfo;   /* linked list of type info data */
     int ctCustData;             /* number of items in cust data list */
@@ -1058,8 +1058,8 @@ typedef struct tagITypeInfoImpl
     BSTR Name;
     BSTR DocString;
     BSTR DllName;
-    unsigned long  dwHelpContext;
-    unsigned long  dwHelpStringContext;
+    DWORD dwHelpContext;
+    DWORD dwHelpStringContext;

/* functions  */
     TLBFuncDesc * funclist;     /* linked list with function descriptions */
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index b011342..0f641d4 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -760,7 +760,7 @@ static int ctl2_alloc_custdata(
    if (offset == -1) return offset;

*((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4;
-	*((unsigned long *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal);
+	*((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal);
    break;

default:
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 7a5f325..e92a63d 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -5571,7 +5571,9 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result)
     V_VT(result) = VT_I8;
     V_I8(result) = V_I8(&lv) % V_I8(&rv);

-    TRACE("V_I8(left) == %ld, V_I8(right) == %ld, V_I8(result) == %ld\n", (long)V_I8(&lv), (long)V_I8(&rv), (long)V_I8(result));
+    TRACE("V_I8(left) == %s, V_I8(right) == %s, V_I8(result) == %s\n",
+          wine_dbgstr_longlong(V_I8(&lv)), wine_dbgstr_longlong(V_I8(&rv)),
+          wine_dbgstr_longlong(V_I8(result)));

/* convert left and right to the destination type */
     rc = VariantChangeType(result, result, 0, resT);