[ros-diffs] [cwittich] 26403: fix a bug and some warnings in ddraw

Author: cwittich
Date: Wed Apr 18 23:51:21 2007
New Revision: 26403

URL: http://svn.reactos.org/svn/reactos?rev=26403&view=rev
Log:
fix a bug and some warnings in ddraw

Modified:
    trunk/reactos/dll/directx/ddraw/cleanup.c
    trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/main/surface_main.c
    trunk/reactos/dll/directx/ddraw/startup.c

Modified: trunk/reactos/dll/directx/ddraw/cleanup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.c...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/cleanup.c (original)
+++ trunk/reactos/dll/directx/ddraw/cleanup.c Wed Apr 18 23:51:21 2007
@@ -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();

Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Wed Apr 18 23:51:21 2007
@@ -171,7 +171,8 @@
     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 @@
     }

/* 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;

Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Apr 18 23:51:21 2007
@@ -497,7 +497,7 @@

This = (LPDDRAWI_DDRAWSURFACE_INT)iface;

-    *phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
+    *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC;

return DD_OK;
 }

Modified: trunk/reactos/dll/directx/ddraw/startup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.c...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/startup.c (original)
+++ trunk/reactos/dll/directx/ddraw/startup.c Wed Apr 18 23:51:21 2007
@@ -926,7 +926,7 @@
         }

/* we need check the GUID lpGUID what type it is */
-        if (pGUID != DDCREATE_HARDWAREONLY)
+        if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)
         {
             if (pGUID !=NULL)
             {