[ros-diffs] [cwittich] 31977: fix some warnings

[cwittich at svn.reactos.org]

Author: cwittich
Date: Thu Jan 24 23:40:57 2008
New Revision: 31977

URL: http://svn.reactos.org/svn/reactos?rev=31977&view=rev
Log:
fix some warnings

Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
    trunk/reactos/dll/directx/ddraw/rosdraw.h

Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c?rev=31977&r1=31976&r2=31977&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Thu Jan 24 23:40:57 2008
@@ -474,7 +474,7 @@
 Main_DirectDraw_CreateSurface4(LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD,
                                LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter)
 {
-    HRESULT ret;
+    HRESULT ret = DD_OK;
     DX_WINDBG_trace();
 
     EnterCriticalSection(&ddcs);

Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/surface_main.c?rev=31977&r1=31976&r2=31977&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Thu Jan 24 23:40:57 2008
@@ -60,10 +60,10 @@
 HRESULT WINAPI
 Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT This, REFIID riid, LPVOID* ppObj)
 {
-    DX_WINDBG_trace();
     HRESULT retVal = DD_OK;
     *ppObj = NULL;
 
+    DX_WINDBG_trace();
 
     _SEH_TRY
     {
@@ -394,7 +394,7 @@
 
     DX_WINDBG_trace();
 
-    DX_WINDBG_trace_res( This->lpLcl->lpGbl->wWidth, This->lpLcl->lpGbl->wHeight, This->lpLcl->lpGbl->lPitch, 0);
+    DX_WINDBG_trace_res( (DWORD)This->lpLcl->lpGbl->wWidth, (DWORD)This->lpLcl->lpGbl->wHeight, (DWORD)This->lpLcl->lpGbl->lPitch, (DWORD) 0);
 
     if (events != NULL)
     {
@@ -460,7 +460,7 @@
 
         pDDSD->lpSurface = (LPVOID)  mdLock.lpSurfData;
 
-        pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight;
+        pDDSD->dwHeight = This->lpLcl->lpGbl->wHeight;
         pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth;
 
         pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8;

Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h?rev=31977&r1=31976&r2=31977&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/rosdraw.h (original)
+++ trunk/reactos/dll/directx/ddraw/rosdraw.h Thu Jan 24 23:40:57 2008
@@ -269,7 +269,7 @@
     if (firstcallxx) \
     { \
         char buffer[1024]; \
-        sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d freq = %d\n",width,height,bpp, freq); \
+        sprintf ( buffer, "Setmode have been req width=%ld, height=%ld bpp=%ld freq = %ld\n",width,height,bpp, freq); \
         OutputDebugStringA(buffer); \
         firstcallxx = TRUE; \
     }