fix some warnings

svn path=/trunk/; revision=31977

diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index 62d80de..dd9af7c 100644 (file)
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -474,7 +474,7 @@ HRESULT WINAPI
 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);

diff --git a/reactos/dll/directx/ddraw/Surface/surface_main.c b/reactos/dll/directx/ddraw/Surface/surface_main.c
index 2f3641d..2d4d14f 100644 (file)
--- a/reactos/dll/directx/ddraw/Surface/surface_main.c
+++ b/reactos/dll/directx/ddraw/Surface/surface_main.c
@@ -60,10 +60,10 @@ ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT This)
 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 @@ Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect,
 
     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 @@ Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect,
 
         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;

diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
index 94791df..fe5c0c3 100644 (file)
--- a/reactos/dll/directx/ddraw/rosdraw.h
+++ b/reactos/dll/directx/ddraw/rosdraw.h
@@ -269,7 +269,7 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7);
     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; \
     }