[khornicek] 37964: - merge r37917, r37835 from trunk

Author: khornicek
Date: Tue Dec  9 08:05:35 2008
New Revision: 37964

URL: http://svn.reactos.org/svn/reactos?rev=37964&view=rev
Log:
- merge r37917, r37835 from trunk

Modified:
    branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c
    branches/reactx/reactos/dll/directx/ddraw/startup.c

Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddraw...
==============================================================================
--- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Tue Dec  9 08:05:35 2008
@@ -590,7 +590,7 @@

DX_WINDBG_trace();

-	if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP)
+	if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP))
    {
    	return DDERR_GENERIC;
    }

Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddraw...
==============================================================================
--- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Tue Dec  9 08:05:35 2008
@@ -136,7 +136,7 @@
     {
         DX_STUB_str("Got iface\n");

-        if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK);
+        if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK)
         {
             /*
             RtlZeroMemory(&wnd_class, sizeof(wnd_class));