Author: greatlrd
Date: Wed Dec 13 12:36:39 2006
New Revision: 25143
URL:
http://svn.reactos.org/svn/reactos?rev=25143&view=rev
Log:
fixed setcorative level set now the DDRAWILCL_ISFULLSCREEN flags,
remove some code from blt for it does not work in fullscreen. our bltblt working now in
fullscreen and windows mode.
Modified:
trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
trunk/reactos/dll/directx/ddraw/main/surface_main.c
Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Wed Dec 13 12:36:39 2006
@@ -822,6 +822,11 @@
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
DX_WINDBG_trace();
+
+ if (cooplevel & DDSCL_FULLSCREEN)
+ {
+ This->lpLcl->dwLocalFlags |= DDRAWILCL_ISFULLSCREEN;
+ }
/* This code should be a callback */
This->lpLcl->hWnd = hwnd;
Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Dec 13 12:36:39 2006
@@ -112,25 +112,11 @@
}
else
{
- if ( ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->dwLocalFlags &
- DDRAWILCL_ISFULLSCREEN)
- {
- mDdBlt.rSrc.top = 0;
- mDdBlt.rSrc.left = 0;
- mDdBlt.rSrc.right = ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->
- vmiData.dwDisplayWidth;
-
- mDdBlt.rSrc.bottom =
ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->
- vmiData.lDisplayPitch;
- }
- else
- {
- if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd,
+ if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd,
(RECT *)&mDdBlt.rSrc))
- {
- DX_STUB_str("GetWindowRect failed");
- }
- }
+ {
+ DX_STUB_str("GetWindowRect failed");
+ }
}
/* FIXME
@@ -149,26 +135,12 @@
}
else
{
- if ( ThisDest->lpLcl->lpSurfMore->lpDD_lcl->dwLocalFlags &
- DDRAWILCL_ISFULLSCREEN)
- {
- mDdBlt.rDest.top = 0;
- mDdBlt.rDest.left = 0;
- mDdBlt.rDest.right = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->
- vmiData.dwDisplayWidth;
-
- mDdBlt.rDest.bottom = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->
- vmiData.lDisplayPitch;
- }
- else
- {
-
- if(!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd,
+ if(!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd,
(RECT *)&mDdBlt.rDest))
- {
- DX_STUB_str("GetWindowRect failed");
- }
- }
+ {
+ DX_STUB_str("GetWindowRect failed");
+ }
+
}
/* FIXME