From dd05afbec1a0b25be754743776f16059c04ab9bb Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Wed, 18 Apr 2007 19:51:21 +0000
Subject: [PATCH] fix a bug and some warnings in ddraw

svn path=/trunk/; revision=26403
---
 reactos/dll/directx/ddraw/cleanup.c           | 2 +-
 reactos/dll/directx/ddraw/main/ddraw_main.c   | 5 +++--
 reactos/dll/directx/ddraw/main/surface_main.c | 2 +-
 reactos/dll/directx/ddraw/startup.c           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/directx/ddraw/cleanup.c b/reactos/dll/directx/ddraw/cleanup.c
index b4208b8100f..5a6ba34eb4e 100644
--- a/reactos/dll/directx/ddraw/cleanup.c
+++ b/reactos/dll/directx/ddraw/cleanup.c
@@ -15,7 +15,7 @@
 VOID 
 Cleanup(LPDIRECTDRAW7 iface) 
 {
-    LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
+    //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
 
     DX_WINDBG_trace();
 
diff --git a/reactos/dll/directx/ddraw/main/ddraw_main.c b/reactos/dll/directx/ddraw/main/ddraw_main.c
index f02cc876063..86a1acefe47 100644
--- a/reactos/dll/directx/ddraw/main/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/main/ddraw_main.c
@@ -171,7 +171,8 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
     LPDDRAWI_DDRAWSURFACE_LCL *lpLcl;
     DWORD dwHowManySurface = 1;
     DWORD i;
-    LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl;
+    //LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl;
+
     if (pUnkOuter!=NULL) 
     {
         return CLASS_E_NOAGGREGATION; 
@@ -232,7 +233,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
     }
 
     /* Calc how many surface we need setup */
-    if (pDDSD->ddsCaps.dwCaps &DDSD_BACKBUFFERCOUNT)
+    if (pDDSD->ddsCaps.dwCaps & DDSD_BACKBUFFERCOUNT)
     {
        /* One primary + xx backbuffer */
        dwHowManySurface |= pDDSD->dwBackBufferCount;
diff --git a/reactos/dll/directx/ddraw/main/surface_main.c b/reactos/dll/directx/ddraw/main/surface_main.c
index 3c07bb48ba9..700bbd02b85 100644
--- a/reactos/dll/directx/ddraw/main/surface_main.c
+++ b/reactos/dll/directx/ddraw/main/surface_main.c
@@ -497,7 +497,7 @@ Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC)
 
     This = (LPDDRAWI_DDRAWSURFACE_INT)iface;        
 
-    *phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
+    *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
 
     return DD_OK;
 }
diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c
index 6dce0a1c133..2c3fc32303c 100644
--- a/reactos/dll/directx/ddraw/startup.c
+++ b/reactos/dll/directx/ddraw/startup.c
@@ -926,7 +926,7 @@ Create_DirectDraw (LPGUID pGUID,
         }
         
         /* we need check the GUID lpGUID what type it is */
-        if (pGUID != DDCREATE_HARDWAREONLY)
+        if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)
         {
             if (pGUID !=NULL)
             {