Sync to Wine-20050725:

Mike McCormack <mike@codeweavers.com>
- Interlocked LONG* gcc warning fixes.

svn path=/trunk/; revision=17339

diff --git a/reactos/lib/shdocvw/shdocvw.h b/reactos/lib/shdocvw/shdocvw.h
index cde5801..8ef238a 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw.h
+++ b/reactos/lib/shdocvw/shdocvw.h
@@ -42,7 +42,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IClassFactoryVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IClassFactoryVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IClassFactoryImpl;
 
 extern IClassFactoryImpl SHDOCVW_ClassFactory;
 } IClassFactoryImpl;
 
 extern IClassFactoryImpl SHDOCVW_ClassFactory;


@@ -55,7 +55,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IOleObjectVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IOleObjectVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IOleObjectImpl;
 
 extern IOleObjectImpl SHDOCVW_OleObject;
 } IOleObjectImpl;
 
 extern IOleObjectImpl SHDOCVW_OleObject;


@@ -67,7 +67,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IWebBrowserVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IWebBrowserVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IWebBrowserImpl;
 
 extern IWebBrowserImpl SHDOCVW_WebBrowser;
 } IWebBrowserImpl;
 
 extern IWebBrowserImpl SHDOCVW_WebBrowser;


@@ -80,7 +80,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IProvideClassInfoVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IProvideClassInfoVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IProvideClassInfoImpl;
 
 extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo;
 } IProvideClassInfoImpl;
 
 extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo;


@@ -93,7 +93,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IProvideClassInfo2Vtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IProvideClassInfo2Vtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IProvideClassInfo2Impl;
 
 extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2;
 } IProvideClassInfo2Impl;
 
 extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2;


@@ -106,7 +106,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IPersistStorageVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IPersistStorageVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IPersistStorageImpl;
 
 extern IPersistStorageImpl SHDOCVW_PersistStorage;
 } IPersistStorageImpl;
 
 extern IPersistStorageImpl SHDOCVW_PersistStorage;


@@ -119,7 +119,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IPersistStreamInitVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IPersistStreamInitVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IPersistStreamInitImpl;
 
 extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit;
 } IPersistStreamInitImpl;
 
 extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit;


@@ -132,7 +132,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IQuickActivateVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IQuickActivateVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IQuickActivateImpl;
 
 extern IQuickActivateImpl SHDOCVW_QuickActivate;
 } IQuickActivateImpl;
 
 extern IQuickActivateImpl SHDOCVW_QuickActivate;


@@ -145,7 +145,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IConnectionPointContainerVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IConnectionPointContainerVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IConnectionPointContainerImpl;
 
 extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;
 } IConnectionPointContainerImpl;
 
 extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;


@@ -158,7 +158,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IConnectionPointVtbl *lpVtbl;
 {
     /* IUnknown fields */
     const IConnectionPointVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

 } IConnectionPointImpl;
 
 /**********************************************************************
 } IConnectionPointImpl;
 
 /**********************************************************************

diff --git a/reactos/lib/shdocvw/shdocvw_main.c b/reactos/lib/shdocvw/shdocvw_main.c
index 1b7dd45..e486c10 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw_main.c
+++ b/reactos/lib/shdocvw/shdocvw_main.c
@@ -152,7 +152,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
  */
 typedef struct _IBindStatusCallbackImpl {
     const IBindStatusCallbackVtbl *vtbl;
  */
 typedef struct _IBindStatusCallbackImpl {
     const IBindStatusCallbackVtbl *vtbl;

-    DWORD ref;
+    LONG ref;

     HWND hDialog;
     BOOL *pbCancelled;
 } IBindStatusCallbackImpl;
     HWND hDialog;
     BOOL *pbCancelled;
 } IBindStatusCallbackImpl;