Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29575: delete stub.c from ntddraw folder it is not longer need it add more redirect to dxg.sys smaller cleanup as well
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Mon Oct 15 00:05:40 2007 New Revision: 29575 URL: http://svn.reactos.org/svn/reactos?rev=29575&view=rev Log: delete stub.c from ntddraw folder it is not longer need it add more redirect to dxg.sys smaller cleanup as well Removed: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Mon Oct 15 00:05:40 2007 @@ -25,6 +25,7 @@ extern PDRVFN gpDxFuncs; +typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Oct 15 00:05:40 2007 @@ -30,13 +30,10 @@ typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc); typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); -typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); -typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData); typedef HANDLE (NTAPI *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL); typedef BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE); typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); -typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*, LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA, @@ -361,8 +358,6 @@ /************************************************************************/ /* NtGdiDdReenableDirectDrawObject */ /************************************************************************/ - - BOOL STDCALL NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, @@ -387,7 +382,6 @@ /************************************************************************/ /* NtGdiDdGetDriverInfo */ /************************************************************************/ - DWORD STDCALL NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, @@ -407,8 +401,6 @@ DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); - - } @@ -462,6 +454,88 @@ } +/************************************************************************/ +/* NtGdiDdFlipToGDISurface */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdFlipToGDISurface(HANDLE hDirectDraw, + PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData) +{ + PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlipToGDISurface, pfnDdFlipToGDISurface); + + if (pfnDdFlipToGDISurface == NULL) + { + DPRINT1("Warring no pfnDdFlipToGDISurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface"); + return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData); + +} + +/************************************************************************/ +/* NtGdiDdGetDC */ +/************************************************************************/ +HDC +STDCALL +NtGdiDdGetDC(HANDLE hSurface, + PALETTEENTRY *puColorTable) +{ + +} + +/************************************************************************/ +/* NtGdiDdGetDxHandle */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDdGetDxHandle(HANDLE hDirectDraw, + HANDLE hSurface, + BOOL bRelease) +{ + +} + + +/************************************************************************/ +/* NtGdiDdReleaseDC */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdReleaseDC(HANDLE hSurface) +{ + +} + +/************************************************************************/ +/* NtGdiDdResetVisrgn */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdResetVisrgn(HANDLE hSurface, + HWND hwnd) +{ + +} + +/************************************************************************/ +/* NtGdiDdSetGammaRamp */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdSetGammaRamp(HANDLE hDirectDraw, + HDC hdc, + LPVOID lpGammaRamp) +{ + +} + + /* EOF */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Mon Oct 15 00:05:40 2007 @@ -16,6 +16,8 @@ extern PDRVFN gpDxFuncs; +typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); +typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); Removed: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (removed) @@ -1,85 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Native DirectDraw stubs - * FILE: subsys/win32k/ntddraw/stubs.c - * PROGRAMER: Peter Bajusz (hyp-x(a)stormregion.com) - * REVISION HISTORY: - * 25-10-2003 PB Created - */ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - - - -DWORD STDCALL NtGdiDdFlipToGDISurface( - HANDLE hDirectDraw, - PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData -) -{ - UNIMPLEMENTED - - return 0; -} - -HDC STDCALL NtGdiDdGetDC( - HANDLE hSurface, - PALETTEENTRY *puColorTable -) -{ - UNIMPLEMENTED - - return 0; -} - -HANDLE STDCALL NtGdiDdGetDxHandle( - HANDLE hDirectDraw, - HANDLE hSurface, - BOOL bRelease -) -{ - UNIMPLEMENTED - - return 0; -} - - - -BOOL STDCALL NtGdiDdReleaseDC( - HANDLE hSurface -) -{ - UNIMPLEMENTED - - return 0; -} - -BOOL STDCALL NtGdiDdResetVisrgn( - HANDLE hSurface, - HWND hwnd -) -{ - - return TRUE; -} - -BOOL STDCALL NtGdiDdSetGammaRamp( - HANDLE hDirectDraw, - HDC hdc, - LPVOID lpGammaRamp -) -{ - UNIMPLEMENTED - - return 0; -} - - - - - - -/* EOF */

1 0

[cfinck] 29574: Silence a warning
by cfinck＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: cfinck Date: Mon Oct 15 00:01:40 2007 New Revision: 29574 URL: http://svn.reactos.org/svn/reactos?rev=29574&view=rev Log: Silence a warning Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp Mon Oct 15 00:01:40 2007 @@ -27,7 +27,7 @@ activepile.Clear(); // Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards - yRowStackCardOffset = __cardheight / 6.7; + yRowStackCardOffset = (int)(__cardheight / 6.7); pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1); pDeck->SetEmptyImage(CS_EI_SUNK);

1 0

[cfinck] 29573: Compute the card offset for the row stack based on the height of the card. Otherwise the numbers of larger cards (like in cardsbav) are not visible.
by cfinck＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: cfinck Date: Sun Oct 14 23:49:12 2007 New Revision: 29573 URL: http://svn.reactos.org/svn/reactos?rev=29573&view=rev Log: Compute the card offset for the row stack based on the height of the card. Otherwise the numbers of larger cards (like in cardsbav) are not visible. Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp Sun Oct 14 23:49:12 2007 @@ -15,6 +15,7 @@ HBITMAP hbmBitmap; HDC hdcBitmap; +int yRowStackCardOffset; void CreateSol() { @@ -25,6 +26,8 @@ activepile.Clear(); + // Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards + yRowStackCardOffset = __cardheight / 6.7; pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1); pDeck->SetEmptyImage(CS_EI_SUNK); @@ -62,7 +65,7 @@ // for(i = 0; i < NUM_ROW_STACKS; i++) { - pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, Y_ROWSTACK_CARDOFFSET); + pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset); pRowStack[i]->SetEmptyImage(CS_EI_SUNK); pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Oct 14 23:49:12 2007 @@ -465,15 +465,15 @@ SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); + SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); + + CreateSol(); + // The status bar height is fixed and needed later in WM_SIZE and WM_GETMINMAXINFO // Force the window to process WM_GETMINMAXINFO again GetWindowRect(hwndStatus, &rcStatus); nStatusHeight = rcStatus.bottom - rcStatus.top; SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); - - SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); - - CreateSol(); NewGame(); @@ -514,7 +514,7 @@ Y_BORDER + __cardheight + Y_ROWSTACK_BORDER + - 6 * Y_ROWSTACK_CARDOFFSET + + 6 * yRowStackCardOffset + __cardheight + Y_BORDER + (dwOptions & OPTION_SHOW_STATUS ? nStatusHeight : 0); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sun Oct 14 23:49:12 2007 @@ -30,7 +30,7 @@ #define X_SUITSTACK_BORDER 10 #define Y_BORDER 20 #define Y_ROWSTACK_BORDER 32 -#define Y_ROWSTACK_CARDOFFSET 14 +extern int yRowStackCardOffset; extern CardRegion *pDeck; extern CardRegion *pPile;

1 0

[greatlrd] 29572: more redirect from win32k to dxg.sys btw no old code exists in current file.
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 23:45:13 2007 New Revision: 29572 URL: http://svn.reactos.org/svn/reactos?rev=29572&view=rev Log: more redirect from win32k to dxg.sys btw no old code exists in current file. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c Sun Oct 14 23:45:13 2007 @@ -18,15 +18,11 @@ extern PDRVFN gpDxFuncs; -/* is not longer in use PDD_DESTROYDRIVER DestroyDriver */ typedef DWORD (NTAPI *PGD_DDCREATESURFACE)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); -/* see ddsurf.c for PDD_SETCOLORKEY SetColorKey; */ -/* is not longer in use PDD_SETMODE SetMode; */ typedef DWORD (NTAPI *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA); typedef DWORD (NTAPI *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); -/* is not longer in use PDD_CREATEPALETTE CreatePalette; */ typedef DWORD (NTAPI *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA); -/* is not longer in use PDD_MAPMEMORY MapMemory; */ +typedef DWORD (NTAPI *PGD_DXDDCREATESURFACEEX)(HANDLE,HANDLE,DWORD); #define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \ if (gpDxFuncs) \ @@ -142,3 +138,34 @@ } +/************************************************************************/ +/* This is not part of the ddsurface interface but it have */ +/* deal with the surface */ +/************************************************************************/ + +/************************************************************************/ +/* NtGdiDdCreateSurfaceEx */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw, + HANDLE hSurface, + DWORD dwSurfaceHandle) +{ + PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurfaceEx, pfnDdCreateSurfaceEx); + + if (pfnDdCreateSurfaceEx == NULL) + { + DPRINT1("Warring no pfnDdCreateSurfaceEx"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx"); + return pfnDdCreateSurfaceEx(hDirectDrawLocal,puGetScanLineData); + +} + + Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Oct 14 23:45:13 2007 @@ -22,6 +22,10 @@ +typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); +typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); +typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY(HANDLE, PDD_GETAVAILDRIVERMEMORYDATA); +typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc); @@ -354,169 +358,107 @@ } - - - -BOOL -STDCALL NtGdiDdReenableDirectDrawObject( - HANDLE hDirectDrawLocal, - BOOL *pubNewMode -) -{ - BOOL Ret=FALSE; - NTSTATUS Status = FALSE; - PDD_DIRECTDRAW pDirectDraw; - - if (hDirectDrawLocal == NULL) - { - return Ret; - } - - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, - GDI_OBJECT_TYPE_DIRECTDRAW); - - if (!pDirectDraw) - { - return Ret; - } - - /* - * FIXME detect mode change thic code maybe are not correct - * if we call on intEnableDriver it will cause some memory leak - * we need free the alloc memory before we call on it - */ - Ret = intEnableDriver(pDirectDraw); - - _SEH_TRY - { - ProbeForWrite(pubNewMode, sizeof(BOOL), 1); - *pubNewMode = Ret; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return Ret; - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - return Ret; - -} - - - -DWORD STDCALL NtGdiDdGetDriverInfo( - HANDLE hDirectDrawLocal, - PDD_GETDRIVERINFODATA puGetDriverInfoData) - -{ - DWORD ddRVal = 0; - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, - GDI_OBJECT_TYPE_DIRECTDRAW); - - DPRINT1("NtGdiDdGetDriverInfo\n"); - - if (pDirectDraw == NULL) - { - return DDHAL_DRIVER_NOTHANDLED; - } - - /* it exsist two version of NtGdiDdGetDriverInfo we need check for both flags */ - if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFOSET)) - ddRVal++; - - if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFO2)) - ddRVal++; - - /* Now we are doing the call to drv DrvGetDriverInfo */ - if (ddRVal == 2) - { - DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED"); - ddRVal = DDHAL_DRIVER_NOTHANDLED; - } - else - { - ddRVal = pDirectDraw->Hal.GetDriverInfo(puGetDriverInfoData); - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - return ddRVal; -} - - - - - -DWORD STDCALL NtGdiDdGetAvailDriverMemory( - HANDLE hDirectDrawLocal, - PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData -) -{ - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - PDD_DIRECTDRAW_GLOBAL lgpl; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG - DPRINT1("NtGdiDdGetAvailDriverMemory\n"); -#endif - - /* backup the orignal PDev and info */ - lgpl = puGetAvailDriverMemoryData->lpDD; - - /* use our cache version instead */ - puGetAvailDriverMemoryData->lpDD = &pDirectDraw->Global; - - /* make the call */ - // ddRVal = pDirectDraw->DdGetAvailDriverMemory(puGetAvailDriverMemoryData); - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - - /* But back the orignal PDev */ - puGetAvailDriverMemoryData->lpDD = lgpl; - - return ddRVal; -} - - - - -DWORD STDCALL NtGdiDdSetExclusiveMode( - HANDLE hDirectDraw, - PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData -) -{ - DWORD ddRVal; - PDD_DIRECTDRAW_GLOBAL lgpl; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); - -#ifdef DX_DEBUG - DPRINT1("NtGdiDdSetExclusiveMode\n"); -#endif - - /* backup the orignal PDev and info */ - lgpl = puSetExclusiveModeData->lpDD; - - /* use our cache version instead */ - puSetExclusiveModeData->lpDD = &pDirectDraw->Global; - - /* make the call */ - ddRVal = pDirectDraw->DdSetExclusiveMode(puSetExclusiveModeData); - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - /* But back the orignal PDev */ - puSetExclusiveModeData->lpDD = lgpl; - - return ddRVal; +/************************************************************************/ +/* NtGdiDdReenableDirectDrawObject */ +/************************************************************************/ + + +BOOL +STDCALL +NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, + BOOL *pubNewMode) +{ + PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReenableDirectDrawObject, pfnDdReenableDirectDrawObject); + + if (pfnDdReenableDirectDrawObject == NULL) + { + DPRINT1("Warring no pfnDdReenableDirectDrawObject"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdReenableDirectDrawObject"); + return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); +} + + +/************************************************************************/ +/* NtGdiDdGetDriverInfo */ +/************************************************************************/ + +DWORD +STDCALL +NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, + PDD_GETDRIVERINFODATA puGetDriverInfoData) + +{ + PGD_DXDDGETDRIVERINFO pfnDdGetDriverInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverInfo, pfnDdGetDriverInfo); + + if (pfnDdGetDriverInfo == NULL) + { + DPRINT1("Warring no pfnDdGetDriverInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo"); + return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); + + +} + + +/************************************************************************/ +/* NtGdiDdGetAvailDriverMemory */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal, + PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData) +{ + PGD_DXDDGETAVAILDRIVERMEMORY pfnDdGetAvailDriverMemory = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetAvailDriverMemory, pfnDdGetAvailDriverMemory); + + if (pfnDdGetAvailDriverMemory == NULL) + { + DPRINT1("Warring no pfnDdGetAvailDriverMemory"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetAvailDriverMemory"); + return pfnDdGetAvailDriverMemory(hDirectDrawLocal, puGetAvailDriverMemoryData); +} + + +/************************************************************************/ +/* NtGdiDdSetExclusiveMode */ +/************************************************************************/ + +DWORD +STDCALL +NtGdiDdSetExclusiveMode(HANDLE hDirectDraw, + PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData) +{ + PGD_DXDDSETEXCLUSIVEMODE pfnDdSetExclusiveMode = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetExclusiveMode, pfnDdSetExclusiveMode); + + if (pfnDdSetExclusiveMode == NULL) + { + DPRINT1("Warring no pfnDdSetExclusiveMode"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); + return pfnDdSetExclusiveMode(hDirectDrawLocal, puGetAvailDriverMemoryData); + } Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Sun Oct 14 23:45:13 2007 @@ -16,6 +16,7 @@ extern PDRVFN gpDxFuncs; +typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); /* Does not exists in win32k or dxg.sys PDD_SURFCB_SETCLIPLIST SetClipList; */ @@ -361,3 +362,27 @@ return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); } +/************************************************************************/ +/* NtGdiDdUnattachSurface */ +/************************************************************************/ +VOID +STDCALL +NtGdiDdUnattachSurface(HANDLE hSurface, + HANDLE hSurfaceAttached) +{ + PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnattachSurface, pfnDdUnattachSurface); + + if (pfnDdUnattachSurface == NULL) + { + DPRINT1("Warring no pfnDdUnattachSurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdUnattachSurface"); + return pfnDdUnattachSurface(hSurface,hSurfaceAttached); +} + + Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Sun Oct 14 23:45:13 2007 @@ -13,16 +13,7 @@ #define NDEBUG #include <debug.h> -DWORD STDCALL NtGdiDdCreateSurfaceEx( - HANDLE hDirectDraw, - HANDLE hSurface, - DWORD dwSurfaceHandle -) -{ - UNIMPLEMENTED - return 0; -} DWORD STDCALL NtGdiDdFlipToGDISurface( HANDLE hDirectDraw, @@ -86,13 +77,7 @@ return 0; } -VOID STDCALL NtGdiDdUnattachSurface( - HANDLE hSurface, - HANDLE hSurfaceAttached -) -{ - UNIMPLEMENTED -} +

1 0

[greatlrd] 29571: start move out logic stuff that should have been move to ddsurf and d3d from ddraw.c remove the old start up code for dx, it will be in in dxg.sys later. win32k only redirect it to dxg.sys
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 23:02:45 2007 New Revision: 29571 URL: http://svn.reactos.org/svn/reactos?rev=29571&view=rev Log: start move out logic stuff that should have been move to ddsurf and d3d from ddraw.c remove the old start up code for dx, it will be in in dxg.sys later. win32k only redirect it to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 14 23:02:45 2007 @@ -25,7 +25,7 @@ extern PDRVFN gpDxFuncs; - +typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); typedef DWORD (NTAPI *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); @@ -50,7 +50,29 @@ - +/************************************************************************/ +/* NtGdiDdCanCreateD3DBuffer */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +) +{ + PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCanCreateD3DBuffer, pfnDdCanCreateD3DBuffer); + + if (pfnDdCanCreateD3DBuffer == NULL) + { + DPRINT1("Warring no pfnDdCanCreateD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdCanCreateD3DBuffer"); + return pfnDdCanCreateD3DBuffer(hDirectDraw,puCanCreateSurfaceData); +} /************************************************************************/ /* NtGdiD3dContextCreate */ @@ -154,6 +176,28 @@ } /************************************************************************/ +/* NtGdiDdDestroyD3DBuffer */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdDestroyD3DBuffer(HANDLE hSurface) +{ + PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyD3DBuffer, pfnDdDestroyD3DBuffer); + + if (pfnDdDestroyD3DBuffer == NULL) + { + DPRINT1("Warring no pfnDdDestroyD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); + return pfnDdDestroyD3DBuffer(hSurface); +} + +/************************************************************************/ /* NtGdiD3dDrawPrimitives2 */ /************************************************************************/ DWORD @@ -227,6 +271,9 @@ return pfnD3dValidateTextureStageState(pData); } +/************************************************************************/ +/* NtGdiDdUnlockD3D */ +/************************************************************************/ DWORD STDCALL NtGdiDdUnlockD3D(HANDLE hSurface, Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Oct 14 23:02:45 2007 @@ -3,10 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation * FILE: subsys/win32k/ntddraw/ddraw.c - * PROGRAMER: Peter Bajusz (hyp-x(a)stormregion.com) * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) * REVISION HISTORY: - * 25-10-2003 PB Created from 2003 to year 2007 * rewrote almost all code Peter did. * only few line are left from him @@ -21,7 +19,7 @@ /* swtich this off to get rid of all dx debug msg */ #define DX_DEBUG -#define DdHandleTable GdiHandleTable + typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); @@ -30,37 +28,15 @@ typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); -typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); typedef DWORD (NTAPI *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData); typedef HANDLE (NTAPI *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL); typedef BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE); typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); - typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); - -/* -typedef DWORD (NTAPI *PGD_DXDDGETBLTSTATUS)( -typedef DWORD (NTAPI *PGD_DXDDGETDC)( -typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)( -typedef DWORD (NTAPI *PGD_DXDDGETDXHANDLE)( -typedef DWORD (NTAPI *PGD_DXDDGETFLIPSTATUS)( -typedef DWORD (NTAPI *PGD_DXDDGETSCANLINE)( -typedef DWORD (NTAPI *PGD_DXDDLOCK)( -typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)( -typedef DWORD (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)( -typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)( -typedef DWORD (NTAPI *PGD_DXDDRELEASEDC)( -typedef DWORD (NTAPI *PGD_DXDDRESETVISRGN)( -typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)( -typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)( -typedef DWORD (NTAPI *PGD_DXDDSETGAMMARAMP)( -typedef DWORD (NTAPI *PGD_DXDDCREATESURFACEEX)( -typedef DWORD (NTAPI *PGD_DXDDSETOVERLAYPOSITION)( -typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)( -*/ - +typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*, LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA, + PDD_D3DBUFCALLBACKS, LPDDSURFACEDESC, DWORD *, VIDEOMEMORY *, DWORD *, DWORD *); PGD_DXDDSTARTUPDXGRAPHICS gpfnStartupDxGraphics = NULL; @@ -88,7 +64,7 @@ /************************************************************************/ -/* DirectX graphic/video driver loading */ +/* DirectX graphic/video driver loading and cleanup start here */ /************************************************************************/ NTSTATUS STDCALL @@ -160,6 +136,38 @@ return Status; } +BOOL +INTERNAL_CALL +DD_Cleanup(PVOID ObjectBody) +{ + PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; + + DPRINT1("DD_Cleanup\n"); + + /* Do not known what the new cleanup code should do at moment */ + return TRUE; +} + +BOOL +INTERNAL_CALL +DDSURF_Cleanup(PVOID pDDSurf) +{ + DPRINT1("DDSURF_Cleanup\n"); + /* Do not known what the new cleanup code should do at moment */ + return TRUE; +} + + + +/************************************************************************/ +/* DirectX graphic/video driver loading cleanup ends here */ +/************************************************************************/ + + + +/************************************************************************/ +/* NtGdiDdCreateDirectDrawObject */ +/************************************************************************/ HANDLE STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) @@ -195,7 +203,9 @@ - +/************************************************************************/ +/* NtGdiDdGetDriverState */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata) @@ -215,76 +225,9 @@ return pfnDdGetDriverState(pdata); } - - - -DWORD -STDCALL -NtGdiDdAlphaBlt(HANDLE hSurfaceDest, - HANDLE hSurfaceSrc, - PDD_BLTDATA puBltData) -{ - PGD_DDALPHABLT pfnDdAlphaBlt = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAlphaBlt, pfnDdAlphaBlt); - - if (pfnDdAlphaBlt == NULL) - { - DPRINT1("Warring no pfnDdAlphaBlt"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdAlphaBlt"); - return pfnDdAlphaBlt(hSurfaceDest,hSurfaceSrc,puBltData); -} - - -BOOL -STDCALL -NtGdiDdAttachSurface(HANDLE hSurfaceFrom, - HANDLE hSurfaceTo -) -{ - PGD_DDATTACHSURFACE pfnDdAttachSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAttachSurface, pfnDdAttachSurface); - - if (pfnDdAttachSurface == NULL) - { - DPRINT1("Warring no pfnDdAttachSurface"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdAttachSurface"); - return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); -} - - - -DWORD -STDCALL -NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, - PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -) -{ - PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCanCreateD3DBuffer, pfnDdCanCreateD3DBuffer); - - if (pfnDdCanCreateD3DBuffer == NULL) - { - DPRINT1("Warring no pfnDdCanCreateD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCanCreateD3DBuffer"); - return pfnDdCanCreateD3DBuffer(hDirectDraw,puCanCreateSurfaceData); -} - - +/************************************************************************/ +/* NtGdiDdColorControl */ +/************************************************************************/ DWORD STDCALL NtGdiDdColorControl(HANDLE hSurface, @@ -305,6 +248,9 @@ return pfnDdColorControl(hSurface,puColorControlData); } +/************************************************************************/ +/* NtGdiDdCreateSurfaceObject */ +/************************************************************************/ HANDLE STDCALL NtGdiDdCreateSurfaceObject(HANDLE hDirectDrawLocal, @@ -326,13 +272,16 @@ return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCreateSurfaceObject"); + DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceObject"); return pfnDdCreateSurfaceObject(hDirectDrawLocal, hSurface, puSurfaceLocal, puSurfaceMore, puSurfaceGlobal, bComplete); } +/************************************************************************/ +/* NtGdiDdDeleteDirectDrawObject */ +/************************************************************************/ BOOL STDCALL -NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal) +NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) { PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject = NULL; INT i; @@ -345,10 +294,13 @@ return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdDeleteDirectDrawObject"); + DPRINT1("Calling on dxg.sys pfnDdDeleteDirectDrawObject"); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } +/************************************************************************/ +/* NtGdiDdDeleteSurfaceObject */ +/************************************************************************/ BOOL STDCALL NtGdiDdDeleteSurfaceObject(HANDLE hSurface) @@ -368,444 +320,45 @@ return pfnDdDeleteSurfaceObject(hSurface); } - - - - - -DWORD -STDCALL -NtGdiDdDestroyD3DBuffer(HANDLE hSurface) -{ - PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = NULL; +/************************************************************************/ +/* NtGdiDdDeleteSurfaceObject */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal, + DD_HALINFO *pHalInfo, + DWORD *pCallBackFlags, + LPD3DNTHAL_CALLBACKS puD3dCallbacks, + LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, + LPDDSURFACEDESC puD3dTextureFormats, + DWORD *puNumHeaps, + VIDEOMEMORY *puvmList, + DWORD *puNumFourCC, + DWORD *puFourCC) +{ + PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = NULL; INT i; - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyD3DBuffer, pfnDdDestroyD3DBuffer); - - if (pfnDdDestroyD3DBuffer == NULL) - { - DPRINT1("Warring no pfnDdDestroyD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); - return pfnDdDestroyD3DBuffer(hSurface); -} - -/************************************************************************/ -/* DIRECT DRAW OBJECT */ -/************************************************************************/ - -BOOL INTERNAL_CALL -DD_Cleanup(PVOID ObjectBody) -{ - PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; - - DPRINT1("DD_Cleanup\n"); - - if (!pDirectDraw) - { - return FALSE; - } - - if (pDirectDraw->Global.dhpdev == NULL) - { - return FALSE; - } - - if (pDirectDraw->DrvDisableDirectDraw == NULL) - { - return FALSE; - } - - pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); - return TRUE; -} - -/* code for enable and reanble the drv */ + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdQueryDirectDrawObject, pfnDdQueryDirectDrawObject); + + if (pfnDdQueryDirectDrawObject == NULL) + { + DPRINT1("Warring no pfnDdQueryDirectDrawObject"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdQueryDirectDrawObject"); + return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, + puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); +} + + + + + BOOL -intEnableDriver(PDD_DIRECTDRAW pDirectDraw) -{ - BOOL success; - DD_HALINFO HalInfo; - - /*clean up some of the cache entry */ - RtlZeroMemory(&pDirectDraw->DD, sizeof(DD_CALLBACKS)); - RtlZeroMemory(&pDirectDraw->Surf, sizeof(DD_SURFACECALLBACKS)); - RtlZeroMemory(&pDirectDraw->Pal, sizeof(DD_PALETTECALLBACKS)); - RtlZeroMemory(&pDirectDraw->Hal, sizeof(DD_HALINFO)); - RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); - pDirectDraw->dwNumHeaps =0; - pDirectDraw->dwNumFourCC = 0; - pDirectDraw->pdwFourCC = NULL; - pDirectDraw->pvmList = NULL; - - /* Get DirectDraw infomations form the driver - * DDK say pvmList, pdwFourCC is always NULL in frist call here - * but we get back how many pvmList it whant we should alloc, same - * with pdwFourCC. - */ - if (pDirectDraw->DrvGetDirectDrawInfo) - { - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - &pDirectDraw->dwNumHeaps, - NULL, - &pDirectDraw->dwNumFourCC, - NULL); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - - /* The driver are not respnose to alloc the memory for pvmList - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - if (pDirectDraw->dwNumHeaps != 0) - { - DPRINT1("Setup pvmList\n"); - pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); - if (pDirectDraw->pvmList == NULL) - { - DPRINT1("pvmList memmery alloc fail\n"); - return FALSE; - } - } - - /* The driver are not respnose to alloc the memory for pdwFourCC - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - - if (pDirectDraw->dwNumFourCC != 0) - { - DPRINT1("Setup pdwFourCC\n"); - pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); - - if (pDirectDraw->pdwFourCC == NULL) - { - DPRINT1("pdwFourCC memmery alloc fail\n"); - return FALSE; - } - } - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - &pDirectDraw->dwNumHeaps, - pDirectDraw->pvmList, - &pDirectDraw->dwNumFourCC, - pDirectDraw->pdwFourCC); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo second call fail\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - - /* We need now convert the DD_HALINFO we got, it can be NT4 driver we - * loading ReactOS supporting NT4 and higher to be loading.so we make - * the HALInfo compatible here so we can easy pass it to gdi32.dll - * without converting it later - */ - - if ((HalInfo.dwSize != sizeof(DD_HALINFO)) && - (HalInfo.dwSize != sizeof(DD_HALINFO_V4))) - { - DPRINT1(" Fail not vaild driver DD_HALINFO struct found\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 - { - /* Unknown version found */ - DPRINT1(" Fail : did not get DD_HALINFO size \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - /* Copy it to user mode pointer the data */ - RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); - } - - DPRINT1("Trying EnableDirectDraw the driver\n"); - - success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, - &pDirectDraw->DD, - &pDirectDraw->Surf, - &pDirectDraw->Pal); - - if (!success) - { - DPRINT1("EnableDirectDraw call fail\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - return TRUE; -} - - - - -/* NtGdiDdCreateDirectDrawObject is finish and works as it should - * it maybe have some memory leack or handler leack in this code - * if you found any case you maybe think it leacks the handler - * or memory please tell me, before you start fixing the code - * Magnus Olsen - */ - -BOOL STDCALL -NtGdiDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -) -{ - PDD_DIRECTDRAW pDirectDraw; - NTSTATUS Status = FALSE; - BOOL Ret=FALSE; - LPD3DNTHAL_GLOBALDRIVERDATA pD3dDriverData; - - if (hDirectDrawLocal == NULL) - { - return FALSE; - } - - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, - GDI_OBJECT_TYPE_DIRECTDRAW); - if (!pDirectDraw) - { - return FALSE; - } - - /* - * Get pHalInfo - */ - if (pHalInfo != NULL) - { - _SEH_TRY - { - ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); - RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - else - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* - * Get pCallBackFlags - */ - if (pCallBackFlags != NULL) - { - _SEH_TRY - { - ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); - pCallBackFlags[0]=pDirectDraw->DD.dwFlags; - pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; - pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - else - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* - * Get puD3dCallbacks - */ - if ((puD3dCallbacks) && - (pDirectDraw->Hal.lpD3DHALCallbacks)) - { - _SEH_TRY - { - ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); - RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, sizeof( D3DNTHAL_CALLBACKS ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - else - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* - * Get lpD3DGlobalDriverData - */ - if ((puD3dDriverData) && - (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL)) - { - /* Get D3dDriverData */ - _SEH_TRY - { - ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); - RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* Get TextureFormats */ - pD3dDriverData =pDirectDraw->Hal.lpD3DGlobalDriverData; - if ((puD3dTextureFormats) && - (pD3dDriverData->dwNumTextureFormats>0) && - (pD3dDriverData->lpTextureFormats)) - { - DWORD Size = sizeof(DDSURFACEDESC) * pD3dDriverData->dwNumTextureFormats; - _SEH_TRY - { - ProbeForWrite(puD3dTextureFormats, Size, 1); - RtlCopyMemory( puD3dTextureFormats, pD3dDriverData->lpTextureFormats, Size); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - } - else - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /*Get D3dBufferCallbacks */ - if ( (puD3dBufferCallbacks) && - (pDirectDraw->Hal.lpD3DBufCallbacks)) - { - _SEH_TRY - { - ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); - RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - else - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* Get puNumFourCC and dwNumFourCC */ - _SEH_TRY - { - ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); - *puNumFourCC = pDirectDraw->dwNumFourCC; - - if ((pDirectDraw->pdwFourCC) && - (puFourCC)) - { - ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); - RtlCopyMemory( puFourCC, pDirectDraw->pdwFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - } - else - { - Ret = TRUE; - } - return Ret; -} - - - - - -BOOL STDCALL NtGdiDdReenableDirectDrawObject( +STDCALL NtGdiDdReenableDirectDrawObject( HANDLE hDirectDrawLocal, BOOL *pubNewMode ) @@ -901,36 +454,6 @@ - - -/************************************************************************/ -/* SURFACE OBJECT */ -/************************************************************************/ - -BOOL INTERNAL_CALL -DDSURF_Cleanup(PVOID pDDSurf) -{ - /* FIXME: implement - * PDD_SURFACE pDDSurf = PVOID pDDSurf - */ -#ifdef DX_DEBUG - DPRINT1("DDSURF_Cleanup\n"); -#endif - return TRUE; -} - - - - - - -/************************************************************************/ -/* DIRECT DRAW SURFACR END */ -/************************************************************************/ - - - - DWORD STDCALL NtGdiDdGetAvailDriverMemory( HANDLE hDirectDrawLocal, PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Sun Oct 14 23:02:45 2007 @@ -307,5 +307,57 @@ return pfnDdSetOverlayPosition(hSurfaceSource,hSurfaceDestination,puSetOverlayPositionData); } - - +/************************************************************************/ +/* This is not part of the ddsurface interface but it have */ +/* deal with the surface */ +/************************************************************************/ + + +/************************************************************************/ +/* NtGdiDdAlphaBlt */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdAlphaBlt(HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData) +{ + PGD_DDALPHABLT pfnDdAlphaBlt = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAlphaBlt, pfnDdAlphaBlt); + + if (pfnDdAlphaBlt == NULL) + { + DPRINT1("Warring no pfnDdAlphaBlt"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdAlphaBlt"); + return pfnDdAlphaBlt(hSurfaceDest,hSurfaceSrc,puBltData); +} + +/************************************************************************/ +/* NtGdiDdAttachSurface */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdAttachSurface(HANDLE hSurfaceFrom, + HANDLE hSurfaceTo +) +{ + PGD_DDATTACHSURFACE pfnDdAttachSurface = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAttachSurface, pfnDdAttachSurface); + + if (pfnDdAttachSurface == NULL) + { + DPRINT1("Warring no pfnDdAttachSurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdAttachSurface"); + return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); +} +

1 0

[cfinck] 29570: - Use #define's for setting the borders between elements. - Don't use some values, which are based on hardcoded card metrics. Compute them using the #define's for the borders and the card metrics instead. This way we can use the Bavarian cards.dll (cardsbav) now and theoretically cards in any size :-) - Set the minimum window height and width by computing the size of all used elements using the new #define's and the card metrics. - Some indentation changes
by cfinck＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: cfinck Date: Sun Oct 14 22:21:27 2007 New Revision: 29570 URL: http://svn.reactos.org/svn/reactos?rev=29570&view=rev Log: - Use #define's for setting the borders between elements. - Don't use some values, which are based on hardcoded card metrics. Compute them using the #define's for the borders and the card metrics instead. This way we can use the Bavarian cards.dll (cardsbav) now and theoretically cards in any size :-) - Set the minimum window height and width by computing the size of all used elements using the new #define's and the card metrics. - Some indentation changes Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp Sun Oct 14 22:21:27 2007 @@ -5,10 +5,6 @@ #include "cardlib/cardlib.h" #include "solitaire.h" - -const int yBorder = 20; -const int xBorder = 20; -const int yRowStacks = yBorder + 128; CardRegion *pDeck; CardRegion *pPile; @@ -18,7 +14,7 @@ extern CardStack activepile; HBITMAP hbmBitmap; -HDC hdcBitmap; +HDC hdcBitmap; void CreateSol() { @@ -30,7 +26,7 @@ activepile.Clear(); - pDeck = SolWnd.CreateRegion(DECK_ID, true, xBorder, yBorder, 2, 1); + pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1); pDeck->SetEmptyImage(CS_EI_SUNK); pDeck->SetThreedCount(6); pDeck->SetDragRule(CS_DRAG_NONE, 0); @@ -39,7 +35,7 @@ pDeck->SetDblClickProc(DeckClickProc); pDeck->SetFaceDirection(CS_FACE_DOWN, 0); - pPile = SolWnd.CreateRegion(PILE_ID, true, 110, yBorder, CS_DEFXOFF, 1); + pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER, Y_BORDER, CS_DEFXOFF, 1); pPile->SetEmptyImage(CS_EI_NONE); pPile->SetDragRule(CS_DRAG_TOP, 0); pPile->SetDropRule(CS_DROP_NONE, 0); @@ -51,10 +47,9 @@ // for(i = 0; i < 4; i++) { - pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, yBorder, 0, 0); + pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDER, 0, 0); pSuitStack[i]->SetEmptyImage(CS_EI_SUNK); - //pSuitStack[i]->SetPlacement(CS_XJUST_RIGHT, 0, -i * (__cardwidth + 4) - xBorder, 0); - pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth + 10) , 0); + pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth + X_SUITSTACK_BORDER) , 0); pSuitStack[i]->SetDropRule(CS_DROP_CALLBACK, SuitStackDropProc); pSuitStack[i]->SetDragRule(CS_DRAG_TOP); @@ -67,12 +62,12 @@ // for(i = 0; i < NUM_ROW_STACKS; i++) { - pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, yRowStacks, 0, 14); + pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, Y_ROWSTACK_CARDOFFSET); pRowStack[i]->SetEmptyImage(CS_EI_SUNK); pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i); pRowStack[i]->SetPlacement(CS_XJUST_CENTER, 0, - (i - NUM_ROW_STACKS/2) * (__cardwidth + 10), 0); + (i - NUM_ROW_STACKS/2) * (__cardwidth + X_ROWSTACK_BORDER), 0); pRowStack[i]->SetEmptyImage(CS_EI_NONE); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Oct 14 22:21:27 2007 @@ -169,8 +169,8 @@ ,//|WS_CLIPCHILDREN, // window style CW_USEDEFAULT, // initial x position CW_USEDEFAULT, // initial y position - 600, // initial x size - 450, // initial y size + 0, // The real size will be computed in WndProc through WM_GETMINMAXINFO + 0, // The real size will be computed in WndProc through WM_GETMINMAXINFO NULL, // parent window handle NULL, // use window class menu hInst, // program instance handle @@ -255,11 +255,17 @@ if (dwOptions & OPTION_SHOW_STATUS) { + RECT rc; + ShowWindow(hwndStatus, SW_SHOW); GetWindowRect(hwndStatus, &rcStatus); nStatusHeight = rcStatus.bottom - rcStatus.top; MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE); MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); + + // Force the window to process WM_GETMINMAXINFO again + GetWindowRect(hwndMain, &rc); + SetWindowPos(hwndMain, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER); } else { @@ -443,110 +449,127 @@ //----------------------------------------------------------------------------- LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - static int nWidth, nHeight; - int parts[] = { 100, -1 }; - int ret; - RECT rc; - int nStatusHeight = 0; - - MINMAXINFO *mmi; + static int nWidth, nHeight, nStatusHeight; switch(iMsg) { - case WM_CREATE: - hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0); - - //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); - - SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); - SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); - - SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); - - CreateSol(); - - NewGame(); - - dwAppStartTime = GetTickCount(); - - return 0; - - case WM_DESTROY: - PostQuitMessage(0); - return 0; - - case WM_SIZE: - nWidth = LOWORD(lParam); - nHeight = HIWORD(lParam); - - if (dwOptions & OPTION_SHOW_STATUS) - { - GetWindowRect(hwndStatus, &rc); - nStatusHeight = rc.bottom - rc.top; - MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE); - MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); - } - else - { - MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE); - } - //parts[0] = nWidth - 256; - //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); - return 0; - - case WM_GETMINMAXINFO: - mmi = (MINMAXINFO *)lParam; - mmi->ptMinTrackSize.x = 600; - mmi->ptMinTrackSize.y = 400; - return 0; - - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDM_GAME_NEW: - //simulate a button click on the new button.. + case WM_CREATE: + { + int parts[] = { 100, -1 }; + RECT rcStatus; + + hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0); + + //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); + + SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); + SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); + + // The status bar height is fixed and needed later in WM_SIZE and WM_GETMINMAXINFO + // Force the window to process WM_GETMINMAXINFO again + GetWindowRect(hwndStatus, &rcStatus); + nStatusHeight = rcStatus.bottom - rcStatus.top; + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); + + SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); + + CreateSol(); + NewGame(); + + dwAppStartTime = GetTickCount(); + return 0; - - case IDM_GAME_DECK: - ShowDeckOptionsDlg(hwnd); + } + + case WM_DESTROY: + PostQuitMessage(0); return 0; - case IDM_GAME_OPTIONS: - ShowGameOptionsDlg(hwnd); + case WM_SIZE: + nWidth = LOWORD(lParam); + nHeight = HIWORD(lParam); + + if (dwOptions & OPTION_SHOW_STATUS) + { + MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); + MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); + } + else + { + MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE); + } + //parts[0] = nWidth - 256; + //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); return 0; - case IDM_HELP_CONTENTS: - WinHelp(hwnd, szHelpPath, HELP_CONTENTS, 0);//HELP_KEY, (DWORD)"How to play"); + case WM_GETMINMAXINFO: + { + MINMAXINFO *mmi; + + mmi = (MINMAXINFO *)lParam; + mmi->ptMinTrackSize.x = X_BORDER + NUM_ROW_STACKS * (__cardwidth + X_ROWSTACK_BORDER) + X_BORDER; + mmi->ptMinTrackSize.y = GetSystemMetrics(SM_CYCAPTION) + + GetSystemMetrics(SM_CYMENU) + + Y_BORDER + + __cardheight + + Y_ROWSTACK_BORDER + + 6 * Y_ROWSTACK_CARDOFFSET + + __cardheight + + Y_BORDER + + (dwOptions & OPTION_SHOW_STATUS ? nStatusHeight : 0); return 0; - - case IDM_HELP_ABOUT: - MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); + } + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDM_GAME_NEW: + //simulate a button click on the new button.. + NewGame(); + return 0; + + case IDM_GAME_DECK: + ShowDeckOptionsDlg(hwnd); + return 0; + + case IDM_GAME_OPTIONS: + ShowGameOptionsDlg(hwnd); + return 0; + + case IDM_HELP_CONTENTS: + WinHelp(hwnd, szHelpPath, HELP_CONTENTS, 0);//HELP_KEY, (DWORD)"How to play"); + return 0; + + case IDM_HELP_ABOUT: + MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION); + return 0; + + case IDM_GAME_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + return 0; + } + return 0; - case IDM_GAME_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); + case WM_CLOSE: + if (fGameStarted == false) + { + DestroyWindow(hwnd); + return 0; + } + else + { + int ret; + + ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); + if (ret == IDOK) + { + WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); + DestroyWindow(hwnd); + } + } return 0; - } - - return 0; - - case WM_CLOSE: - if (fGameStarted == false) - { - DestroyWindow(hwnd); - return 0; - } - else - { - ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); - if (ret == IDOK) - { - WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); - DestroyWindow(hwnd); - } - } - return 0; } return DefWindowProc (hwnd, iMsg, wParam, lParam); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sun Oct 14 22:21:27 2007 @@ -17,11 +17,20 @@ void CreateSol(); void NewGame(void); -#define NUM_ROW_STACKS 7 -#define DECK_ID 1 -#define PILE_ID 2 -#define SUIT_ID 4 -#define ROW_ID 10 +#define NUM_ROW_STACKS 7 +#define DECK_ID 1 +#define PILE_ID 2 +#define SUIT_ID 4 +#define ROW_ID 10 + +// Various metrics used for placing the objects and computing the minimum window size +#define X_BORDER 20 +#define X_PILE_BORDER 18 +#define X_ROWSTACK_BORDER 10 +#define X_SUITSTACK_BORDER 10 +#define Y_BORDER 20 +#define Y_ROWSTACK_BORDER 32 +#define Y_ROWSTACK_CARDOFFSET 14 extern CardRegion *pDeck; extern CardRegion *pPile;

1 0

[greatlrd] 29569: finish the redirect of dxg.sys for the d3d part
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 22:14:04 2007 New Revision: 29569 URL: http://svn.reactos.org/svn/reactos?rev=29569&view=rev Log: finish the redirect of dxg.sys for the d3d part Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 14 22:14:04 2007 @@ -8,6 +8,10 @@ * 19/1-2006 Magnus Olsen */ +/* Comment + * NtGdiDdLock and NtGdiDdLockD3D at end calls to same api in the dxg.sys + * NtGdiDdUnlock and NtGdiDdUnlockD3D at end calls to same api in the dxg.sys + */ #include <w32k.h> #include <reactos/drivers/directx/dxg.h> @@ -22,7 +26,8 @@ extern PDRVFN gpDxFuncs; - +typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); +typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); typedef DWORD (NTAPI *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); typedef DWORD (NTAPI *PGD_D3DDRAWPRIMITIVES2)(HANDLE, HANDLE, LPD3DNTHAL_DRAWPRIMITIVES2DATA, FLATPTR *, DWORD *, FLATPTR *, DWORD *); typedef DWORD (NTAPI *PGD_DDCREATED3DBUFFER)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); @@ -43,6 +48,13 @@ } \ } + + + + +/************************************************************************/ +/* NtGdiD3dContextCreate */ +/************************************************************************/ BOOL STDCALL NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, @@ -65,6 +77,9 @@ return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } +/************************************************************************/ +/* NtGdiD3dContextDestroy */ +/************************************************************************/ DWORD STDCALL NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) @@ -84,6 +99,9 @@ return pfnD3dContextDestroy(pContextDestroyData); } +/************************************************************************/ +/* NtGdiD3dContextDestroyAll */ +/************************************************************************/ DWORD STDCALL NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) @@ -102,53 +120,10 @@ DPRINT1("Calling on dxg.sys D3dContextDestroyAll"); return pfnD3dContextDestroyAll(pdcad); } - -DWORD -STDCALL -NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) -{ - PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState); - - if (pfnD3dValidateTextureStageState == NULL) - { - DPRINT1("Warring no pfnD3dValidateTextureStageState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); - return pfnD3dValidateTextureStageState(pData); -} - -DWORD -STDCALL -NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, - HANDLE hVBuf, - LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, - FLATPTR *pfpVidMemCmd, - DWORD *pdwSizeCmd, - FLATPTR *pfpVidMemVtx, - DWORD *pdwSizeVtx) -{ - PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2); - - if (pfnD3dDrawPrimitives2 == NULL) - { - DPRINT1("Warring no pfnD3dDrawPrimitives2"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); - return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); -} - - - + +/************************************************************************/ +/* NtGdiDdCreateD3DBuffer */ +/************************************************************************/ DWORD STDCALL NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, @@ -178,3 +153,101 @@ puCreateSurfaceData, puhSurface); } +/************************************************************************/ +/* NtGdiD3dDrawPrimitives2 */ +/************************************************************************/ +DWORD +STDCALL +NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, + HANDLE hVBuf, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx) +{ + PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2); + + if (pfnD3dDrawPrimitives2 == NULL) + { + DPRINT1("Warring no pfnD3dDrawPrimitives2"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); + return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); +} + + +/************************************************************************/ +/* NtGdiD3dValidateTextureStageState */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdLockD3D(HANDLE hSurface, + PDD_LOCKDATA puLockData) +{ + PGD_DXDDLOCKD3D pfnDdLockD3D = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnDdLockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdLockD3D"); + return pfnDdLockD3D(hSurface, puLockData); +} + +/************************************************************************/ +/* NtGdiD3dValidateTextureStageState */ +/************************************************************************/ +DWORD +STDCALL +NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) +{ + PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnD3dValidateTextureStageState"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); + return pfnD3dValidateTextureStageState(pData); +} + +DWORD +STDCALL +NtGdiDdUnlockD3D(HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData) +{ + PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnDdUnlockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdUnlockD3D"); + return pfnDdUnlockD3D(hSurface, puUnlockData); + +} + + + + Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Sun Oct 14 22:14:04 2007 @@ -55,15 +55,7 @@ return 0; } -DWORD STDCALL NtGdiDdLockD3D( - HANDLE hSurface, - PDD_LOCKDATA puLockData -) -{ - UNIMPLEMENTED - return 0; -} BOOL STDCALL NtGdiDdReleaseDC( HANDLE hSurface @@ -102,15 +94,7 @@ UNIMPLEMENTED } -DWORD STDCALL NtGdiDdUnlockD3D( - HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData -) -{ - UNIMPLEMENTED - return 0; -} /* EOF */

1 0

[greatlrd] 29568: adding more redirect for dvp interface to dxg
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 21:49:55 2007 New Revision: 29568 URL: http://svn.reactos.org/svn/reactos?rev=29568&view=rev Log: adding more redirect for dvp interface to dxg Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 21:49:55 2007 @@ -22,6 +22,12 @@ extern PDRVFN gpDxFuncs; + +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(hDirectDraw, puGetVPortFlipStatusData); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(hVideoPort, puWaitForVPortSyncData); @@ -110,7 +116,19 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) { - + PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortFlipStatus, pfnDvpGetVideoPortFlipStatus); + + if (pfnDvpGetVideoPortFlipStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortFlipStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortFlipStatus"); + return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } @@ -122,7 +140,19 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) { - + PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortInputFormats, pfnDvpGetVideoPortInputFormats); + + if (pfnDvpGetVideoPortInputFormats == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortInputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortInputFormats"); + return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } @@ -134,7 +164,19 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, PDD_GETVPORTLINEDATA puGetVPortLineData) { - + PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortLine, pfnDvpGetVideoPortLine); + + if (pfnDvpGetVideoPortLine == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortLine"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); + return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortLineData); } @@ -146,7 +188,20 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) { - + PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats, puGetVPortOutputFormatData); + + if (pfnDvpGetVideoSignalStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortOutputFormats"); + return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); + } @@ -158,7 +213,19 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, PDD_GETVPORTCONNECTDATA puGetVPortConnectData) { - + PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortConnectInfo, pfnDvpGetVideoPortConnectInfo); + + if (pfnDvpGetVideoPortConnectInfo == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortConnectInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); + return pfnDvpGetVideoPortConnectInfo(hVideoPort, puGetVPortConnectData); }

1 0

[greatlrd] 29567: move all dvp stub to dvp.c start redirect all to dxg.sys
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 20:19:56 2007 New Revision: 29567 URL: http://svn.reactos.org/svn/reactos?rev=29567&view=rev Log: move all dvp stub to dvp.c start redirect all to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 20:19:56 2007 @@ -17,11 +17,298 @@ #include <debug.h> /********************************************************************************/ -/* DVD interface from DXG.SYS */ +/* DVP interface from DXG.SYS */ /********************************************************************************/ extern PDRVFN gpDxFuncs; - - - +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); +typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); +typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(hVideoPort, puWaitForVPortSyncData); +typedef DWORD (NTAPI *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY); +typedef DWORD (NTAPI *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA); + + + +/************************************************************************/ +/* NtGdiDvpCanCreateVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpCanCreateVideoPort(hDirectDraw, + PDD_CANCREATEVPORTDATA puCanCreateVPortData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpColorControl */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpColorControl(HANDLE hVideoPort, + PDD_VPORTCOLORDATA puVPortColorData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpCreateVideoPort */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, + PDD_CREATEVPORTDATA puCreateVPortData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpDestroyVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, + PDD_DESTROYVPORTDATA puDestroyVPortData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpFlipVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpFlipVideoPort(HANDLE hVideoPort, + HANDLE hDDSurfaceCurrent, + HANDLE hDDSurfaceTarget, + PDD_FLIPVPORTDATA puFlipVPortData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortBandwidth */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, + PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortFlipStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, + PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortInputFormats */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, + PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortLine */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, + PDD_GETVPORTLINEDATA puGetVPortLineData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortOutputFormats */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, + PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortConnectInfo */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, + PDD_GETVPORTCONNECTDATA puGetVPortConnectData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoSignalStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, + PDD_GETVPORTSIGNALDATA puGetVPortSignalData) +{ + PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoSignalStatus, pfnDvpGetVideoSignalStatus); + + if (pfnDvpGetVideoSignalStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoSignalStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoSignalStatus"); + return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); + +} + + +/************************************************************************/ +/* NtGdiDvpUpdateVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpUpdateVideoPort(HANDLE hVideoPort, + HANDLE* phSurfaceVideo, + HANDLE* phSurfaceVbi, + PDD_UPDATEVPORTDATA puUpdateVPortData) +{ + PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpUpdateVideoPort, pfnDvpUpdateVideoPort); + + if (pfnDvpUpdateVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpUpdateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpUpdateVideoPort"); + return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); + +} + + +/************************************************************************/ +/* NtGdiDvpWaitForVideoPortSync */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, + PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) +{ + PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpWaitForVideoPortSync, pfnDvpWaitForVideoPortSync); + + if (pfnDvpWaitForVideoPortSync == NULL) + { + DPRINT1("Warring no pfnDvpWaitForVideoPortSync"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpWaitForVideoPortSync"); + return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); +} + + +/************************************************************************/ +/* NtGdiDvpAcquireNotification */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpAcquireNotification(HANDLE hVideoPort, + HANDLE* hEvent, + LPDDVIDEOPORTNOTIFY pNotify) +{ + PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpAcquireNotification, pfnDvpAcquireNotification); + + if (pfnDvpAcquireNotification == NULL) + { + DPRINT1("Warring no pfnDvpAcquireNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpAcquireNotification"); + return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); +} + + +/************************************************************************/ +/* NtGdiDvpReleaseNotification */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpReleaseNotification(HANDLE hVideoPort, + HANDLE hEvent) +{ + PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpReleaseNotification, pfnDvpReleaseNotification); + + if (pfnDvpReleaseNotification == NULL) + { + DPRINT1("Warring no pfnDvpReleaseNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpReleaseNotification"); + return pfnDvpReleaseNotification(hVideoPort, hEvent); + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortField */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortField(HANDLE hVideoPort, + PDD_GETVPORTFIELDDATA puGetVPortFieldData) +{ + PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortField, pfnDvpGetVideoPortField); + + if (pfnDvpGetVideoPortField == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortField"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortField"); + return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); + +} + Modified: branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Oct 14 20:19:56 2007 @@ -1973,88 +1973,6 @@ /* * @unimplemented */ -DWORD -STDCALL -NtGdiDvpCanCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpColorControl( - IN HANDLE hVideoPort, - IN OUT PDD_VPORTCOLORDATA puVPortColorData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -HANDLE -STDCALL -NtGdiDvpCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CREATEVPORTDATA puCreateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpDestroyVideoPort( - IN HANDLE hVideoPort, - IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpFlipVideoPort( - IN HANDLE hVideoPort, - IN HANDLE hDDSurfaceCurrent, - IN HANDLE hDDSurfaceTarget, - IN OUT PDD_FLIPVPORTDATA puFlipVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortBandwidth( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ HBRUSH STDCALL NtGdiClearBrushAttributes( @@ -2143,147 +2061,6 @@ - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortFlipStatus( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortInputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortLine( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortOutputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortConnectInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoSignalStatus( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpUpdateVideoPort( - IN HANDLE hVideoPort, - IN HANDLE* phSurfaceVideo, - IN HANDLE* phSurfaceVbi, - IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpWaitForVideoPortSync( - IN HANDLE hVideoPort, - IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpAcquireNotification( - IN HANDLE hVideoPort, - IN OUT HANDLE* hEvent, - IN LPDDVIDEOPORTNOTIFY pNotify) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpReleaseNotification( - IN HANDLE hVideoPort, - IN HANDLE hEvent) -{ - UNIMPLEMENTED; - return 0; -} @@ -2604,18 +2381,6 @@ return 0; } - /* - * @unimplemented - */ - DWORD -STDCALL -NtGdiDvpGetVideoPortField( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData) -{ - UNIMPLEMENTED; - return 0; -} /*

1 0

[greatlrd] 29566: add empty file for directx video port control interface
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 19:18:29 2007 New Revision: 29566 URL: http://svn.reactos.org/svn/reactos?rev=29566&view=rev Log: add empty file for directx video port control interface Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (with props) Modified: branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (added) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 19:18:29 2007 @@ -1,0 +1,27 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native DirectDraw implementation + * FILE: subsys/win32k/ntddraw/dvd.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 19/1-2006 Magnus Olsen + */ + + +#include <w32k.h> +#include <reactos/drivers/directx/dxg.h> + +//#define NDEBUG +#include <debug.h> + +/********************************************************************************/ +/* DVD interface from DXG.SYS */ +/********************************************************************************/ + +extern PDRVFN gpDxFuncs; + + + + Propchange: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Sun Oct 14 19:18:29 2007 @@ -97,6 +97,7 @@ <file>dd.c</file> <file>ddsurf.c</file> <file>d3d.c</file> + <file>dvp.c</file> <file>mocomp.c</file> <file>stubs.c</file> </directory>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs