Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

18 Jul '06

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

1 0

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

18 Jul '06

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

1 0

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

18 Jul '06

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

1 0

[jimtabor] 23158: Little patch, help distinguish between Bitmap and Text drawing or do both. dwTypeData is a pointer going to the user not the true text pointer of the menu item and should not be used for checking if menu item has text.
by jimtabor＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: jimtabor Date: Tue Jul 18 21:29:34 2006 New Revision: 23158 URL: http://svn.reactos.org/svn/reactos?rev=23158&view=rev Log: Little patch, help distinguish between Bitmap and Text drawing or do both. dwTypeData is a pointer going to the user not the true text pointer of the menu item and should not be used for checking if menu item has text. Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntusrtyp.h (original) +++ trunk/reactos/include/reactos/win32k/ntusrtyp.h Tue Jul 18 21:29:34 2006 @@ -164,6 +164,8 @@ /* ----------- Extra ----------- */ RECT Rect; /* Item area (relative to menu window) */ UINT XTab; /* X position of text after Tab */ + LPWSTR Text; /* Copy of the text pointer in MenuItem->Text + */ } ROSMENUITEMINFO, *PROSMENUITEMINFO; #endif

1 0

[fireball] 23157: Add two more test cases into ex timer testing
by fireball＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: fireball Date: Tue Jul 18 20:49:11 2006 New Revision: 23157 URL: http://svn.reactos.org/svn/reactos?rev=23157&view=rev Log: Add two more test cases into ex timer testing Modified: trunk/reactos/drivers/test/kmtest/ntos_ex.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_e… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ex.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ex.c Tue Jul 18 20:49:11 2006 @@ -27,10 +27,23 @@ #include <ndk/ntndk.h> #include "kmtest.h" -#define NDEBUG +//#define NDEBUG #include "debug.h" /* PRIVATE FUNCTIONS ***********************************************************/ + +VOID +NTAPI +TestTimerApcRoutine(IN PVOID TimerContext, + IN ULONG TimerLowValue, + IN LONG TimerHighValue) + +{ + DPRINT("Timer Apc called!\n"); + ULONG *ApcCount = (ULONG *)TimerContext; + (*ApcCount)++; +} + VOID ExTimerTest() @@ -42,6 +55,7 @@ LARGE_INTEGER DueTime; BOOLEAN PreviousState, CurrentState; NTSTATUS Status; + ULONG ApcCount; StartTest(); @@ -88,7 +102,54 @@ ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); ok(CurrentState == TRUE, "Incorrect CurrentState returned when setting the timer"); - // TODO: Add tests for a timer with APC routines + // Test it with APC: Set, Cancel, check if APC has been called + ApcCount = 0; + DueTime.LowPart = -10000; + DueTime.HighPart = -10; + PreviousState = FALSE; + Status = ZwSetTimer(HandleOpened, &DueTime, + (PTIMER_APC_ROUTINE)TestTimerApcRoutine, &ApcCount, FALSE, + 0L, &PreviousState); + + ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); + ok(PreviousState == TRUE, "Incorrect PreviousState returned when setting the timer"); + + CurrentState = TRUE; + Status = ZwCancelTimer(HandleOpened, &CurrentState); + ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); + ok(CurrentState == FALSE, "Incorrect CurrentState returned when cancelling the timer"); + ok(ApcCount == 0, "Incorrect count of TimerApcRoutine calls: %ld, should be 0\n", ApcCount); + + // Test setting the timer two times in a row, APC routine must not be called + ApcCount = 0; + DueTime.LowPart = -10000; + DueTime.HighPart = -10; + PreviousState = TRUE; + Status = ZwSetTimer(HandleOpened, &DueTime, + (PTIMER_APC_ROUTINE)TestTimerApcRoutine, &ApcCount, FALSE, + 0L, &PreviousState); + ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); + ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); + + // Set small due time, since we have to wait for timer to finish + DueTime.LowPart = -10; + DueTime.HighPart = -1; + PreviousState = TRUE; + Status = ZwSetTimer(HandleOpened, &DueTime, + (PTIMER_APC_ROUTINE)TestTimerApcRoutine, &ApcCount, FALSE, + 0L, &PreviousState); + ok(Status == STATUS_SUCCESS, "ZwSetTimer failed with Status=0x%08lX", Status); + ok(PreviousState == FALSE, "Incorrect PreviousState returned when setting the timer"); + + // Now wait till it's finished, and then check APC call + Status = ZwWaitForSingleObject(HandleOpened, FALSE, NULL); + ok(Status == STATUS_SUCCESS, "ZwWaitForSingleObject failed with Status=0x%08lX", Status); + + CurrentState = FALSE; + Status = ZwCancelTimer(HandleOpened, &CurrentState); + ok(Status == STATUS_SUCCESS, "ZwCancelTimer failed with Status=0x%08lX", Status); + ok(CurrentState == TRUE, "Incorrect CurrentState returned when cancelling the timer"); + ok(ApcCount == 1, "Incorrect count of TimerApcRoutine calls: %ld, should be 1\n", ApcCount); // Cleanup... Status = ZwClose(HandleOpened);

1 0

[greatlrd] 23156: pathc from w3seek : bug 1702 : Fix BitScanReverse()
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Tue Jul 18 20:36:54 2006 New Revision: 23156 URL: http://svn.reactos.org/svn/reactos?rev=23156&view=rev Log: pathc from w3seek : bug 1702 : Fix BitScanReverse() Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Jul 18 20:36:54 2006 @@ -3818,13 +3818,13 @@ BitScanReverse(OUT ULONG *Index, IN ULONG Mask) { - LONG OldBit; - __asm__ __volatile__("bsrl %1,%2\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Index) - :"Ir" (Mask) - : "memory"); - return OldBit; + BOOLEAN BitPosition = 0; + __asm__ __volatile__("bsrl %2,%0\n\t" + "setnz %1\n\t" + :"=&r" (*Index), "=r" (BitPosition) + :"rm" (Mask) + :"memory"); + return BitPosition; } #endif

1 0

[greatlrd] 23155: setup almost all info it need in DrvGetDirectDrawInfo, left todo is the rop table. and debugging see if everything went right. it is eunght for me continue on next step in debugging
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Tue Jul 18 19:57:42 2006 New Revision: 23155 URL: http://svn.reactos.org/svn/reactos?rev=23155&view=rev Log: setup almost all info it need in DrvGetDirectDrawInfo, left todo is the rop table. and debugging see if everything went right. it is eunght for me continue on next step in debugging Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/screen.c Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Tue Jul 18 19:57:42 2006 @@ -55,6 +55,8 @@ ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; ppdev->ddpfDisplay.dwFlags = DDPF_RGB; + ppdev->pvmList = NULL; + switch(ppdev->iDitherFormat) { case BMF_8BPP: @@ -135,8 +137,10 @@ OUT DWORD *pdwFourCC) { PPDEV ppdev = (PPDEV)dhpdev; - int i; - + LONG i; + DWORD heap = 1; /* we always alloc one heap */ + BOOL bDDrawHeap = FALSE; + if (ppdev == NULL) return FALSE; @@ -152,11 +156,21 @@ if (pdwNumFourCCCodes == NULL) return FALSE; - - /* rest some data */ + + /* Setup heap */ + if ( (ppdev->ScreenWidth < ppdev->MemWidth) || (ppdev->ScreenHeight < ppdev->MemHeight)) + { + bDDrawHeap = TRUE; + heap++; + } + + ppdev->dwHeap = heap; + *pdwNumHeaps = heap; + + /* We do not support other fourcc */ *pdwNumFourCCCodes = 0; - *pdwNumHeaps = 0; - + + /* check see if pvmList and pdwFourCC are frist call or frist. Secon call we fill in pHalInfo info @@ -218,8 +232,28 @@ } } - /* Now fix the memory alloc and other stuff */ - + /* Now build pvmList info */ + if(pvmList) + { + ppdev->pvmList = pvmList; + + if ( bDDrawHeap == TRUE) + { + pvmList->dwFlags = VIDMEM_ISLINEAR ; + pvmList->fpStart = ppdev->ScreenHeight * ppdev->ScreenDelta; + pvmList->fpEnd = ppdev->MemHeight * ppdev->ScreenDelta - 1; + pvmList->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + pvmList++; + } + + pvmList->fpStart = 0; + pvmList->fpEnd = (ppdev->MemHeight * ppdev->ScreenDelta) - 1; + pvmList->dwFlags = VIDMEM_ISNONLOCAL | VIDMEM_ISLINEAR | VIDMEM_ISWC; + pvmList->ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER ; + pvmList->ddsCapsAlt.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER; + + pvmList = ppdev->pvmList; + } return TRUE; } 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 Tue Jul 18 19:57:42 2006 @@ -65,9 +65,12 @@ /* DirectX Support */ DWORD iDitherFormat; ULONG MemHeight; + ULONG MemWidth; + DWORD dwHeap; + VIDEOMEMORY* pvmList; BOOL bDDInitialized; DDPIXELFORMAT ddpfDisplay; - DDHALINFO dxHalInfo; + DDHALINFO dxHalInfo; } PDEV, *PPDEV; #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) 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 Tue Jul 18 19:57:42 2006 @@ -191,6 +191,7 @@ ppdev->ScreenDelta = SelectedMode->ScreenStride; ppdev->BitsPerPixel = SelectedMode->BitsPerPlane * SelectedMode->NumberOfPlanes; + ppdev->MemWidth = SelectedMode->VideoMemoryBitmapWidth; ppdev->MemHeight = SelectedMode->VideoMemoryBitmapHeight; ppdev->RedMask = SelectedMode->RedMask;

1 0

[hpoussin] 23154: Disable a few more warnings when using pshpackX.h/poppack.h
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 19:50:13 2006 New Revision: 23154 URL: http://svn.reactos.org/svn/reactos?rev=23154&view=rev Log: Disable a few more warnings when using pshpackX.h/poppack.h Modified: trunk/reactos/include/psdk/pshpack1.h trunk/reactos/include/psdk/pshpack2.h trunk/reactos/include/psdk/pshpack4.h trunk/reactos/include/psdk/pshpack8.h trunk/reactos/include/psdk/pshpck16.h Modified: trunk/reactos/include/psdk/pshpack1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack1.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack1.h (original) +++ trunk/reactos/include/psdk/pshpack1.h Tue Jul 18 19:50:13 2006 @@ -1,4 +1,7 @@ #ifndef RC_INVOKED +#if ( _MSC_VER >= 800 ) +#pragma warning(disable:4103) +#endif // _MSC_VER # if ( __FreeBSD__ == 5 ) # pragma pack(1) # else Modified: trunk/reactos/include/psdk/pshpack2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack2.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack2.h (original) +++ trunk/reactos/include/psdk/pshpack2.h Tue Jul 18 19:50:13 2006 @@ -1,4 +1,7 @@ #ifndef RC_INVOKED +#if ( _MSC_VER >= 800 ) +#pragma warning(disable:4103) +#endif // _MSC_VER # if ( __FreeBSD__ == 5 ) # pragma pack(2) # else Modified: trunk/reactos/include/psdk/pshpack4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack4.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack4.h (original) +++ trunk/reactos/include/psdk/pshpack4.h Tue Jul 18 19:50:13 2006 @@ -1,4 +1,7 @@ #ifndef RC_INVOKED +#if ( _MSC_VER >= 800 ) +#pragma warning(disable:4103) +#endif // _MSC_VER # if ( __FreeBSD__ == 5 ) # pragma pack(4) # else Modified: trunk/reactos/include/psdk/pshpack8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack8.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack8.h (original) +++ trunk/reactos/include/psdk/pshpack8.h Tue Jul 18 19:50:13 2006 @@ -1,4 +1,7 @@ #ifndef RC_INVOKED +#if ( _MSC_VER >= 800 ) +#pragma warning(disable:4103) +#endif // _MSC_VER # if ( __FreeBSD__ == 5 ) # pragma pack(8) # else Modified: trunk/reactos/include/psdk/pshpck16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpck16.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpck16.h (original) +++ trunk/reactos/include/psdk/pshpck16.h Tue Jul 18 19:50:13 2006 @@ -1,4 +1,7 @@ #ifndef RC_INVOKED +#if ( _MSC_VER >= 800 ) +#pragma warning(disable:4103) +#endif // _MSC_VER # if ( __FreeBSD__ == 5 ) # pragma pack(16) # else

1 0

[hpoussin] 23153: Fix headers, so MSVC can use them
by hpoussin＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: hpoussin Date: Tue Jul 18 19:30:22 2006 New Revision: 23153 URL: http://svn.reactos.org/svn/reactos?rev=23153&view=rev Log: Fix headers, so MSVC can use them Modified: trunk/reactos/include/crt/excpt.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=23… ============================================================================== --- trunk/reactos/include/crt/excpt.h (original) +++ trunk/reactos/include/crt/excpt.h Tue Jul 18 19:30:22 2006 @@ -56,6 +56,8 @@ * The type of function that is expected as an exception handler to be * installed with _try1. */ +struct _CONTEXT; +struct _EXCEPTION_RECORD; typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h (original) +++ trunk/reactos/include/psdk/windef.h Tue Jul 18 19:30:22 2006 @@ -137,13 +137,21 @@ #endif #endif -#ifndef NOMINMAX +#if defined(_MSC_VER) && defined(__cplusplus) + +#include <stdlib.h> +#define min __min +#define max __max + +#elif !defined(NOMINMAX) + #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) #endif #ifndef min #define min(a,b) ((a)<(b)?(a):(b)) #endif + #endif #define UNREFERENCED_PARAMETER(P) {(P)=(P);}

1 0

[ion] 23152: [AUDIT] security.c is mostly composed of trivial implementations of APIs that transfer one set of data from another, or simply wrap around complex Se* functions which do the actual work. There are one or two slightly more complex APIs (~15-20 lines), but they were written by Eric/Thomas, which are well-known for always writing clean code. [FORMATTING] Re-formatted file properly, ordered functions and annotated them, added proper programmer credits, etc. - Pushlocks need to be acquir
by ion＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: ion Date: Tue Jul 18 19:13:55 2006 New Revision: 23152 URL: http://svn.reactos.org/svn/reactos?rev=23152&view=rev Log: [AUDIT] security.c is mostly composed of trivial implementations of APIs that transfer one set of data from another, or simply wrap around complex Se* functions which do the actual work. There are one or two slightly more complex APIs (~15-20 lines), but they were written by Eric/Thomas, which are well-known for always writing clean code. [FORMATTING] Re-formatted file properly, ordered functions and annotated them, added proper programmer credits, etc. - Pushlocks need to be acquired in a -critical-, not -guarded- region. - PsDisableImpersonation should return FALSE if it was already disbled. - Don't forget to reference the token in PsReferenceEffectiveToken. - PsImpersonateClient should still return success if it was given no token. - PsImperstonateClient should de-reference the token if there is already active impersonation info. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ps/security.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Tue Jul 18 19:13:55 2006 @@ -29,6 +29,7 @@ // - Use Process Pushlock Locks. // - Use Safe Referencing in PsGetNextProcess/Thread. // - Use Guarded Mutex instead of Fast Mutex for Active Process Locks. +// - Use Security Locks in security.c // - Fix referencing problem. // - Generate process cookie for user-more thread. // - Add security calls where necessary. Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Tue Jul 18 19:13:55 2006 @@ -130,6 +130,7 @@ /* formerly located in ps/cid.c */ #define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O') +#define TAG_PS_IMPERSONATION TAG('P', 's', 'I', 'm') /* formerly located in ps/job.c */ #define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */ Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Tue Jul 18 19:13:55 2006 @@ -1,10 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ps/security.c - * PURPOSE: Process Manager Security (Tokens, Impersionation) - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PURPOSE: Process Manager: Process/Thread Security + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -13,15 +14,15 @@ #define NDEBUG #include <internal/debug.h> -/* INTERNAL ******************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ /* FIXME: Turn into Macro */ VOID -STDCALL -PspLockProcessSecurityShared(PEPROCESS Process) -{ - /* Enter a Guarded Region */ - KeEnterGuardedRegion(); +NTAPI +PspLockProcessSecurityShared(IN PEPROCESS Process) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); /* Lock the Process */ //ExAcquirePushLockShared(&Process->ProcessLock); @@ -29,14 +30,14 @@ /* FIXME: Turn into Macro */ VOID -STDCALL -PspUnlockProcessSecurityShared(PEPROCESS Process) +NTAPI +PspUnlockProcessSecurityShared(IN PEPROCESS Process) { /* Unlock the Process */ //ExReleasePushLockShared(&Process->ProcessLock); - /* Leave Guarded Region */ - KeLeaveGuardedRegion(); + /* Leave Critical Region */ + KeLeaveCriticalRegion(); } VOID @@ -73,153 +74,10 @@ } } -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -NTSTATUS -STDCALL -NtOpenProcessToken(IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE TokenHandle) -{ - return NtOpenProcessTokenEx(ProcessHandle, - DesiredAccess, - 0, - TokenHandle); -} - -/* - * @implemented - */ -NTSTATUS -STDCALL -NtOpenProcessTokenEx(IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - OUT PHANDLE TokenHandle) -{ - PACCESS_TOKEN Token; - HANDLE hToken; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(TokenHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = PsOpenTokenOfProcess(ProcessHandle, - &Token); - if(NT_SUCCESS(Status)) - { - Status = ObOpenObjectByPointer(Token, - 0, - NULL, - DesiredAccess, - SepTokenObjectType, - PreviousMode, - &hToken); - ObDereferenceObject(Token); - - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *TokenHandle = hToken; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; -} - -/* - * @implemented - */ -PACCESS_TOKEN -STDCALL -PsReferencePrimaryToken(PEPROCESS Process) -{ - PACCESS_TOKEN Token; - - /* Fast Reference the Token */ - Token = ObFastReferenceObject(&Process->Token); - - /* Check if we got the Token or if we got locked */ - if (!Token) - { - /* Lock the Process */ - PspLockProcessSecurityShared(Process); - - /* Do a Locked Fast Reference */ - Token = ObFastReferenceObjectLocked(&Process->Token); - - /* Unlock the Process */ - PspUnlockProcessSecurityShared(Process); - } - - /* Return the Token */ - return Token; -} - -/* - * @implemented - */ -NTSTATUS -STDCALL -PsOpenTokenOfProcess(HANDLE ProcessHandle, - PACCESS_TOKEN* Token) -{ - PEPROCESS Process; - NTSTATUS Status; - - /* Get the Token */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - PsProcessType, - ExGetPreviousMode(), - (PVOID*)&Process, - NULL); - - /* Reference it */ - if(NT_SUCCESS(Status)) { - - *Token = PsReferencePrimaryToken(Process); - ObDereferenceObject(Process); - } - - /* Return */ - return Status; -} - -NTSTATUS -STDCALL -PspInitializeProcessSecurity(PEPROCESS Process, - PEPROCESS Parent OPTIONAL) +NTSTATUS +NTAPI +PspInitializeProcessSecurity(IN PEPROCESS Process, + IN PEPROCESS Parent OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; PTOKEN NewToken, ParentToken; @@ -258,86 +116,233 @@ return Status; } - -NTSTATUS -STDCALL -PspAssignPrimaryToken(PEPROCESS Process, - HANDLE TokenHandle) -{ - PACCESS_TOKEN Token; - PACCESS_TOKEN OldToken; +NTSTATUS +NTAPI +PspAssignPrimaryToken(IN PEPROCESS Process, + IN HANDLE TokenHandle) +{ + PACCESS_TOKEN Token, OldToken; NTSTATUS Status; /* Reference the Token */ Status = ObReferenceObjectByHandle(TokenHandle, - 0, + TOKEN_ASSIGN_PRIMARY, SepTokenObjectType, KeGetPreviousMode(), (PVOID*)&Token, NULL); - if (!NT_SUCCESS(Status)) { - - return(Status); - } + if (!NT_SUCCESS(Status)) return Status; /* Exchange them */ Status = SeExchangePrimaryToken(Process, Token, &OldToken); /* Derefernece Tokens and Return */ ObDereferenceObject(Token); - return(Status); -} - -/* - * @implemented - */ -NTSTATUS -STDCALL -PsAssignImpersonationToken(PETHREAD Thread, - HANDLE TokenHandle) + return Status; +} + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtOpenProcessToken(IN HANDLE ProcessHandle, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE TokenHandle) +{ + /* Call the newer API */ + return NtOpenProcessTokenEx(ProcessHandle, + DesiredAccess, + 0, + TokenHandle); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtOpenProcessTokenEx(IN HANDLE ProcessHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG HandleAttributes, + OUT PHANDLE TokenHandle) +{ + PACCESS_TOKEN Token; + HANDLE hToken; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check if caller was user-mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the token handle */ + ProbeForWriteHandle(TokenHandle); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Open the process token */ + Status = PsOpenTokenOfProcess(ProcessHandle, &Token); + if(NT_SUCCESS(Status)) + { + /* Reference it by handle and dereference the pointer */ + Status = ObOpenObjectByPointer(Token, + 0, + NULL, + DesiredAccess, + SepTokenObjectType, + PreviousMode, + &hToken); + ObDereferenceObject(Token); + + /* Make sure we got a handle */ + if(NT_SUCCESS(Status)) + { + /* Enter SEH for write */ + _SEH_TRY + { + /* Return the handle */ + *TokenHandle = hToken; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + + /* Return status */ + return Status; +} + +/* + * @implemented + */ +PACCESS_TOKEN +NTAPI +PsReferencePrimaryToken(PEPROCESS Process) +{ + PACCESS_TOKEN Token; + + /* Fast Reference the Token */ + Token = ObFastReferenceObject(&Process->Token); + + /* Check if we got the Token or if we got locked */ + if (!Token) + { + /* Lock the Process */ + PspLockProcessSecurityShared(Process); + + /* Do a Locked Fast Reference */ + Token = ObFastReferenceObjectLocked(&Process->Token); + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); + } + + /* Return the Token */ + return Token; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsOpenTokenOfProcess(IN HANDLE ProcessHandle, + OUT PACCESS_TOKEN* Token) +{ + PEPROCESS Process; + NTSTATUS Status; + + /* Get the Token */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + ExGetPreviousMode(), + (PVOID*)&Process, + NULL); + if(NT_SUCCESS(Status)) + { + /* Reference the token and dereference the process */ + *Token = PsReferencePrimaryToken(Process); + ObDereferenceObject(Process); + } + + /* Return */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsAssignImpersonationToken(IN PETHREAD Thread, + IN HANDLE TokenHandle) { PACCESS_TOKEN Token; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; NTSTATUS Status; - if (TokenHandle != NULL) { - + /* Check if we were given a handle */ + if (TokenHandle) + { + /* Get the token object */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_IMPERSONATE, SepTokenObjectType, KeGetPreviousMode(), (PVOID*)&Token, NULL); - - if (!NT_SUCCESS(Status)) { - - return(Status); - } - + if (!NT_SUCCESS(Status)) return(Status); + + /* Get the impersionation level */ ImpersonationLevel = SeTokenImpersonationLevel(Token); - - } else { - + } + else + { + /* Otherwise, clear values */ Token = NULL; ImpersonationLevel = 0; } + /* Call the impersonation API */ Status = PsImpersonateClient(Thread, Token, FALSE, FALSE, ImpersonationLevel); - if (Token != NULL) ObDereferenceObject(Token); + /* Dereference the token and return status */ + if (Token) ObDereferenceObject(Token); return Status; } /* * @implemented */ -VOID STDCALL -PsRevertToSelf (VOID) -{ +VOID +NTAPI +PsRevertToSelf(VOID) +{ + /* Call the per-thread API */ PsRevertThreadToSelf(PsGetCurrentThread()); } @@ -345,11 +350,13 @@ * @implemented */ VOID -STDCALL +NTAPI PsRevertThreadToSelf(IN PETHREAD Thread) { - if (Thread->ActiveImpersonationInfo == TRUE) { - + /* Make sure we had impersonation information */ + if (Thread->ActiveImpersonationInfo) + { + /* Dereference the impersonation token and set it as false */ ObDereferenceObject (Thread->ImpersonationInfo->Token); Thread->ActiveImpersonationInfo = FALSE; } @@ -359,59 +366,85 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI PsImpersonateClient(IN PETHREAD Thread, IN PACCESS_TOKEN Token, IN BOOLEAN CopyOnOpen, IN BOOLEAN EffectiveOnly, IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { - - if (Token == NULL) { - - if (Thread->ActiveImpersonationInfo == TRUE) { - + PPS_IMPERSONATION_INFORMATION Impersonation; + + /* Check if we don't have a token */ + if (!Token) + { + /* Make sure we're impersonating */ + if (Thread->ActiveImpersonationInfo) + { + /* Disable impersonation and check for token */ Thread->ActiveImpersonationInfo = FALSE; - - if (Thread->ImpersonationInfo->Token != NULL) { - - ObDereferenceObject (Thread->ImpersonationInfo->Token); + if (Thread->ImpersonationInfo->Token) + { + /* Dereference it */ + ObDereferenceObject(Thread->ImpersonationInfo->Token); } } - return STATUS_UNSUCCESSFUL; - } - - if (Thread->ImpersonationInfo == NULL) { - - Thread->ImpersonationInfo = ExAllocatePool(NonPagedPool, - sizeof(PS_IMPERSONATION_INFORMATION)); - } - - Thread->ImpersonationInfo->ImpersonationLevel = ImpersonationLevel; - Thread->ImpersonationInfo->CopyOnOpen = CopyOnOpen; - Thread->ImpersonationInfo->EffectiveOnly = EffectiveOnly; - Thread->ImpersonationInfo->Token = Token; - - ObReferenceObject(Token); - + /* Return success */ + return STATUS_SUCCESS; + } + + /* Check if we have active impersonation */ + if (Thread->ActiveImpersonationInfo) + { + /* Reuse the block and reference the token */ + Impersonation = Thread->ImpersonationInfo; + if (Impersonation->Token) ObDereferenceObject(Impersonation->Token); + } + else if (Thread->ImpersonationInfo) + { + /* It's not active, but we can still reuse the block */ + Impersonation = Thread->ImpersonationInfo; + } + else + { + /* We need to allocate a new one */ + Impersonation = ExAllocatePoolWithTag(PagedPool, + sizeof(*Impersonation), + TAG_PS_IMPERSONATION); + if (!Impersonation) return STATUS_INSUFFICIENT_RESOURCES; + + /* Update the pointer */ + Thread->ImpersonationInfo = Impersonation; + } + + /* Now fill it out */ + Impersonation->ImpersonationLevel = ImpersonationLevel; + Impersonation->CopyOnOpen = CopyOnOpen; + Impersonation->EffectiveOnly = EffectiveOnly; + Impersonation->Token = Token; Thread->ActiveImpersonationInfo = TRUE; + /* Reference the token and return success */ + ObReferenceObject(Impersonation->Token); return STATUS_SUCCESS; } - +/* + * @implemented + */ PACCESS_TOKEN -STDCALL -PsReferenceEffectiveToken(PETHREAD Thread, - PTOKEN_TYPE TokenType, - PBOOLEAN EffectiveOnly, - PSECURITY_IMPERSONATION_LEVEL Level) +NTAPI +PsReferenceEffectiveToken(IN PETHREAD Thread, + OUT IN PTOKEN_TYPE TokenType, + OUT PBOOLEAN EffectiveOnly, + OUT PSECURITY_IMPERSONATION_LEVEL Level) { PEPROCESS Process; PACCESS_TOKEN Token; - if (Thread->ActiveImpersonationInfo == FALSE) + /* Check if we don't have impersonation info */ + if (!Thread->ActiveImpersonationInfo) { Process = Thread->ThreadsProcess; *TokenType = TokenPrimary; @@ -435,146 +468,64 @@ } else { + /* Get the token */ Token = Thread->ImpersonationInfo->Token; + ObReferenceObject(Token); + + /* Return data to caller */ *TokenType = TokenImpersonation; *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; *Level = Thread->ImpersonationInfo->ImpersonationLevel; } + /* Return the token */ return Token; } -NTSTATUS -STDCALL -NtImpersonateThread(IN HANDLE ThreadHandle, - IN HANDLE ThreadToImpersonateHandle, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService) -{ - SECURITY_QUALITY_OF_SERVICE SafeServiceQoS; - SECURITY_CLIENT_CONTEXT ClientContext; - PETHREAD Thread; - PETHREAD ThreadToImpersonate; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForRead(SecurityQualityOfService, - sizeof(SECURITY_QUALITY_OF_SERVICE), - sizeof(ULONG)); - SafeServiceQoS = *SecurityQualityOfService; - SecurityQualityOfService = &SafeServiceQoS; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_IMPERSONATE, - PsThreadType, - PreviousMode, - (PVOID*)&Thread, - NULL); - if(NT_SUCCESS(Status)) - { - Status = ObReferenceObjectByHandle(ThreadToImpersonateHandle, - THREAD_DIRECT_IMPERSONATION, - PsThreadType, - PreviousMode, - (PVOID*)&ThreadToImpersonate, - NULL); - if(NT_SUCCESS(Status)) - { - Status = SeCreateClientSecurity(ThreadToImpersonate, - SecurityQualityOfService, - 0, - &ClientContext); - if(NT_SUCCESS(Status)) - { - SeImpersonateClient(&ClientContext, - Thread); - if(ClientContext.ClientToken != NULL) - { - ObDereferenceObject (ClientContext.ClientToken); - } - } - - ObDereferenceObject(ThreadToImpersonate); - } - ObDereferenceObject(Thread); - } - - return Status; -} - /* * @implemented */ PACCESS_TOKEN -STDCALL +NTAPI PsReferenceImpersonationToken(IN PETHREAD Thread, OUT PBOOLEAN CopyOnOpen, OUT PBOOLEAN EffectiveOnly, OUT PSECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { - - if (Thread->ActiveImpersonationInfo == FALSE) { - - return NULL; - } - + /* If we don't have impersonation info, just quit */ + if (!Thread->ActiveImpersonationInfo) return NULL; + + /* Return data from caller */ *ImpersonationLevel = Thread->ImpersonationInfo->ImpersonationLevel; *CopyOnOpen = Thread->ImpersonationInfo->CopyOnOpen; *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; - ObReferenceObjectByPointer(Thread->ImpersonationInfo->Token, - TOKEN_ALL_ACCESS, - SepTokenObjectType, - KernelMode); - + /* Reference the token and return it */ + ObReferenceObject(Thread->ImpersonationInfo->Token); return Thread->ImpersonationInfo->Token; } -#ifdef PsDereferencePrimaryToken #undef PsDereferenceImpersonationToken -#endif -/* - * @implemented - */ -VOID -STDCALL +/* + * @implemented + */ +VOID +NTAPI PsDereferenceImpersonationToken(IN PACCESS_TOKEN ImpersonationToken) { - if (ImpersonationToken) { - - ObDereferenceObject(ImpersonationToken); - } -} - -#ifdef PsDereferencePrimaryToken + /* If we got a token, dereference it */ + if (ImpersonationToken) ObDereferenceObject(ImpersonationToken); +} + #undef PsDereferencePrimaryToken -#endif -/* - * @implemented - */ -VOID -STDCALL +/* + * @implemented + */ +VOID +NTAPI PsDereferencePrimaryToken(IN PACCESS_TOKEN PrimaryToken) { + /* Dereference the token*/ ObDereferenceObject(PrimaryToken); } @@ -582,30 +533,32 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI PsDisableImpersonation(IN PETHREAD Thread, IN PSE_IMPERSONATION_STATE ImpersonationState) { - if (Thread->ActiveImpersonationInfo == FALSE) { + PPS_IMPERSONATION_INFORMATION Impersonation; + + /* Check if we don't have impersonation */ + if (!Thread->ActiveImpersonationInfo) + { + /* Clear everything */ ImpersonationState->Token = NULL; ImpersonationState->CopyOnOpen = FALSE; ImpersonationState->EffectiveOnly = FALSE; - ImpersonationState->Level = 0; - return TRUE; - } - -/* FIXME */ -/* ExfAcquirePushLockExclusive(&Thread->ThreadLock); */ - + ImpersonationState->Level = SecurityAnonymous; + return FALSE; + } + + /* Copy the old state */ + Impersonation = Thread->ImpersonationInfo; + ImpersonationState->Token = Impersonation->Token; + ImpersonationState->CopyOnOpen = Impersonation->CopyOnOpen; + ImpersonationState->EffectiveOnly = Impersonation->EffectiveOnly; + ImpersonationState->Level = Impersonation->ImpersonationLevel; + + /* Disable impersonation and return true */ Thread->ActiveImpersonationInfo = FALSE; - ImpersonationState->Token = Thread->ImpersonationInfo->Token; - ImpersonationState->CopyOnOpen = Thread->ImpersonationInfo->CopyOnOpen; - ImpersonationState->EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; - ImpersonationState->Level = Thread->ImpersonationInfo->ImpersonationLevel; - -/* FIXME */ -/* ExfReleasePushLock(&Thread->ThreadLock); */ - return TRUE; } @@ -613,18 +566,104 @@ * @implemented */ VOID -STDCALL +NTAPI PsRestoreImpersonation(IN PETHREAD Thread, IN PSE_IMPERSONATION_STATE ImpersonationState) { - + /* Call the impersonation API */ PsImpersonateClient(Thread, ImpersonationState->Token, ImpersonationState->CopyOnOpen, ImpersonationState->EffectiveOnly, ImpersonationState->Level); - ObfDereferenceObject(ImpersonationState->Token); -} - + /* Dereference the token */ + ObDereferenceObject(ImpersonationState->Token); +} + +NTSTATUS +NTAPI +NtImpersonateThread(IN HANDLE ThreadHandle, + IN HANDLE ThreadToImpersonateHandle, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService) +{ + SECURITY_QUALITY_OF_SERVICE SafeServiceQoS; + SECURITY_CLIENT_CONTEXT ClientContext; + PETHREAD Thread; + PETHREAD ThreadToImpersonate; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check if call came from user mode */ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe QoS */ + ProbeForRead(SecurityQualityOfService, + sizeof(SECURITY_QUALITY_OF_SERVICE), + sizeof(ULONG)); + + /* Capture it */ + SafeServiceQoS = *SecurityQualityOfService; + SecurityQualityOfService = &SafeServiceQoS; + } + _SEH_HANDLE + { + /* Get exception status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Reference the thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_IMPERSONATE, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if(NT_SUCCESS(Status)) + { + /* Reference the impersonating thead */ + Status = ObReferenceObjectByHandle(ThreadToImpersonateHandle, + THREAD_DIRECT_IMPERSONATION, + PsThreadType, + PreviousMode, + (PVOID*)&ThreadToImpersonate, + NULL); + if(NT_SUCCESS(Status)) + { + /* Create a client security context */ + Status = SeCreateClientSecurity(ThreadToImpersonate, + SecurityQualityOfService, + 0, + &ClientContext); + if(NT_SUCCESS(Status)) + { + /* Do the impersonation */ + SeImpersonateClient(&ClientContext, Thread); + if(ClientContext.ClientToken) + { + /* Dereference the client token if we had one */ + ObDereferenceObject(ClientContext.ClientToken); + } + } + + /* Dereference the thread to impersonate */ + ObDereferenceObject(ThreadToImpersonate); + } + + /* Dereference the main thread */ + ObDereferenceObject(Thread); + } + + /* Return status */ + return Status; +} /* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/security.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

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