Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[greatlrd] 29599: start implement the dxeng driver api that are need it for dxg.sys I manger kill of some local tree with this commit. ReactX can not be build
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 16:38:50 2007 New Revision: 29599 URL: http://svn.reactos.org/svn/reactos?rev=29599&view=rev Log: start implement the dxeng driver api that are need it for dxg.sys I manger kill of some local tree with this commit. ReactX can not be build Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (with props) Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 16:38:50 2007 @@ -4,6 +4,7 @@ #include <ddrawint.h> #include <ddkernel.h> #include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ extern PDRVFN gpDxFuncs; Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (added) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Mon Oct 15 16:38:50 2007 @@ -1,0 +1,78 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver enumate of dxeng implementation + * FILE: subsys/win32k/ntddraw/dxeng.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +#include <w32k.h> +#include <debug.h> + +/************************************************************************/ +/* DxEngNUIsTermSrv */ +/************************************************************************/ + +/* Notes : Check see if termal server got a connections or not */ +BOOL +DxEngNUIsTermSrv() +{ + /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ + DPRINT1("We need termal server connections check"); + return FALSE; +} + +/************************************************************************/ +/* DxEngRedrawDesktop */ +/************************************************************************/ + +/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ +BOOL +DxEngRedrawDesktop() +{ + /* FIXME add redraw code */ + DPRINT1("We need add code for redraw whole desktop"); + return TRUE; +} + + +/************************************************************************/ +/* DxEngDispUniq */ +/************************************************************************/ + +/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ +ULONG +DxEngDispUniq() +{ + /* FIXME DisplayUniqVisrgn from gdishare memory */ + DPRINT1("We need DisplayUniqVisrgn from gdishare memory"); + return 0; +} + +/************************************************************************/ +/* DxEngVisRgnUniq */ +/************************************************************************/ +/* Notes : return the VisRgnUniq counter for win32k */ +ULONG +DxEngVisRgnUniq() +{ + /* FIXME DisplayUniqVisrgn from gdishare memory */ + DPRINT1("We need VisRgnUniq from win32k"); + return 0; +} + +/************************************************************************/ +/* Enumate all drivers in win32k */ +/************************************************************************/ +/* Enumate all drivers in win32k */ +HDEV * +DxEngEnumerateHdev(HDEV *hdev); +{ + /* FIXME Enumate all drivers in win32k */ + DPRINT1("We do not enumate any device from win32k "); + return 0; +} + + Propchange: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.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 Mon Oct 15 16:38:50 2007 @@ -99,7 +99,8 @@ <file>d3d.c</file> <file>dvp.c</file> <file>mocomp.c</file> - <file>stubs.c</file> + <file>eng.c</file> + <file>dxeng.c</file> </directory> <directory name="ntuser"> <file>accelerator.c</file>

1 0

[greatlrd] 29598: add two empty folder for now, it si for dxg.sys and dxapi.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 15:03:28 2007 New Revision: 29598 URL: http://svn.reactos.org/svn/reactos?rev=29598&view=rev Log: add two empty folder for now, it si for dxg.sys and dxapi.sys Added: branches/reactx/reactos/drivers/directx/ branches/reactx/reactos/drivers/directx/dxapi/ branches/reactx/reactos/drivers/directx/dxg/

1 0

[greatlrd] 29597: Start Build the next header we need, see https://www.openrce.org/forums/posts/535 only avail docs for it on the net.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 14:57:08 2007 New Revision: 29597 URL: http://svn.reactos.org/svn/reactos?rev=29597&view=rev Log: Start Build the next header we need, see https://www.openrce.org/forums/posts/535 only avail docs for it on the net. Added: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (with props) Added: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (added) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Mon Oct 15 14:57:08 2007 @@ -1,0 +1,195 @@ + +/************************************************************************/ +/* This driver interface are exported from win32k.sys to dxg.sys */ +/************************************************************************/ +#define DXENG_INDEX_Resverd0 0x00 +#define DXENG_INDEX_DxEngNUIsTermSrv 0x01 +#define DXENG_INDEX_DxEngScreenAccessCheck 0x02 +#define DXENG_INDEX_DxEngRedrawDesktop 0x03 +#define DXENG_INDEX_DxEngDispUniq 0x04 +#define DXENG_INDEX_DxEngIncDispUniq 0x05 +#define DXENG_INDEX_DxEngVisRgnUniq 0x06 +#define DXENG_INDEX_DxEngLockShareSem 0x07 +#define DXENG_INDEX_DxEngUnlockShareSem 0x08 +#define DXENG_INDEX_DxEngEnumerateHdev 0x09 +#define DXENG_INDEX_DxEngLockHdev 0x0A +#define DXENG_INDEX_DxEngUnlockHdev 0x0B +#define DXENG_INDEX_DxEngIsHdevLockedByCurrentThread 0x0C +#define DXENG_INDEX_DxEngReferenceHdev 0x0D +#define DXENG_INDEX_DxEngUnreferenceHdev 0x0E +#define DXENG_INDEX_DxEngGetDeviceGammaRamp 0x0F +#define DXENG_INDEX_DxEngSetDeviceGammaRamp 0x10 +#define DXENG_INDEX_DxEngSpTearDownSprites 0x11 +#define DXENG_INDEX_DxEngSpUnTearDownSprites 0x12 +#define DXENG_INDEX_DxEngSpSpritesVisible 0x13 +#define DXENG_INDEX_DxEngGetHdevData 0x14 +#define DXENG_INDEX_DxEngSetHdevData 0x15 +#define DXENG_INDEX_DxEngCreateMemoryDC 0x16 +#define DXENG_INDEX_DxEngGetDesktopDC 0x17 +#define DXENG_INDEX_DxEngDeleteDC 0x18 +#define DXENG_INDEX_DxEngCleanDC 0x19 +#define DXENG_INDEX_DxEngSetDCOwner 0x1A +#define DXENG_INDEX_DxEngLockDC 0x1B +#define DXENG_INDEX_DxEngUnlockDC 0x1C +#define DXENG_INDEX_DxEngSetDCState 0x1D +#define DXENG_INDEX_DxEngGetDCState 0x1E +#define DXENG_INDEX_DxEngSelectBitmap 0x1F +#define DXENG_INDEX_DxEngSetBitmapOwner 0x20 +#define DXENG_INDEX_DxEngDeleteSurface 0x21 +#define DXENG_INDEX_DxEngGetSurfaceData 0x22 +#define DXENG_INDEX_DxEngAltLockSurface 0x23 +#define DXENG_INDEX_DxEngUploadPaletteEntryToSurface 0x24 +#define DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw 0x25 +#define DXENG_INDEX_DxEngSelectPaletteToSurface 0x26 +#define DXENG_INDEX_DxEngSyncPaletteTableWithDevice 0x27 +#define DXENG_INDEX_DxEngSetPaletteState 0x28 +#define DXENG_INDEX_DxEngGetRedirectionBitmap 0x29 +#define DXENG_INDEX_DxEngLoadImage 0x2A + +/************************************************************************/ +/* win32k.sys internal protypes for the driver functions it export */ +/************************************************************************/ + +/* Check see if termal server got a connections or not */ +BOOL DxEngNUIsTermSrv(); + + + +/* prototypes are not done yet, I need gather all my notes + * to make them correct + */ + +/* +DWORD +DxEngScreenAccessCheck(); + +DWORD +DxEngRedrawDesktop(); + +DWORD +DxEngDispUniq(); + +ULONG +DxEngVisRgnUniq(); + +DWORD +DxEngLockShareSem(); + +DWORD +DxEngUnlockShareSem(); + +DWORD +DxEngEnumerateHdev(x); + +DWORD +DxEngLockHdev(x); + +DWORD +DxEngUnlockHdev(x); + +DWORD +DxEngReferenceHdev(x); + +DWORD +DxEngIsHdevLockedByCurrentThread(x); + +DWORD +DxEngReferenceHdev(x); + +DWORD +DxEngUnreferenceHdev(x); + +DWORD +DxEngGetDeviceGammaRamp(x,x); + +DWORD +DxEngSetDeviceGammaRamp(x,x,x); + +DWORD +DxEngSpTearDownSprites(x,x,x); + +DWORD +DxEngSpUnTearDownSprites(x,x,x); + +DWORD +DxEngSpSpritesVisible(x); + +DWORD +DxEngGetHdevData(x,x); + +DWORD +DxEngSetHdevData(x,x,x); + +DWORD +DxEngCreateMemoryDC(x); + +DWORD +DxEngGetDesktopDC(x,x,x); + +DWORD +DxEngDeleteDC(x,x); + +DWORD +DxEngCleanDC(x); + +DWORD +DxEngSetDCOwner(x,x) + +DWORD +DxEngLockDC(x); + +DWORD +DxEngUnlockDC(x); + +DWORD +DxEngSetDCState(x,x,x); + +DWORD +DxEngGetDCState(x,x); + +DWORD +DxEngSelectBitmap(x,x); + +DWORD +DxEngSetBitmapOwner(x,x); + +DWORD +DxEngDeleteSurface(x); + +DWORD +DxEngGetSurfaceData(x,x); + +DWORD +DxEngAltLockSurface(x); + +DWORD +DxEngUploadPaletteEntryToSurface(x,x,x,x); + +DWORD +DxEngMarkSurfaceAsDirectDraw(x,x); + +DWORD +DxEngSelectPaletteToSurface(x,x) + +DWORD +DxEngSyncPaletteTableWithDevice(x,x) + +DWORD +DxEngSetPaletteState(x,x,x) + +DWORD +DxEngGetRedirectionBitmap(x) + +DWORD +DxEngLoadImage(x,x); +*/ + + + + + + + + + + Propchange: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 29596: add one more redirect to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 13:49:58 2007 New Revision: 29596 URL: http://svn.reactos.org/svn/reactos?rev=29596&view=rev Log: add one more redirect to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 13:49:58 2007 @@ -8,6 +8,7 @@ /* From ddraw.c */ extern PDRVFN gpDxFuncs; +typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); 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 13:49:58 2007 @@ -493,7 +493,20 @@ HANDLE hSurface, BOOL bRelease) { - + + PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle); + + if (pfnDdGetDxHandle == NULL) + { + DPRINT1("Warring no pfnDdGetDxHandle"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetDxHandle"); + return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); }

1 0

[greatlrd] 29595: rename 3 INDEX to diffent name to more logic names. add comment which part being syscall, export list and internal use from win32k.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 12:45:42 2007 New Revision: 29595 URL: http://svn.reactos.org/svn/reactos?rev=29595&view=rev Log: rename 3 INDEX to diffent name to more logic names. add comment which part being syscall, export list and internal use from win32k.sys Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Mon Oct 15 12:45:42 2007 @@ -4,6 +4,9 @@ /* DXG.SYS FUNCTIONS INDEX */ +/***************************************************************************/ +/* This driver functions are exported raw from NtGdiDd* / NtDvp* / NtD3d* */ +/***************************************************************************/ #define DXG_INDEX_DxDxgGenericThunk 0x00 #define DXG_INDEX_DxD3dContextCreate 0x01 #define DXG_INDEX_DxD3dContextDestroy 0x02 @@ -20,9 +23,9 @@ #define DXG_INDEX_DxDdCanCreateD3DBuffer 0x0D #define DXG_INDEX_DxDdColorControl 0x0E #define DXG_INDEX_DxDdCreateDirectDrawObject 0x0F -/* DXG_INDEX_DxDdCreateD3DBuffer and DXG_INDEX_DxDdCreateD3DBuffer2 are same */ -#define DXG_INDEX_DxDdCreateD3DBuffer 0x10 -#define DXG_INDEX_DxDdCreateD3DBuffer2 0x11 +/* DXG_INDEX_DxDdCreateSurface and DXG_INDEX_DxDdCreateD3DBuffer2 are same */ +#define DXG_INDEX_DxDdCreateSurface 0x10 +#define DXG_INDEX_DxDdCreateD3DBuffer 0x11 #define DXG_INDEX_DxDdCreateMoComp 0x12 #define DXG_INDEX_DxDdCreateSurfaceObject 0x13 #define DXG_INDEX_DxDdDeleteDirectDrawObject 0x14 @@ -30,43 +33,40 @@ #define DXG_INDEX_DxDdDestroyMoComp 0x16 #define DXG_INDEX_DxDdDestroySurface 0x17 #define DXG_INDEX_DxDdDestroyD3DBuffer 0x18 +#define DXG_INDEX_DxDdEndMoCompFrame 0x19 #define DXG_INDEX_DxDdFlip 0x1A - -#define DXG_INDEX_DxDdGetBltStatus 0x1D -#define DXG_INDEX_DxDdGetFlipStatus 0x21 -/* DXG_INDEX_DxDdLock and DXG_INDEX_DxDdLockD3D are same */ -#define DXG_INDEX_DxDdLock 0x27 -#define DXG_INDEX_DxDdSetColorKey 0x2F -#define DXG_INDEX_DxDdSetOverlayPosition 0x33 -/* DXG_INDEX_DxDdUnlock and DXG_INDEX_DxDdUnlockD3D are same */ -#define DXG_INDEX_DxDdUnlock 0x35 -#define DXG_INDEX_DxDdUpdateOverlay 0x37 - - -#define DXG_INDEX_DxDdEndMoCompFrame 0x19 #define DXG_INDEX_DxDdFlipToGDISurface 0x1B #define DXG_INDEX_DxDdGetAvailDriverMemory 0x1C +#define DXG_INDEX_DxDdGetBltStatus 0x1D #define DXG_INDEX_DxDdGetDC 0x1E #define DXG_INDEX_DxDdGetDriverInfo 0x1F -#define DXG_INDEX_DxDdGetDxHandle 0x20 + +#define DXG_INDEX_DxDdGetFlipStatus 0x21 #define DXG_INDEX_DxDdGetInternalMoCompInfo 0x22 #define DXG_INDEX_DxDdGetMoCompBuffInfo 0x23 #define DXG_INDEX_DxDdGetMoCompGuids 0x24 #define DXG_INDEX_DxDdGetMoCompFormats 0x25 #define DXG_INDEX_DxDdGetScanLine 0x26 +/* DXG_INDEX_DxDdLock and DXG_INDEX_DxDdLockD3D are same */ +#define DXG_INDEX_DxDdLock 0x27 #define DXG_INDEX_DxDdLockD3D 0x28 #define DXG_INDEX_DxDdQueryDirectDrawObject 0x29 #define DXG_INDEX_DxDdQueryMoCompStatus 0x2A #define DXG_INDEX_DxDdReenableDirectDrawObject 0x2B -#define DXG_INDEX_DxDdReleaseDC 0x2C + #define DXG_INDEX_DxDdRenderMoComp 0x2D -#define DXG_INDEX_DxDdResetVisrgn 0x2E + +#define DXG_INDEX_DxDdSetColorKey 0x2F + #define DXG_INDEX_DxDdSetExclusiveMode 0x30 -#define DXG_INDEX_DxDdSetGammaRamp 0x31 + #define DXG_INDEX_DxDdCreateSurfaceEx 0x32 - +#define DXG_INDEX_DxDdSetOverlayPosition 0x33 #define DXG_INDEX_DxDdUnattachSurface 0x34 +/* DXG_INDEX_DxDdUnlock and DXG_INDEX_DxDdUnlockD3D are same */ +#define DXG_INDEX_DxDdUnlock 0x35 #define DXG_INDEX_DxDdUnlockD3D 0x36 +#define DXG_INDEX_DxDdUpdateOverlay 0x37 #define DXG_INDEX_DxDdWaitForVerticalBlank 0x38 #define DXG_INDEX_DxDvpCanCreateVideoPort 0x39 #define DXG_INDEX_DxDvpColorControl 0x3A @@ -85,8 +85,33 @@ #define DXG_INDEX_DxDvpWaitForVideoPortSync 0x47 #define DXG_INDEX_DxDvpAcquireNotification 0x48 #define DXG_INDEX_DxDvpReleaseNotification 0x49 + +/* not addedd yet */ +#define DXG_INDEX_DxDdGetDxHandle 0x20 +#define DXG_INDEX_DxDdReleaseDC 0x2C +#define DXG_INDEX_DxDdResetVisrgn 0x2E +#define DXG_INDEX_DxDdSetGammaRamp 0x31 + + +/***********************************************************************************/ +/* This driver functions are exported raw from Eng* it only exists in the def file */ +/* you can not do syscallback to thuse but you can import them from win32k.sys */ +/* for them are in the export list */ +/***********************************************************************************/ +/* not addedd yet */ #define DXG_INDEX_DxDdHeapVidMemAllocAligned 0x4A #define DXG_INDEX_DxDdHeapVidMemFree 0x4B +#define DXG_INDEX_DxDdAllocPrivateUserMem 0x54 +#define DXG_INDEX_DxDdFreePrivateUserMem 0x55 +#define DXG_INDEX_DxDdLockDirectDrawSurface 0x56 +#define DXG_INDEX_DxDdUnlockDirectDrawSurface 0x57 +#define DXG_INDEX_DxDdIoctl 0x5B + + +/***********************************************************************************/ +/* Internal use in diffent part in Windows and ReactOS */ +/***********************************************************************************/ +/* not inuse yet */ #define DXG_INDEX_DxDdEnableDirectDraw 0x4C #define DXG_INDEX_DxDdDisableDirectDraw 0x4D #define DXG_INDEX_DxDdSuspendDirectDraw 0x4E @@ -95,11 +120,7 @@ #define DXG_INDEX_DxDdCloseProcess 0x51 #define DXG_INDEX_DxDdGetDirectDrawBound 0x52 #define DXG_INDEX_DxDdEnableDirectDrawRedirection 0x53 -#define DXG_INDEX_DxDdAllocPrivateUserMem 0x54 -#define DXG_INDEX_DxDdFreePrivateUserMem 0x55 -#define DXG_INDEX_DxDdLockDirectDrawSurface 0x56 -#define DXG_INDEX_DxDdUnlockDirectDrawSurface 0x57 #define DXG_INDEX_DxDdSetAccelLevel 0x58 #define DXG_INDEX_DxDdGetSurfaceLock 0x59 #define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A -#define DXG_INDEX_DxDdIoctl 0x5B +

1 0

[greatlrd] 29594: adding more redirect to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 12:42:47 2007 New Revision: 29594 URL: http://svn.reactos.org/svn/reactos?rev=29594&view=rev Log: adding more redirect to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 12:42:47 2007 @@ -8,6 +8,7 @@ /* From ddraw.c */ extern PDRVFN gpDxFuncs; +typedef HDC (NTAPI *PGD_DDGETDC(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); 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 12:42:47 2007 @@ -469,7 +469,19 @@ NtGdiDdGetDC(HANDLE hSurface, PALETTEENTRY *puColorTable) { - + PGD_DDGETDC pfnDdGetDC = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDC, pfnDdGetDC); + + if (pfnDdGetDC == NULL) + { + DPRINT1("Warring no pfnDdGetDC"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetDC"); + return pfnDdGetDC(hSurface, puColorTable); } /************************************************************************/

1 0

[greatlrd] 29593: finish redirect dvp interface to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 12:34:11 2007 New Revision: 29593 URL: http://svn.reactos.org/svn/reactos?rev=29593&view=rev Log: finish redirect dvp interface to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 12:34:11 2007 @@ -40,6 +40,12 @@ typedef DWORD (NTAPI *PGD_D3DCONTEXTDESTROYALL)(LPD3DNTHAL_CONTEXTDESTROYALLDATA); /* From dvp.c */ +typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA); +typedef DWORD (NTAPI* PGD_DVPCREATEVIDEOPORT(HANDLE, PDD_CREATEVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT(HANDLE, PDD_DESTROYVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(hDirectDraw, puGetVPortFlipStatusData); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); 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 Mon Oct 15 12:34:11 2007 @@ -13,18 +13,27 @@ #include <w32k.h> #include <debug.h> -DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); -DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); - /************************************************************************/ /* NtGdiDvpCanCreateVideoPort */ /************************************************************************/ DWORD STDCALL -NtGdiDvpCanCreateVideoPort(hDirectDraw, +NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw, PDD_CANCREATEVPORTDATA puCanCreateVPortData) { - + PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCanCreateVideoPort, pfnDvpCanCreateVideoPort); + + if (pfnDvpCanCreateVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpCanCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpCanCreateVideoPort"); + return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } /************************************************************************/ @@ -35,7 +44,19 @@ NtGdiDvpColorControl(HANDLE hVideoPort, PDD_VPORTCOLORDATA puVPortColorData) { - + PGD_DVPCOLORCONTROL pfnDvpColorControl = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpColorControl, pfnDvpColorControl); + + if (pfnDvpColorControl == NULL) + { + DPRINT1("Warring no pfnDvpColorControl"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpColorControl"); + return pfnDvpColorControl(hVideoPort, puVPortColorData); } /************************************************************************/ @@ -46,7 +67,19 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, PDD_CREATEVPORTDATA puCreateVPortData) { - + PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCreateVideoPort, pfnDvpCreateVideoPort); + + if (pfnDvpCreateVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpCreateVideoPort"); + return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } /************************************************************************/ @@ -57,7 +90,19 @@ NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, PDD_DESTROYVPORTDATA puDestroyVPortData) { - + PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpDestroyVideoPort, pfnDvpDestroyVideoPort); + + if (pfnDvpDestroyVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpDestroyVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpDestroyVideoPort"); + return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } /************************************************************************/ @@ -70,7 +115,7 @@ HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort= NULL; + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = NULL; INT i; DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpFlipVideoPort, pfnDvpFlipVideoPort);

1 0

[greatlrd] 29592: adding more redirect to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 11:50:59 2007 New Revision: 29592 URL: http://svn.reactos.org/svn/reactos?rev=29592&view=rev Log: adding more redirect to dxg.sys 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 Mon Oct 15 11:50:59 2007 @@ -13,6 +13,8 @@ #include <w32k.h> #include <debug.h> +DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); +DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); /************************************************************************/ /* NtGdiDvpCanCreateVideoPort */ @@ -57,7 +59,6 @@ { } - /************************************************************************/ /* NtGdiDvpFlipVideoPort */ @@ -69,7 +70,19 @@ HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort= NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpFlipVideoPort, pfnDvpFlipVideoPort); + + if (pfnDvpFlipVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpFlipVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpFlipVideoPort"); + return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } @@ -81,7 +94,19 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) { - + PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortBandwidth, pfnDvpGetVideoPortBandwidth); + + if (pfnDvpGetVideoPortBandwidth == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortBandwidth"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth"); + return pfnDvpGetVideoPortBandwidth(hVideoPort, pfnDvpGetVideoPortBandwidth); }

1 0

[arty] 29591: Fix quirks for building PPC on windows.
by arty＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: arty Date: Mon Oct 15 07:56:58 2007 New Revision: 29591 URL: http://svn.reactos.org/svn/reactos?rev=29591&view=rev Log: Fix quirks for building PPC on windows. Modified: trunk/reactos/include/reactos/wine/port.h trunk/reactos/lib/ppcmmu/ppcmmu.mak trunk/reactos/tools/ssprintf.cpp trunk/reactos/tools/ssprintf.h trunk/reactos/tools/xml.cpp Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h (original) +++ trunk/reactos/include/reactos/wine/port.h Mon Oct 15 07:56:58 2007 @@ -286,7 +286,7 @@ # endif #endif /* !defined(HAVE_STRCASECMP) */ -#ifndef HAVE_USLEEP +#if !defined(HAVE_USLEEP) && !defined(__CYGWIN__) int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ Modified: trunk/reactos/lib/ppcmmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.mak?rev=… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.mak (original) +++ trunk/reactos/lib/ppcmmu/ppcmmu.mak Mon Oct 15 07:56:58 2007 @@ -2,32 +2,36 @@ S=lib/ppcmmu CC=powerpc-unknown-elf-gcc -I$T/include/reactos/ppcmmu AR=powerpc-unknown-elf-ar +CFLAGS=-Iinclude/reactos/libs -Iinclude/crt -Iinclude/reactos -D__cdecl__= OBJCOPY=powerpc-unknown-elf-objcopy LDSCRIPT=-Wl,-T,$S/ldscript PPCMMU_TARGETS=$O/libppcmmu_code.a MMUOBJECT_OBJS=$O/devint.o $O/mmuobject.o $O/mmuutil_object.o $O/mmutest.o $O/gdblib.o -$O/mmuutil_object.o: $S/mmuutil.c | $O - $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c +mkdir_ppcmmu: + -mkdir -p $O -$O/libppcmmu_code.a: $(MMUOBJECT_OBJS) | $O +$O/mmuutil_object.o: $S/mmuutil.c | mkdir_ppcmmu + $(CC) $(CFLAGS) -g -c -o $@ $S/mmuutil.c + +$O/libppcmmu_code.a: $(MMUOBJECT_OBJS) $(CC) -Wl,-N -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $(MMUOBJECT_OBJS) $(OBJCOPY) -O binary $O/mmuobject mmucode $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o mkdir -p `dirname $@` $(AR) cr $@ $O/mmucode.o -$O/gdblib.o: $S/gdblib.c | $O - $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/gdblib.c +$O/gdblib.o: $S/gdblib.c | mkdir_ppcmmu + $(CC) $(CFLAGS) -g -c -o $@ $S/gdblib.c -$O/devint.o: $S/devint.s | $O - $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/devint.s +$O/devint.o: $S/devint.s | mkdir_ppcmmu + $(CC) $(CFLAGS) -g -c -o $@ $S/devint.s -$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | $O - $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c +$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | mkdir_ppcmmu + $(CC) $(CFLAGS) -g -c -o $@ $S/mmuobject.c -$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | $O - $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c +$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | mkdir_ppcmmu + $(CC) $(CFLAGS) -g -c -o $@ $S/mmutest.c ppcmmuobject_clean: rm -f $O/*.o $O/*.a mmucode $O/mmuobject Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=295… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Mon Oct 15 07:56:58 2007 @@ -37,7 +37,7 @@ #endif #endif//WIN32 -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__CYGWIN__) # define __isnan isnan # define __finite finite # define powl __builtin_powl Modified: trunk/reactos/tools/ssprintf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.h?rev=29591… ============================================================================== --- trunk/reactos/tools/ssprintf.h (original) +++ trunk/reactos/tools/ssprintf.h Mon Oct 15 07:56:58 2007 @@ -19,6 +19,12 @@ #include <string> #include <stdarg.h> +#ifdef __CYGWIN__ +namespace std { + typedef basic_string<wchar_t> wstring; +} +#endif + std::string ssprintf ( const char* fmt, ... ); std::string ssvprintf ( const char* fmt, va_list args ); Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=29591&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp (original) +++ trunk/reactos/tools/xml.cpp Mon Oct 15 07:56:58 2007 @@ -99,7 +99,7 @@ #ifdef WIN32 return _filelengthi64 ( _fileno(f) ); #else -# if defined(__FreeBSD__) || defined(__APPLE__) +# if defined(__FreeBSD__) || defined(__APPLE__) || defined(__CYGWIN__) struct stat file_stat; if ( fstat(fileno(f), &file_stat) != 0 ) # else

1 0

[arty] 29590: Slight Adjustment. __DECLSPEC_SUPPORTED is an output.
by arty＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: arty Date: Mon Oct 15 07:34:15 2007 New Revision: 29590 URL: http://svn.reactos.org/svn/reactos?rev=29590&view=rev Log: Slight Adjustment. __DECLSPEC_SUPPORTED is an output. Modified: trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=295… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Mon Oct 15 07:34:15 2007 @@ -25,7 +25,7 @@ <define name="WORDS_BIGENDIAN" empty="true" /> <define name="__MSVCRT__" empty="true" /> <define name="__NO_CTYPE_INLINES" /> - <define name="__DECLSPEC_SUPPORTED" /> +  <define name="__MINGW_IMPORT">extern</define> <define name="_CRTIMP" empty="true" /> <define name="'__declspec(x)'" empty="true" />

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
71
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 October 2007