Dmitry Timoshkov : ddrawex: Avoid not necessary casts.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Dec 15 07:21:40 CST 2006


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri Dec 15 15:03:32 2006 +0800

ddrawex: Avoid not necessary casts.

---

 dlls/ddrawex/ddrawex_private.h |    4 ++--
 dlls/ddrawex/main.c            |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h
index 2153921..117ddba 100644
--- a/dlls/ddrawex/ddrawex_private.h
+++ b/dlls/ddrawex/ddrawex_private.h
@@ -48,7 +48,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, I
  ******************************************************************************/
 typedef struct
 {
-    IClassFactory *lpVtbl;
+    const IClassFactoryVtbl *lpVtbl;
     LONG ref;
     HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj);
 } IClassFactoryImpl;
@@ -59,7 +59,7 @@ typedef struct
  ******************************************************************************/
 typedef struct
 {
-    IDirectDrawFactory *lpVtbl;
+    const IDirectDrawFactoryVtbl *lpVtbl;
     LONG ref;
 } IDirectDrawFactoryImpl;
 
diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c
index e3cd664..40ec7cb 100644
--- a/dlls/ddrawex/main.c
+++ b/dlls/ddrawex/main.c
@@ -272,9 +272,9 @@ CreateDirectDrawFactory(IUnknown* UnkOut
         return E_OUTOFMEMORY;
     }
 
-    This->lpVtbl = (IDirectDrawFactory*) &IDirectDrawFactory_Vtbl;
+    This->lpVtbl = &IDirectDrawFactory_Vtbl;
 
-    hr = IDirectDrawFactory_QueryInterface(This->lpVtbl, iid,  obj);
+    hr = IDirectDrawFactory_QueryInterface((IDirectDrawFactory *)This, iid,  obj);
 
     if (FAILED(hr))
         HeapFree(GetProcessHeap(), 0, This);
@@ -315,7 +315,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
     factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory));
     if (factory == NULL) return E_OUTOFMEMORY;
 
-    factory->lpVtbl = (IClassFactory*) &IClassFactory_Vtbl;
+    factory->lpVtbl = &IClassFactory_Vtbl;
     factory->ref = 1;
 
     factory->pfnCreateInstance = CreateDirectDrawFactory;




More information about the wine-cvs mailing list