Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23168: hacking NtGdiDdResetVisrgn so it lest say clip have not change. for now
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 06:14:26 2006 New Revision: 23168 URL: http://svn.reactos.org/svn/reactos?rev=23168&view=rev Log: hacking NtGdiDdResetVisrgn so it lest say clip have not change. for now Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Wed Jul 19 06:14:26 2006 @@ -338,9 +338,18 @@ HWND hwnd ) { - UNIMPLEMENTED - - return 0; + DPRINT1("UNIMPLEMENTED NtGdiDdResetVisrgn \n"); + /* see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu… + for more info, I pasted some part of it here + Clipping can change asynchronously from the point of view of user-mode threads. + The kernel-mode parts of DirectDraw and Microsoft Windows Graphics Device Interface (GDI) + maintain a counter that is incremented whenever the clipping list for the entire desktop + changes. A call to this function records this counter with every existing DirectDraw + primary surface on the system. + + */ + + return TRUE; }

1 0

[greatlrd] 23167: more source cleanup
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 06:03:22 2006 New Revision: 23167 URL: http://svn.reactos.org/svn/reactos?rev=23167&view=rev Log: more source cleanup Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 06:03:22 2006 @@ -474,32 +474,30 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdDestroySurface\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - { - DD_DESTROYSURFACEDATA DestroySurf; - - /* FIXME - * bRealDestroy - * are we doing right ?? - */ - DestroySurf.lpDD = &pDirectDraw->Global; - - DestroySurf.lpDDSurface = hSurface; // ? - DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface; + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) + { + DD_DESTROYSURFACEDATA DestroySurf; + + /* FIXME + * bRealDestroy + * are we doing right ?? + */ + + DestroySurf.lpDD = &pDirectDraw->Global; + DestroySurf.lpDDSurface = hSurface; // ? + DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface; - ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf); - } - - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf); + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -511,33 +509,29 @@ PDD_FLIPDATA puFlipData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdFlip\n"); -#endif - - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puFlipData->lpDD; - - /* use our cache version instead */ - puFlipData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->Surf.Flip(puFlipData); - - /* But back the orignal PDev */ - puFlipData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP) + { + lgpl = puFlipData->lpDD; + puFlipData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->Surf.Flip(puFlipData); + + puFlipData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -547,32 +541,28 @@ HDC hdcClip ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdLock\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puLockData->lpDD; - - /* use our cache version instead */ - puLockData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->Surf.Lock(puLockData); - - /* But back the orignal PDev */ - puLockData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK) + { + lgpl = puLockData->lpDD; + puLockData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->Surf.Lock(puLockData); + + puLockData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; }

1 0

[greatlrd] 23166: small cleanup of the code in this file. and alot of callbacks working as they should if a drv support it.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 05:49:55 2006 New Revision: 23166 URL: http://svn.reactos.org/svn/reactos?rev=23166&view=rev Log: small cleanup of the code in this file. and alot of callbacks working as they should if a drv support it. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 05:49:55 2006 @@ -264,7 +264,6 @@ RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof( D3DNTHAL_CALLBACKS ) ); } - if (pHalInfo->lpD3DBufCallbacks) { DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); @@ -370,34 +369,28 @@ PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw; -#ifdef DX_DEBUG + DPRINT1("NtGdiDdWaitForVerticalBlank\n"); -#endif - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puWaitForVerticalBlankData->lpDD; - - /* use our cache version instead */ - puWaitForVerticalBlankData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); - - /* But back the orignal PDev */ - puWaitForVerticalBlankData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + lgpl = puWaitForVerticalBlankData->lpDD; + puWaitForVerticalBlankData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); + + puWaitForVerticalBlankData->lpDD = lgpl; + } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -406,33 +399,33 @@ PDD_CANCREATESURFACEDATA puCanCreateSurfaceData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdCanCreateSurface\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puCanCreateSurfaceData->lpDD; - - /* use our cache version instead */ - puCanCreateSurfaceData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); - - /* But back the orignal PDev */ - puCanCreateSurfaceData->lpDD = lgpl; + + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (pDirectDraw != NULL) + { + + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + lgpl = puCanCreateSurfaceData->lpDD; + puCanCreateSurfaceData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); + + puCanCreateSurfaceData->lpDD = lgpl; + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return ddRVal; + } + + return ddRVal; } DWORD STDCALL NtGdiDdGetScanLine( @@ -440,33 +433,29 @@ PDD_GETSCANLINEDATA puGetScanLineData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdGetScanLine\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puGetScanLineData->lpDD; - - /* use our cache version instead */ - puGetScanLineData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); - - /* But back the orignal PDev */ - puGetScanLineData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return ddRVal; + + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + lgpl = puGetScanLineData->lpDD; + puGetScanLineData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); + + puGetScanLineData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + + return ddRVal; }

1 0

[greatlrd] 23165: Complete NtGdiDdQueryDirectDrawObject now we support all 3d callbacks.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 05:40:06 2006 New Revision: 23165 URL: http://svn.reactos.org/svn/reactos?rev=23165&view=rev Log: Complete NtGdiDdQueryDirectDrawObject now we support all 3d callbacks. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 05:40:06 2006 @@ -257,17 +257,14 @@ DPRINT1("Found DirectDraw Global DriverData \n"); RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); } - /* FIXME - * we missing D3DHAL_CALLBACKS in the headers - * if (pHalInfo->lpD3DHALCallbacks ) { DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - RtlMoveMemory(puD3dCallbacks, (ULONG *)pHalInfo->lpD3DHALCallbacks, sizeof( D3DHAL_CALLBACKS )); - } - - */ + RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof( D3DNTHAL_CALLBACKS ) ); + } + + if (pHalInfo->lpD3DBufCallbacks) { DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); @@ -288,15 +285,11 @@ DWORD ddRVal = 0; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdGetDriverInfo\n"); -#endif - - if (pDirectDraw == NULL) - { -#ifdef DX_DEBUG - DPRINT1("Can not lock DirectDraw handle \n"); -#endif + + if (pDirectDraw == NULL) + { return DDHAL_DRIVER_NOTHANDLED; } @@ -312,14 +305,13 @@ /* Now we are doing the call to drv DrvGetDriverInfo */ if (ddRVal == 2) { -#ifdef DX_DEBUG DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED"); -#endif ddRVal = DDHAL_DRIVER_NOTHANDLED; } else + { ddRVal = pDirectDraw->Hal.GetDriverInfo(puGetDriverInfoData); - + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return ddRVal;

1 0

[greatlrd] 23164: cleanup NtGdiDdCreateSurface we can now create a surface from DdCreateSurface.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 04:41:18 2006 New Revision: 23164 URL: http://svn.reactos.org/svn/reactos?rev=23164&view=rev Log: cleanup NtGdiDdCreateSurface we can now create a surface from DdCreateSurface. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 04:41:18 2006 @@ -344,42 +344,32 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw; PDD_DIRECTDRAW_GLOBAL lgpl; -#ifdef DX_DEBUG + DPRINT1("NtGdiDdCreateSurface\n"); -#endif pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (pDirectDraw == NULL) - { -#ifdef DX_DEBUG - DPRINT1("Can not lock the DirectDraw handle\n"); -#endif - return DDHAL_DRIVER_NOTHANDLED; - } - - /* backup the orignal PDev and info */ - lgpl = puCreateSurfaceData->lpDD; - - /* use our cache version instead */ - puCreateSurfaceData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) - { -#ifdef DX_DEBUG - DPRINT1("DirectDraw HAL does not support Create Surface"); -#endif - ddRVal = DDHAL_DRIVER_NOTHANDLED; - } - else - { - ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); - } - - /* But back the orignal PDev */ - puCreateSurfaceData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + + if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) + { + /* backup the orignal PDev and info */ + lgpl = puCreateSurfaceData->lpDD; + + /* use our cache version instead */ + puCreateSurfaceData->lpDD = &pDirectDraw->Global; + + /* make the call */ + ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); + + /* But back the orignal PDev */ + puCreateSurfaceData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; }

1 0

[greatlrd] 23163: Fixing small bug in DdCreateSurface
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 04:39:03 2006 New Revision: 23163 URL: http://svn.reactos.org/svn/reactos?rev=23163&view=rev Log: Fixing small bug in DdCreateSurface Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Wed Jul 19 04:39:03 2006 @@ -68,11 +68,11 @@ } DWORD CALLBACK -DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd) +DdCreateSurface(PDD_CREATESURFACEDATA pcsd) { int i; - if (pcsd->dwSCnt == 1) + if (pcsd->dwSCnt < 1) { pcsd->ddRVal = DDERR_GENERIC; return DDHAL_DRIVER_NOTHANDLED; Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Wed Jul 19 04:39:03 2006 @@ -82,7 +82,7 @@ DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); DWORD CALLBACK -DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd); +DdCreateSurface(PDD_CREATESURFACEDATA pcsd); VOID STDCALL DrvDisableDirectDraw(

1 0

[greatlrd] 23162: framebuf Implement DdCreateSurface not tested. Bugfix the prototyped.
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Wed Jul 19 03:56:48 2006 New Revision: 23162 URL: http://svn.reactos.org/svn/reactos?rev=23162&view=rev Log: framebuf Implement DdCreateSurface not tested. Bugfix the prototyped. Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Wed Jul 19 03:56:48 2006 @@ -68,9 +68,49 @@ } DWORD CALLBACK -DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface) +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd) { - lpCreateSurface->ddRVal = DDERR_GENERIC; - return DDHAL_DRIVER_NOTHANDLED; + int i; + + if (pcsd->dwSCnt == 1) + { + pcsd->ddRVal = DDERR_GENERIC; + return DDHAL_DRIVER_NOTHANDLED; + } + + + for (i=0; i<(int)pcsd->dwSCnt; i++) + { + pcsd->lplpSList[i]->lpGbl->lPitch = (DWORD)(pcsd->lplpSList[i]->lpGbl->wWidth * + (pcsd->lplpSList[i]->lpGbl->ddpfSurface.dwRGBBitCount / 8)); + + pcsd->lplpSList[i]->lpGbl->dwBlockSizeX = pcsd->lplpSList[i]->lpGbl->lPitch * + (DWORD)(pcsd->lplpSList[i]->lpGbl->wHeight); + + pcsd->lplpSList[i]->lpGbl->dwBlockSizeY = 1; + + if ( pcsd->lplpSList[i] ->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + pcsd->lplpSList[i]->lpGbl->fpVidMem = 0; + } + else + { + + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + pcsd->lplpSList[i]->lpGbl->fpVidMem = DDHAL_PLEASEALLOC_BLOCKSIZE; + } + + pcsd->lpDDSurfaceDesc->lPitch = pcsd->lplpSList[i]->lpGbl->lPitch; + pcsd->lpDDSurfaceDesc->dwFlags |= DDSD_PITCH; + + } // for i + + + + pcsd->ddRVal = DD_OK; + return DDHAL_DRIVER_HANDLED; } Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Wed Jul 19 03:56:48 2006 @@ -82,7 +82,7 @@ DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); DWORD CALLBACK -DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface); +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd); VOID STDCALL DrvDisableDirectDraw(

1 0

[fireball] 23161: Add traceprints, and temporarily comment out NDEBUG
by fireball＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: fireball Date: Tue Jul 18 23:06:30 2006 New Revision: 23161 URL: http://svn.reactos.org/svn/reactos?rev=23161&view=rev Log: Add traceprints, and temporarily comment out NDEBUG Modified: trunk/reactos/drivers/test/kmtest/ntos_ex.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_e… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ex.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ex.c Tue Jul 18 23:06:30 2006 @@ -71,6 +71,7 @@ ok(Status == STATUS_SUCCESS, "ZwOpenTimer failed with Status=0x%08lX", Status); // Set the timer, to some rather high value so it doesn't expire + DPRINT("Set timer 1\n"); DueTime.LowPart = -10000; DueTime.HighPart = -10; PreviousState = TRUE; @@ -85,6 +86,7 @@ ok(CurrentState == FALSE, "Incorrect CurrentState returned when canceling the timer"); // Set the timer to some small value, because we'll wait for it to expire + DPRINT("Set timer 2\n"); DueTime.LowPart = -100; DueTime.HighPart = -1; PreviousState = TRUE; @@ -93,16 +95,19 @@ ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); // Wait until it expires + DPRINT("Wait till timer expires\n"); Status = ZwWaitForSingleObject(HandleOpened, FALSE, NULL); ok(Status == STATUS_SUCCESS, "ZwWaitForSingleObject failed with Status=0x%08lX", Status); // And cancel it + DPRINT("Cancel it\n"); CurrentState = FALSE; Status = ZwCancelTimer(HandleOpened, &CurrentState); ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); ok(CurrentState == TRUE, "Incorrect CurrentState returned when setting the timer"); // Test it with APC: Set, Cancel, check if APC has been called + DPRINT("Set timer with Apc (3)\n"); ApcCount = 0; DueTime.LowPart = -10000; DueTime.HighPart = -10; @@ -114,6 +119,7 @@ ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); ok(PreviousState == TRUE, "Incorrect PreviousState returned when setting the timer"); + DPRINT("Cancel it\n"); CurrentState = TRUE; Status = ZwCancelTimer(HandleOpened, &CurrentState); ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); @@ -121,6 +127,7 @@ ok(ApcCount == 0, "Incorrect count of TimerApcRoutine calls: %ld, should be 0\n", ApcCount); // Test setting the timer two times in a row, APC routine must not be called + DPRINT("Set timer with Apc (4)\n"); ApcCount = 0; DueTime.LowPart = -10000; DueTime.HighPart = -10; @@ -132,6 +139,7 @@ ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); // Set small due time, since we have to wait for timer to finish + DPRINT("Set timer with Apc (5)\n"); DueTime.LowPart = -10; DueTime.HighPart = -1; PreviousState = TRUE; @@ -142,6 +150,7 @@ ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); // Now wait till it's finished, and then check APC call + DPRINT("Wait for it\n"); Status = ZwWaitForSingleObject(HandleOpened, FALSE, NULL); ok(Status == STATUS_SUCCESS, "ZwWaitForSingleObject failed with Status=0x%08lX", Status);

1 0

[greatlrd] 23160: rewrote NtGdiDdQueryDirectDrawObject for I must have been drunk when I wrote it frist time. Now we manger getting gdientry2 working more or less here is a log how far I have come I have not implement create surface for the drv yet. But it showing lest how far dxhaltest comes. as u all can see it is not far before we getting dx hal working out of the box from win32k and gdi32. I will thank all people that have been invlove in this, DrFred to helping debug betwin ddraw.dll gdi32.
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Tue Jul 18 23:04:41 2006 New Revision: 23160 URL: http://svn.reactos.org/svn/reactos?rev=23160&view=rev Log: rewrote NtGdiDdQueryDirectDrawObject for I must have been drunk when I wrote it frist time. Now we manger getting gdientry2 working more or less here is a log how far I have come I have not implement create surface for the drv yet. But it showing lest how far dxhaltest comes. as u all can see it is not far before we getting dx hal working out of the box from win32k and gdi32. I will thank all people that have been invlove in this, DrFred to helping debug betwin ddraw.dll gdi32.dll with his sniffer apps, Alex for GdiEntry2, and some other help, W3seek, Filip, GvG help me to understand how our win32k how it works and some other info. to make so far posible, it is now posible to load a graphic driver directx hal support in ros. But I do not known how well it works yet, after it is the frist public version that working so far. ddraw.c:60) NtGdiDdCreateDirectDrawObject ddraw.c:140) DirectDraw return handler 0x3b6001e4 ddraw.c:170) NtGdiDdQueryDirectDrawObject ddraw.c:247) Found DirectDraw CallBack for 2D and 3D Hal ddraw.c:170) NtGdiDdQueryDirectDrawObject ddraw.c:247) Found DirectDraw CallBack for 2D and 3D Hal ddraw.c:432) NtGdiDdCanCreateSurface ddraw.c:348) NtGdiDdCreateSurface Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Tue Jul 18 23:04:41 2006 @@ -30,9 +30,8 @@ DD_Cleanup(PVOID ObjectBody) { PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; -#ifdef DX_DEBUG + DPRINT1("DD_Cleanup\n"); -#endif if (!pDirectDraw) return FALSE; @@ -47,9 +46,8 @@ return TRUE; } -HANDLE STDCALL NtGdiDdCreateDirectDrawObject( - HDC hdc -) +HANDLE STDCALL +NtGdiDdCreateDirectDrawObject(HDC hdc) { DD_CALLBACKS callbacks; DD_SURFACECALLBACKS surface_callbacks; @@ -85,6 +83,11 @@ if (pDC->DriverFunctions.EnableDirectDraw == NULL) { /* Driver doesn't support DirectDraw */ + + /* + Warring ReactOS complain that pDC are not right owner + when DC_UnlockDc(pDC) hit, why ? + */ DC_UnlockDc(pDC); return NULL; } @@ -134,17 +137,14 @@ GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); DC_UnlockDc(pDC); - DPRINT1("DirectDraw return handler\n"); + DPRINT1("DirectDraw return handler 0x%x\n",hDirectDraw); return hDirectDraw; } -BOOL STDCALL NtGdiDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -) -{ -#ifdef DX_DEBUG +BOOL STDCALL +NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal) +{ DPRINT1("NtGdiDdDeleteDirectDrawObject\n"); -#endif return GDIOBJ_FreeObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); } @@ -162,59 +162,42 @@ DWORD *puFourCC ) { -#ifdef DX_DEBUG + DD_HALINFO HalInfo; PDD_DIRECTDRAW pDirectDraw; BOOL success; + + DPRINT1("NtGdiDdQueryDirectDrawObject\n"); -#endif /* Check for NULL pointer to prevent any one doing a mistake */ - if (hDirectDrawLocal == NULL) { -#ifdef DX_DEBUG - DPRINT1("warning hDirectDraw handler is NULL, the handler is DDRAWI_DIRECTDRAW_GBL.hDD\n"); - DPRINT1("and it is NtGdiDdCreateDirectDrawObject return value\n"); -#endif return FALSE; } - if (pHalInfo == NULL) - { -#ifdef DX_DEBUG - DPRINT1("warning pHalInfo buffer is NULL \n"); -#endif + { return FALSE; } if ( pCallBackFlags == NULL) { -#ifdef DX_DEBUG - DPRINT1("warning pCallBackFlags s NULL, the size must be 3*DWORD in follow order \n"); - DPRINT1("pCallBackFlags[0] = flags in DD_CALLBACKS\n"); - DPRINT1("pCallBackFlags[1] = flags in DD_SURFACECALLBACKS\n"); - DPRINT1("pCallBackFlags[2] = flags in DD_PALETTECALLBACKS\n"); -#endif return FALSE; } - - + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - + if (!pDirectDraw) { /* Fail to Lock DirectDraw handle */ -#ifdef DX_DEBUG - DPRINT1(" Fail to Lock DirectDraw handle \n"); -#endif return FALSE; } + pHalInfo->dwSize = 0; + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - pHalInfo, + &HalInfo, puNumHeaps, puvmList, puNumFourCC, @@ -222,136 +205,77 @@ if (!success) { -#ifdef DX_DEBUG - DPRINT1(" Fail to get DirectDraw driver info \n"); -#endif + DPRINT1("Driver does not fill the Fail to get DirectDraw driver info \n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } - - + + if (HalInfo.dwSize == 0) + { + DPRINT1(" Fail for driver does not fill the DD_HALINFO struct \n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + if (HalInfo.dwSize != sizeof(DD_HALINFO)) + { + if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) + { + /* NT4 Compatible */ + DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); + HalInfo.dwSize = sizeof(DD_HALINFO); + HalInfo.lpD3DGlobalDriverData = NULL; + HalInfo.lpD3DHALCallbacks = NULL; + HalInfo.lpD3DBufCallbacks = NULL; + } + else + { + DPRINT1(" Fail : did not get DD_HALINFO size \n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + } + + RtlMoveMemory(pHalInfo, &HalInfo, sizeof(DD_HALINFO)); + /* rest the flag so we do not need do it later */ - pCallBackFlags[0]=0; - pCallBackFlags[1]=0; - pCallBackFlags[2]=0; - - if (pHalInfo) - { - - { - DDHALINFO* pHalInfo2 = ((DDHALINFO*) pHalInfo); -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 2D and 3D Hal\n"); -#endif - RtlMoveMemory(&pDirectDraw->Hal, pHalInfo2, sizeof(DDHALINFO)); - - if (pHalInfo2->lpDDExeBufCallbacks) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); -#endif - /* msdn DDHAL_D3DBUFCALLBACKS = DD_D3DBUFCALLBACKS */ - RtlMoveMemory(puD3dBufferCallbacks, pHalInfo2->lpDDExeBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - } - -#ifdef DX_DEBUG - DPRINT1("Do not support CallBack for 3D Hal\n"); -#endif - /* FIXME we need D3DHAL be include - - if (pHalInfo2->lpD3DHALCallbacks ) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); -#endif - RtlMoveMemory(puD3dCallbacks, (ULONG *)pHalInfo2->lpD3DHALCallbacks, sizeof( D3DHAL_CALLBACKS )); - } - */ - - - /* msdn say D3DHAL_GLOBALDRIVERDATA and D3DNTHAL_GLOBALDRIVERDATA are not same - but if u compare these in msdn it is exacly same */ - - if (pHalInfo->lpD3DGlobalDriverData) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal Private \n"); -#endif - RtlMoveMemory(puD3dDriverData, (ULONG *)pHalInfo2->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - - /* build the flag */ - - if (pHalInfo2->lpDDCallbacks!=NULL) - { -#ifdef DX_DEBUG - DPRINT1("Dectect DirectDraw lpDDCallbacks for 2D Hal flag = %d\n",pHalInfo2->lpDDCallbacks->dwFlags); -#endif - pCallBackFlags[0] = pHalInfo2->lpDDCallbacks->dwFlags; - } - - if (pHalInfo2->lpDDCallbacks!=NULL) - { -#ifdef DX_DEBUG - DPRINT1("Dectect DirectDraw lpDDSurfaceCallbacks for 2D Hal flag = %d\n",pHalInfo2->lpDDSurfaceCallbacks->dwFlags); -#endif - pCallBackFlags[1] = pHalInfo2->lpDDSurfaceCallbacks->dwFlags; - } - - if (pHalInfo2->lpDDCallbacks!=NULL) - { -#ifdef DX_DEBUG - DPRINT1("Dectect DirectDraw lpDDCallbacks for 2D Hal flag = %d\n",pHalInfo2->lpDDPaletteCallbacks->dwFlags); -#endif - pCallBackFlags[2] = pHalInfo2->lpDDPaletteCallbacks->dwFlags; - } - - } - -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); -#endif - RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); - - if (pHalInfo->lpD3DBufCallbacks) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); -#endif - RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - } - - if (pHalInfo->lpD3DHALCallbacks) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); -#endif - RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof(D3DNTHAL_CALLBACKS)); - } - - if (pHalInfo->lpD3DGlobalDriverData) - { -#ifdef DX_DEBUG - DPRINT1("Found DirectDraw CallBack for 3D Hal Private \n"); -#endif - RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - -#ifdef DX_DEBUG - DPRINT1("Unkown DirectX driver interface\n"); -#endif - - } - -#ifdef DX_DEBUG - else - { - DPRINT1("No DirectDraw Hal info have been found, it did not fail, it did gather some other info \n"); + pCallBackFlags[0]=pDirectDraw->DD.dwFlags; + pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; + pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; + + DPRINT1("Found DirectDraw CallBack for 2D and 3D Hal\n"); + + RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); + + if (pHalInfo->lpD3DGlobalDriverData) + { + /* + msdn say D3DHAL_GLOBALDRIVERDATA and D3DNTHAL_GLOBALDRIVERDATA are not same + but if u compare these in msdn it is exacly same + */ + DPRINT1("Found DirectDraw Global DriverData \n"); + RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); } -#endif - + /* FIXME + * we missing D3DHAL_CALLBACKS in the headers + * + + if (pHalInfo->lpD3DHALCallbacks ) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); + RtlMoveMemory(puD3dCallbacks, (ULONG *)pHalInfo->lpD3DHALCallbacks, sizeof( D3DHAL_CALLBACKS )); + } + + */ + if (pHalInfo->lpD3DBufCallbacks) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); + /* msdn DDHAL_D3DBUFCALLBACKS = DD_D3DBUFCALLBACKS */ + RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return TRUE; }

1 0

[greatlrd] 23159: DrvGetDirectDrawInfo fixing a bug I did set halinfo to wrong size
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Tue Jul 18 22:55:11 2006 New Revision: 23159 URL: http://svn.reactos.org/svn/reactos?rev=23159&view=rev Log: DrvGetDirectDrawInfo fixing a bug I did set halinfo to wrong size Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 22:55:11 2006 @@ -179,8 +179,8 @@ if(!(pvmList && pdwFourCC)) { - RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); - pHalInfo->dwSize = sizeof(DDHALINFO); + RtlZeroMemory(pHalInfo, sizeof(DD_HALINFO)); + pHalInfo->dwSize = sizeof(DD_HALINFO); pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006