[ros-diffs] [greatlrd] 27184: make ddraw.dll lite more msvs frendly

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Fri Jun 15 14:21:54 2007
New Revision: 27184

URL: http://svn.reactos.org/svn/reactos?rev=27184&view=rev
Log:
make ddraw.dll lite more msvs frendly

Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/ddraw/rosdraw.h
    trunk/reactos/dll/directx/ddraw/startup.c

Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c?rev=27184&r1=27183&r2=27184&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Fri Jun 15 14:21:54 2007
@@ -47,9 +47,9 @@
 
             while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE)
             {
+                DDSURFACEDESC2 SurfaceDesc; 
+
                 DX_STUB_str("here\n");
-
-                DDSURFACEDESC2 SurfaceDesc; 
 
                 iMode++;
 
@@ -121,9 +121,9 @@
                                                                 DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags)
 {
     LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
-    DX_WINDBG_trace();
-
     HRESULT ret = DD_OK;
+
+    DX_STUB_str("here\n");
 
     _SEH_TRY
     {
@@ -145,6 +145,7 @@
             }
             else
             {
+                LONG retval;
                 // Here we go
                 DEVMODE DevMode;
                 DevMode.dmFields = 0;
@@ -163,7 +164,8 @@
                 DevMode.dmBitsPerPel = dwBPP;
                 DevMode.dmDisplayFrequency = dwRefreshRate;
 
-                LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN); /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */
+                retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN);
+                /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */
 
                 if(retval == DISP_CHANGE_BADMODE)
                 {
@@ -200,10 +202,12 @@
 
     _SEH_TRY
     {
+        BOOL ModeChanged;
+
         ChangeDisplaySettings(NULL, 0);
 
         // Update Interals
-        BOOL ModeChanged;
+
         
         This->lpLcl->lpGbl->hDD = This->lpLcl->hDD;
         DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged);

Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbuild?rev=27184&r1=27183&r2=27184&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original)
+++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Fri Jun 15 14:21:54 2007
@@ -6,7 +6,7 @@
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 
-	<library>ntdll</library>          
+       
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h?rev=27184&r1=27183&r2=27184&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/rosdraw.h (original)
+++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Jun 15 14:21:54 2007
@@ -192,7 +192,7 @@
 } \
 	return DD_OK;
 
-
+ #ifdef __GNU__
 #define DX_STUB_str(x) \
 		{ \
         char buffer[1024]; \
@@ -200,6 +200,7 @@
 		OutputDebugStringA(buffer); \
         }
 
+
 #define DX_WINDBG_trace() \
 	static BOOL firstcallx = TRUE; \
 	if (firstcallx) \
@@ -210,6 +211,8 @@
 		firstcallx = TRUE; \
 	}
 
+
+
 #define DX_WINDBG_trace_res(width,height,bpp) \
 	static BOOL firstcallxx = TRUE; \
 	if (firstcallxx) \
@@ -220,4 +223,10 @@
 		firstcallxx = FALSE; \
 	}
 
+#else
+    #define DX_WINDBG_trace() //
+    #define DX_STUB_str(x) //
+    #define DX_WINDBG_trace_res(width,height,bpp) //
+#endif
+
 #endif /* __DDRAW_PRIVATE */

Modified: trunk/reactos/dll/directx/ddraw/startup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.c?rev=27184&r1=27183&r2=27184&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/startup.c (original)
+++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 15 14:21:54 2007
@@ -37,11 +37,11 @@
     /* fixme linking too second link when we shall not doing it */
     if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW)))
     {
-        DX_STUB_str("1. no linking\n");
-
         /* We do not have a DirectDraw interface, we need alloc it*/
         LPDDRAWI_DIRECTDRAW_INT memThis;
 
+        DX_STUB_str("1. no linking\n");
+
         DxHeapMemAlloc(memThis, sizeof(DDRAWI_DIRECTDRAW_INT));
         if (memThis == NULL)
         {
@@ -60,9 +60,10 @@
     }
     else
     {
-        DX_STUB_str("2.linking\n");
         /* We got the DirectDraw interface alloc and we need create the link */
         LPDDRAWI_DIRECTDRAW_INT  newThis;
+
+        DX_STUB_str("2.linking\n");
 
         /* step 1.Alloc the new  DDRAWI_DIRECTDRAW_INT for the lnking */
         DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT));
@@ -378,6 +379,7 @@
     D3DHAL_GLOBALDRIVERDATA mD3dDriverData;
     DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks;
     LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
+    DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 };
 
     DX_WINDBG_trace();
 
@@ -533,7 +535,7 @@
 
     /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */
 
-    DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 };
+    
 
 
     if (mHALInfo.dwFlags & DDHALINFO_GETDRIVERINFOSET)