Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29726: Replace DDKAPI call convention by APIENTRY, as specified in winddi.h for driver function pointers
by hpoussin＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: hpoussin Date: Sun Oct 21 11:14:55 2007 New Revision: 29726 URL: http://svn.reactos.org/svn/reactos?rev=29726&view=rev Log: Replace DDKAPI call convention by APIENTRY, as specified in winddi.h for driver function pointers Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/palette.c trunk/reactos/drivers/video/displays/framebuf/pointer.c trunk/reactos/drivers/video/displays/framebuf/screen.c trunk/reactos/drivers/video/displays/framebuf/surface.c Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/enable.c Sun Oct 21 11:14:55 2007 @@ -46,7 +46,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvEnableDriver( ULONG iEngineVersion, ULONG cj, @@ -74,7 +74,7 @@ * @implemented */ -DHPDEV DDKAPI +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -128,7 +128,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev) @@ -146,7 +146,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev) { Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Sun Oct 21 11:14:55 2007 @@ -29,10 +29,6 @@ #include <winioctl.h> #include <ntddvdeo.h> -#define DDKAPI __stdcall -#define DDKFASTAPI __fastcall -#define FASTCALL __fastcall -#define DDKCDECLAPI __cdecl //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT typedef struct _PDEV @@ -78,7 +74,7 @@ #define ALLOC_TAG TAG('F','B','U','F') -DHPDEV STDCALL +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -92,35 +88,35 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver); -VOID STDCALL +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev); -VOID STDCALL +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev); -HSURF STDCALL +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev); -VOID STDCALL +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev); -BOOL STDCALL +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable); -ULONG STDCALL +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize, OUT DEVMODEW *pdm); -BOOL STDCALL +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo, @@ -128,7 +124,7 @@ IN ULONG iStart, IN ULONG cColors); -ULONG STDCALL +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -141,33 +137,30 @@ IN RECTL *prcl, IN FLONG fl); -VOID STDCALL +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, IN LONG y, IN RECTL *prcl); -BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, PGDIINFO pGdiInfo, PDEVINFO pDevInfo); -BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo); -BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, IN ULONG iStart, IN ULONG cColors); - - #endif /* FRAMEBUF_H */ - Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/palette.c Sun Oct 21 11:14:55 2007 @@ -56,7 +56,7 @@ * by the GDI standard. */ -BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo) @@ -106,7 +106,7 @@ * as closely as possible. */ -BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, @@ -166,7 +166,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo, Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/pointer.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/pointer.c Sun Oct 21 11:14:55 2007 @@ -31,7 +31,7 @@ * @unimplemented */ -ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -58,7 +58,7 @@ * @unimplemented */ -VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, @@ -197,7 +197,7 @@ * @implemented */ -ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -337,7 +337,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c Sun Oct 21 11:14:55 2007 @@ -27,7 +27,7 @@ * and returns the list of modes supported by the display driver. */ -DWORD FASTCALL +DWORD GetAvailableModes( HANDLE hDriver, PVIDEO_MODE_INFORMATION *ModeInfo, @@ -107,7 +107,7 @@ return Modes.NumModes; } -BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, @@ -352,7 +352,7 @@ * @implemented */ -ULONG DDKAPI +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize, Modified: trunk/reactos/drivers/video/displays/framebuf/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/surface.c Sun Oct 21 11:14:55 2007 @@ -30,7 +30,7 @@ * @implemented */ -HSURF DDKAPI +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev) { @@ -129,7 +129,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev) { @@ -164,7 +164,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable)

1 0

[greatlrd] 29725: Add documentations : how NtGdiDdCreateD3DBuffer works, did nott add full docs, but egunt for people start using it if they read msdn as well Optimize : NtGdiDdCreateD3DBuffer
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 05:25:26 2007 New Revision: 29725 URL: http://svn.reactos.org/svn/reactos?rev=29725&view=rev Log: Add documentations : how NtGdiDdCreateD3DBuffer works, did nott add full docs, but egunt for people start using it if they read msdn as well Optimize : NtGdiDdCreateD3DBuffer Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.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 21 05:25:26 2007 @@ -48,6 +48,7 @@ * for the ddRVal will other wise be unchange if some error happen inside the driver. * puCanCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. * puCanCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* puCreateSurfaceData->CanCreateSurface pointer to the real functions the HAL or HEL, that u need fill in * *--*/ @@ -195,9 +196,57 @@ return pfnD3dContextDestroyAll(pdcad); } -/************************************************************************/ -/* NtGdiDdCreateD3DBuffer */ -/************************************************************************/ +/*++ +* @name NtGdiDdCreateD3DBuffer +* @implemented +* +* The function NtGdiDdCreateD3DBuffer create a +* surface for DirectX. It is redirected to dxg.sys. +* +* @param HANDLE hDirectDraw +* The handle we got from NtGdiDdCreateDirectDrawObject +* +* @param HANDLE *hSurface +* <FILMEIN> +* +* @param DDSURFACEDESC puSurfaceDescription +* surface desc what kind of surface it should be, example rgb, compress, deep, and more, +* see DDSURFACEDESC for more infomations +* +* @param DD_SURFACE_GLOBAL *puSurfaceGlobalData +* <FILMEIN> +* +* @param DD_SURFACE_LOCAL *puSurfaceLocalData +* <FILMEIN> +* +* @param DD_SURFACE_MORE *puSurfaceMoreData +* <FILMEIN> +* +* @param PDD_CREATESURFACEDATA puCreateSurfaceData +* <FILMEIN> +* +* @param HANDLE *puhSurface +* <FILMEIN> +* +* @return +* Depending on if the driver supports this API or not, DDHAL_DRIVER_HANDLED +* or DDHAL_DRIVER_NOTHANDLED is returned. +* To check if the function has been successful, do a full check. +* A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED +* and puCanCreateSurfaceData->ddRVal is set to DD_OK. +* +* @remarks. +* dxg.sys NtGdiDdCreateD3DBuffer and NtGdiDdCreateSurface call are redirect to dxg.sys +* inside the dxg.sys they ar redirect to same functions. examine the driver list functions +* table, the memory address you will see they are pointed to same memory address. +* +* Before call to this api please set the puCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* puCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. +* puCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* puCreateSurfaceData->CreateSurface pointer to the real functions the HAL or HEL, that u need fill in +* +*--*/ DWORD STDCALL NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, @@ -209,10 +258,7 @@ PDD_CREATESURFACEDATA puCreateSurfaceData, HANDLE *puhSurface) { - PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateD3DBuffer, pfnDdCreateD3DBuffer); + PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn; if (pfnDdCreateD3DBuffer == NULL) {

1 0

[greatlrd] 29724: Add documentations : how NtGdiD3dContextDestroyAll works, MSDN docs is wrong Optimize : NtGdiD3dContextDestroyAll
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 04:47:24 2007 New Revision: 29724 URL: http://svn.reactos.org/svn/reactos?rev=29724&view=rev Log: Add documentations : how NtGdiD3dContextDestroyAll works, MSDN docs is wrong Optimize : NtGdiD3dContextDestroyAll Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.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 21 04:47:24 2007 @@ -157,17 +157,33 @@ return pfnD3dContextDestroy(pContextDestroyData); } -/************************************************************************/ -/* NtGdiD3dContextDestroyAll */ -/************************************************************************/ +/*++ +* @name NtGdiD3dContextDestroyAll +* @implemented +* +* The Function NtGdiD3dContextDestroyAll Destory the all context data we got in a process +* The data have been alloc with NtGdiD3dContextCreate +* +* @param LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad +* The context data we want to destory +* +* @remarks. +* dxg.sys NtGdiD3dContextDestroyAll call are redirect to +* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they +* are diffent. +* +* Before call to this api please set the pdcad->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* pdcad->dwPID need also be fill in with the Process ID we need destore the data for +* +* Waring MSDN is wrong about this api. it say it queare free memory and it does not accpect +* any parama, last time checked in msdn 19/10-2007 +*--*/ DWORD STDCALL NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) { - PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dContextDestroyAll, pfnD3dContextDestroyAll); + PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxD3dContextDestroyAll].pfn; if (pfnD3dContextDestroyAll == NULL) {

1 0

[weiden] 29723: Fixes updating default character attributes when calling SetConsoleTextAttribute(). See issue #2705 for more details.
by weiden＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: weiden Date: Sun Oct 21 02:26:58 2007 New Revision: 29723 URL: http://svn.reactos.org/svn/reactos?rev=29723&view=rev Log: Fixes updating default character attributes when calling SetConsoleTextAttribute(). See issue #2705 for more details. Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h Sun Oct 21 02:26:58 2007 @@ -56,6 +56,7 @@ BOOL (STDCALL *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); BOOL (STDCALL *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, UINT OldCursorX, UINT OldCursorY); + BOOL (STDCALL *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); BOOL (STDCALL *ChangeTitle)(PCSRSS_CONSOLE Console); VOID (STDCALL *CleanupConsole)(PCSRSS_CONSOLE Console); BOOL (STDCALL *ChangeIcon)(PCSRSS_CONSOLE Console); @@ -152,6 +153,8 @@ #define ConioSetCursorInfo(Console, Buff) (Console)->Vtbl->SetCursorInfo((Console), (Buff)) #define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ (Console)->Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) +#define ConioUpdateScreenInfo(Console, Buff) \ + (Console)->Vtbl->UpdateScreenInfo(Console, Buff) #define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) #define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sun Oct 21 02:26:58 2007 @@ -2049,7 +2049,6 @@ NTSTATUS Status; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; - LONG OldCursorX, OldCursorY; DPRINT("CsrSetTextAttrib\n"); @@ -2068,13 +2067,11 @@ } return Request->Status = Status; } - - ConioPhysicalToLogical(Buff, Buff->CurrentX, Buff->CurrentY, &OldCursorX, &OldCursorY); Buff->DefaultAttrib = Request->Data.SetAttribRequest.Attrib; if (NULL != Console && Buff == Console->ActiveBuffer) { - if (! ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) + if (! ConioUpdateScreenInfo(Console, Buff)) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Oct 21 02:26:58 2007 @@ -1244,6 +1244,20 @@ } return TRUE; +} + +static BOOL STDCALL +GuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) +{ + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; + + if (Console->ActiveBuffer == Buff) + { + GuiData->ScreenText = GuiConsoleRGBFromAttribute(Buff->DefaultAttrib & 0x0f); + GuiData->ScreenBackground = GuiConsoleRGBFromAttribute((Buff->DefaultAttrib & 0xf0) >> 4); + } + + return TRUE; } static VOID FASTCALL @@ -2124,6 +2138,7 @@ GuiDrawRegion, GuiSetCursorInfo, GuiSetScreenInfo, + GuiUpdateScreenInfo, GuiChangeTitle, GuiCleanupConsole, GuiChangeIcon Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Sun Oct 21 02:26:58 2007 @@ -211,6 +211,12 @@ } return TRUE; +} + +static BOOL STDCALL +TuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) +{ + return TRUE; } static BOOL STDCALL @@ -293,6 +299,7 @@ TuiDrawRegion, TuiSetCursorInfo, TuiSetScreenInfo, + TuiUpdateScreenInfo, TuiChangeTitle, TuiCleanupConsole };

1 0

[weiden] 29722: Enable the code to determine the time zone from the default system language
by weiden＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: weiden Date: Sun Oct 21 01:37:48 2007 New Revision: 29722 URL: http://svn.reactos.org/svn/reactos?rev=29722&view=rev Log: Enable the code to determine the time zone from the default system language Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Sun Oct 21 01:37:48 2007 @@ -1106,7 +1106,6 @@ SetupData->TimeZoneListTail = NULL; } -#if 0 static BOOL GetTimeZoneListIndex(LPDWORD lpIndex) { @@ -1207,7 +1206,6 @@ return FALSE; } -#endif static VOID @@ -1217,9 +1215,7 @@ DWORD dwIndex = 0; DWORD dwCount; -#if 0 GetTimeZoneListIndex(&dwEntryIndex); -#endif Entry = SetupData->TimeZoneListHead; while (Entry != NULL)

1 0

[greatlrd] 29721: update some docs with info that is correct, this info can not be found in msdn, msdn is wrong in this part. that why people can not check see if they can create a surface.
by greatlrd＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: greatlrd Date: Sat Oct 20 22:58:13 2007 New Revision: 29721 URL: http://svn.reactos.org/svn/reactos?rev=29721&view=rev Log: update some docs with info that is correct, this info can not be found in msdn, msdn is wrong in this part. that why people can not check see if they can create a surface. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.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 Sat Oct 20 22:58:13 2007 @@ -46,6 +46,8 @@ * * Before call to this api please set the puCanCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. * for the ddRVal will other wise be unchange if some error happen inside the driver. +* puCanCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. +* puCanCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ @@ -54,7 +56,7 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) { - PGD_DXDDDESTROYD3DBUFFER pfnDdCanCreateD3DBuffer = gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn; + PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer = (PGD_DDCANCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn; if (pfnDdCanCreateD3DBuffer == NULL) { @@ -92,12 +94,13 @@ * * * @remarks. -* dxg.sys NtGdiD3dContextCreate and NtGdiD3dContextCreate call are redirect to +* dxg.sys NtGdiD3dContextCreate call are redirect to * same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they * are diffent. * * Before call to this api please set the hSurfZ->ddRVal to a error value example DDERR_NOTUSPORTED. * for the ddRVal will other wise be unchange if some error happen inside the driver. +* hSurfZ->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ BOOL @@ -107,7 +110,7 @@ HANDLE hSurfZ, D3DNTHAL_CONTEXTCREATEDATA* pdcci) { - PGD_DDCANCREATED3DBUFFER pfnD3dContextCreate = gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn; + PGD_D3DCONTEXTCREATE pfnD3dContextCreate = (PGD_D3DCONTEXTCREATE)gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn; if (pfnD3dContextCreate == NULL) { @@ -119,17 +122,30 @@ return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } -/************************************************************************/ -/* NtGdiD3dContextDestroy */ -/************************************************************************/ +/*++ +* @name NtGdiD3dContextDestroy +* @implemented +* +* The Function NtGdiD3dContextDestroy Destory the context data we got from NtGdiD3dContextCreate +* +* @param LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +* The context data we want to destory +* +* @remarks. +* dxg.sys NtGdiD3dContextDestroy call are redirect to +* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they +* are diffent. +* +* Before call to this api please set the pContextDestroyData->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* pContextDestroyData->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* +*--*/ DWORD STDCALL NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) { - PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dContextDestroy, pfnD3dContextDestroy); + PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy = (PGD_D3DCONTEXTDESTROY)gpDxFuncs[DXG_INDEX_DxD3dContextDestroy].pfn; if ( pfnD3dContextDestroy == NULL) {

1 0

[janderwald] 29720: - add joy.cpl and tapiui.dll to bootcd - patch by Cameron Gutman (aicommander[at]gmail[dot]com)
by janderwald＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: janderwald Date: Sat Oct 20 22:56:46 2007 New Revision: 29720 URL: http://svn.reactos.org/svn/reactos?rev=29720&view=rev Log: - add joy.cpl and tapiui.dll to bootcd - patch by Cameron Gutman (aicommander[at]gmail[dot]com) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 20 22:56:46 2007 @@ -115,6 +115,7 @@ dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 dll\cpl\input\input.dll 1 +dll\cpl\joy\joy.cpl 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 @@ -261,6 +262,7 @@ dll\win32\beepmidi\beepmidi.dll 1 dll\win32\shellext\deskadp\deskadp.dll 1 dll\win32\shellext\deskmon\deskmon.dll 1 +dll\win32\tapiui\tapiui.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1

1 0

[weiden] 29719: tapiui.dll doesn't have an entry point
by weiden＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: weiden Date: Sat Oct 20 22:34:56 2007 New Revision: 29719 URL: http://svn.reactos.org/svn/reactos?rev=29719&view=rev Log: tapiui.dll doesn't have an entry point Removed: trunk/reactos/dll/win32/tapiui/tapiui.c Modified: trunk/reactos/dll/win32/tapiui/tapiui.rbuild Removed: trunk/reactos/dll/win32/tapiui/tapiui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.c?… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.c (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.c (removed) @@ -1,29 +1,0 @@ -/* - * PROJECT: ReactOS Telephone API UI DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/tapiui/tapiui.c - * PURPOSE: Telephone API UI DLL - * COPYRIGHT: Dmitry Chapyshev <lentind(a)yandex.ru> - * - */ - -#include <windows.h> -#include "resource.h" - -static HINSTANCE hDllInstance; - -BOOL WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - hDllInstance = hinstDLL; - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} Modified: trunk/reactos/dll/win32/tapiui/tapiui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rb… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rbuild (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rbuild Sat Oct 20 22:34:56 2007 @@ -1,11 +1,8 @@ -<module name="tapiui" type="win32dll" baseaddress="${BASEADDRESS_TAPIUI}" installbase="system32" installname="tapiui.dll" unicode="true"> +<module name="tapiui" type="win32dll" baseaddress="${BASEADDRESS_TAPIUI}" entrypoint="0" installbase="system32" installname="tapiui.dll" unicode="true"> <include base="tapiui">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> - <library>ntdll</library> - <library>kernel32</library> - <file>tapiui.c</file> <file>tapiui.rc</file> </module>

1 0

[fireball] 29718: - Use "windows" module to hold native dlls, which can be legally used in different operating systems (for now, it's mfc42.dll). Put it into reactos\modules\windows directory and "makex bootcd".
by fireball＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: fireball Date: Sat Oct 20 22:09:14 2007 New Revision: 29718 URL: http://svn.reactos.org/svn/reactos?rev=29718&view=rev Log: - Use "windows" module to hold native dlls, which can be legally used in different operating systems (for now, it's mfc42.dll). Put it into reactos\modules\windows directory and "makex bootcd". Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 20 22:09:14 2007 @@ -531,3 +531,6 @@ modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\wallpaper\lake.bmp 4 optional + +; Native libraries +modules\windows\mfc42.dll 1 optional

1 0

[greatlrd] 29717: This header are need it for our owm dxg.h, This stuct can not be found in msdn. This struct are documented partly or full in Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw. I am great full to Alex to help figut and fill in the missing parts. Thank you.
by greatlrd＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: greatlrd Date: Sat Oct 20 22:03:36 2007 New Revision: 29717 URL: http://svn.reactos.org/svn/reactos?rev=29717&view=rev Log: This header are need it for our owm dxg.h, This stuct can not be found in msdn. This struct are documented partly or full in Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw. I am great full to Alex to help figut and fill in the missing parts. Thank you. Added: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (with props) Added: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (added) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Sat Oct 20 22:03:36 2007 @@ -1,0 +1,125 @@ +// +// Surface Object Flags +// +#define DDPF_ALPHAPIXELS 0x0001 +#define DDPF_ALPHA 0x0002 +#define DDPF_FOURCC 0x0004 +#define DDPF_PALETTEINDEXED4 0x0008 +#define DDPF_PALETTEINDEXEDTO8 0x0010 +#define DDPF_PALETTEINDEXED8 0x0020 +#define DDPF_RGB 0x0040 +#define DDPF_COMPRESSED 0x0080 +#define DDPF_RGBTOYUV 0x0100 +#define DDPF_YUV 0x0200 +#define DDPF_ZBUFFER 0x0400 +#define DDPF_PALETTEINDEXED1 0x0800 +#define DDPF_PALETTEINDEXED2 0x1000 +#define DDPF_ZPIXELS 0x2000 + +// +// Surface Object +// +typedef struct _EDD_SURFACE +{ + // + // GDI Object Header + // + HANDLE hHmgr; + PVOID pEntry; + INT cExcLock; + HANDLE Tid; + + // + // Direct Draw Surface Data + // + DD_SURFACE_LOCAL ddsSurfaceLocal; + DD_SURCFACE_MORE ddsSurfaceMore; + DD_SURFACE_GLOBAL ddsSurfaceGlobal; + DD_SURFACE_INT ddsSurfaceInt; + + // + // Surface pointers + // + struct _EDD_SURFACE *peSurface_DdNext; + struct _EDD_SURFACE *peSurface_LockNext; + + // + // Unknown + // + ULONG field_C0; + + // + // Private Direct Draw Data + // + struct _EDD_DIRECTDRAW_GLOBAL* peDirectDrawGlobal; + struct _EDD_DIRECTDRAW_LOCAL* peDirectDrawLocal; + + // + // Flags + // + FLONG fl; + + // + // Surface Attributes + // + ULONG cLocks; + ULONG iVisRgnUniqueness; + BOOL bLost; + HANDLE hSecure; + HANDLE hdc; + HBITMAP hbmGdi; + + // + // Unknown + // + ULONG field_E8; + + // + // Surface Lock + // + ERECTL rclLock; + ULONG field_FC[2]; +} EDD_SURFACE, *PEDD_SURFACE; + + +typedef struct _EDD_DIRECTDRAW_GLOBAL +{ + PVOID dhpdev; + DWORD dwReserved1; + DWORD dwReserved2; + ULONG unk_000c[3]; + LONG cDriverReferences; + ULONG unk_01c[3]; + LONGLONG llAssertModeTimeout; + DWORD dwNumHeaps; + VIDEOMEMORY *pvmList; + DWORD dwNumFourCC; + PDWORD pdwFourCC; + DD_HHALINFO ddHalInfo; + ULONG unk_1e0[44]; + DD_CALLBACKS ddCallbacks; + DD_SURFACECALLBACKS ddSurfaceCallbacks; + DD_PALETTE_CALLBACKS ddPaletteCallbacks; + ULONG unk_314[48]; + D3DNTHAL_CALLBACKS d3dNtHalCallbacks; + ULONG unk_460[7]; + D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; + ULONG unk_498[18]; + DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; + ULONG unk_4ec[18]; + D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; + ULONG unk_54c[23]; + EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; + EDD_SURFACE* peSurface_LockList; + FLONG fl; + ULONG cSurfaceLocks; + PKEVENT pAssertModeEvent; + EDD_SURFACE *peSurfaceCurrent; + EDD_SURFACE *peSurfacePrimary; + BOOL bSuspended; + ULONG unk_5c8[12]; + RECTL rcbounds; + HDEV hDev; + ULONG unk_60c; +} EDD_DIRECTDRAW_GLOBAL, *PEDD_DIRECTDRAW_GLOBAL; + Propchange: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h ------------------------------------------------------------------------------ svn:eol-style = native

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