Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 44661: [SETUPAPI] - Implement SetupDiOpenDeviceInterfaceRegKey
by janderwald＠svn.reactos.org 20 Dec '09

20 Dec '09

Author: janderwald Date: Sun Dec 20 01:53:21 2009 New Revision: 44661 URL: http://svn.reactos.org/svn/reactos?rev=44661&view=rev Log: [SETUPAPI] - Implement SetupDiOpenDeviceInterfaceRegKey Modified: trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Sun Dec 20 01:53:21 2009 @@ -337,11 +337,9 @@ IN HDEVINFO DeviceInfoSet, IN struct DeviceInfo *devInfo) { - BOOL ret; HKEY hKey, hRefKey; LPWSTR Path; SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; - PLIST_ENTRY InterfaceListEntry; struct DeviceInterface *DevItf = NULL; if (InterfaceFlags != 0) @@ -425,6 +423,8 @@ SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && DeviceInfoData->Reserved == 0) + SetLastError(ERROR_INVALID_USER_BUFFER); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); else @@ -537,3 +537,87 @@ TRACE("Returning %d\n", ret); return ret; } + +HKEY WINAPI +SetupDiOpenDeviceInterfaceRegKey( + IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN DWORD Reserved, IN REGSAM samDesired) +{ + HKEY hKey = INVALID_HANDLE_VALUE, hDevKey; + struct DeviceInfoSet * list; + + TRACE("%p %p %p 0x%08x 0x%08x)\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!DeviceInterfaceData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInterfaceData && DeviceInterfaceData->Reserved == 0) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInterfaceData && DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + struct DeviceInterface *DevItf; + LPWSTR Path, Guid, Slash; + DWORD Length; + DevItf = (struct DeviceInterface *)DeviceInterfaceData->Reserved; + + Length = wcslen(DevItf->SymbolicLink); + + Path = HeapAlloc(GetProcessHeap(), 0, (Length+2) * sizeof(WCHAR)); + if (!Path) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + wcscpy(Path, DevItf->SymbolicLink); + + Guid = wcsrchr(Path, '}'); + Slash = wcsrchr(Path, '\\'); + if (!Guid || !Slash) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + if ((ULONG_PTR)Slash > (ULONG_PTR)Guid) + { + /* Create an extra slash */ + memmove(Slash+1, Slash, (wcslen(Slash) + 1) * sizeof(WCHAR)); + Slash[1] = L'#'; + } + + Guid = Path; + while((ULONG_PTR)Guid < (ULONG_PTR)Slash) + { + if (*Guid == L'\\') + *Guid = L'#'; + + Guid++; + } + + hKey = SetupDiOpenClassRegKeyExW(&DeviceInterfaceData->InterfaceClassGuid, samDesired, DIOCR_INTERFACE, NULL, NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + if (RegOpenKeyExW(hKey, Path, 0, samDesired, &hDevKey) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + hKey = hDevKey; + } + else + { + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; + } + } + + HeapFree(GetProcessHeap(), 0, Path); + } + + return hKey; +} Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sun Dec 20 01:53:21 2009 @@ -241,8 +241,4 @@ return FALSE; } -HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN DWORD Reserved, IN REGSAM samDesired) -{ - FIXME("%p %p %p 0x%08x 0x%08x: stub\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired); - return INVALID_HANDLE_VALUE; -} +

1 0

[janderwald] 44660: [MMIXER] - Fix buffer overflow
by janderwald＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: janderwald Date: Sat Dec 19 22:44:39 2009 New Revision: 44660 URL: http://svn.reactos.org/svn/reactos?rev=44660&view=rev Log: [MMIXER] - Fix buffer overflow Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Dec 19 22:44:39 2009 @@ -576,8 +576,12 @@ if (LineName) { - wcscpy(DestinationLine->Line.szShortName, LineName); - wcscpy(DestinationLine->Line.szName, LineName); + MixerContext->Copy(DestinationLine->Line.szShortName, LineName, (min(MIXER_SHORT_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR)); + DestinationLine->Line.szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + + MixerContext->Copy(DestinationLine->Line.szName, LineName, (min(MIXER_LONG_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR)); + DestinationLine->Line.szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + } else {

1 0

[janderwald] 44659: [MMIXER] - Fix broken check in MMixerAddMixerControl, which only copied the node name on failure - Add initialization of LineControlsExtraDat LIST_ENTRY type, which resulted in a crash
by janderwald＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: janderwald Date: Sat Dec 19 21:45:29 2009 New Revision: 44659 URL: http://svn.reactos.org/svn/reactos?rev=44659&view=rev Log: [MMIXER] - Fix broken check in MMixerAddMixerControl, which only copied the node name on failure - Add initialization of LineControlsExtraDat LIST_ENTRY type, which resulted in a crash Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Dec 19 21:45:29 2009 @@ -207,7 +207,8 @@ /* get node name */ Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); - if (Status != MM_STATUS_SUCCESS) + + if (Status == MM_STATUS_SUCCESS) { MixerContext->Copy(MixerControl->szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); MixerControl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; @@ -300,7 +301,6 @@ { MixerContext->Free(Desc); MixerContext->Free(VolumeData); - return MM_STATUS_NO_MEMORY; } @@ -315,7 +315,6 @@ } MixerContext->Free(Desc); } - DPRINT("Status %x Name %S\n", Status, MixerControl->szName); return MM_STATUS_SUCCESS; @@ -594,6 +593,8 @@ DestinationLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; wcscpy(DestinationLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); + // initialize extra line + InitializeListHead(&DestinationLine->LineControlsExtraData); // insert into mixer info InsertHeadList(&MixerInfo->LineList, &DestinationLine->Entry); @@ -988,7 +989,7 @@ IN LPMIXER_DATA MixerData, IN PULONG DeviceCount) { - PKSMULTIPLE_ITEM NodeTypes, NodeConnections; + PKSMULTIPLE_ITEM NodeTypes = NULL, NodeConnections = NULL; MIXER_STATUS Status; ULONG PinCount; ULONG NodeIndex; @@ -1016,6 +1017,7 @@ } // check if the filter has an wave out node + NodeIndex = MMixerGetIndexOfGuid(NodeTypes, &KSNODETYPE_DAC); if (NodeIndex != MAXULONG) {

1 0

[janderwald] 44658: [KS] - Return correct status code
by janderwald＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: janderwald Date: Sat Dec 19 21:42:48 2009 New Revision: 44658 URL: http://svn.reactos.org/svn/reactos?rev=44658&view=rev Log: [KS] - Return correct status code Modified: trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Sat Dec 19 21:42:48 2009 @@ -308,7 +308,7 @@ if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); - Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_MORE_ENTRIES; ExFreePool(KeyInfo); break; }

1 0

[gschneider] 44657: [gdi32] Use predefined unimplemented macro for stubs, correct header paths
by gschneider＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: gschneider Date: Sat Dec 19 20:07:36 2009 New Revision: 44657 URL: http://svn.reactos.org/svn/reactos?rev=44657&view=rev Log: [gdi32] Use predefined unimplemented macro for stubs, correct header paths Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat Dec 19 20:07:36 2009 @@ -1,6 +1,5 @@ -/* $Id$ - * - * reactos/lib/gdi32/misc/stubs.c +/* + * dll/win32/gdi32/misc/stubs.c * * GDI32.DLL Stubs * @@ -10,6 +9,7 @@ */ #include "precomp.h" +#include <debug.h> #define SIZEOF_DEVMODEA_300 124 #define SIZEOF_DEVMODEA_400 148 @@ -17,8 +17,6 @@ #define SIZEOF_DEVMODEW_300 188 #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220 - -#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] Sat Dec 19 20:07:36 2009 @@ -1,6 +1,5 @@ -/* $Id$ - * - * reactos/lib/gdi32/misc/stubs.c +/* + * dll/win32/gdi32/misc/stubsa.c * * GDI32.DLL Stubs for ANSI functions * @@ -10,8 +9,8 @@ */ #include "precomp.h" +#include <debug.h> -#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c [iso-8859-1] Sat Dec 19 20:07:36 2009 @@ -1,6 +1,5 @@ -/* $Id$ - * - * reactos/lib/gdi32/misc/stubs.c +/* + * dll/win32/gdi32/misc/stubsw.c * * GDI32.DLL Stubs for Unicode functions * @@ -10,10 +9,7 @@ */ #include "precomp.h" - -#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); - - +#include <debug.h> /*

1 0

[gschneider] 44656: [win32k] Add parameter checks for NtGdiSetVirtualResolution
by gschneider＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: gschneider Date: Sat Dec 19 19:57:27 2009 New Revision: 44656 URL: http://svn.reactos.org/svn/reactos?rev=44656&view=rev Log: [win32k] Add parameter checks for NtGdiSetVirtualResolution Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sat Dec 19 19:57:27 2009 @@ -1024,7 +1024,20 @@ PDC dc; PDC_ATTR pdcattr; - // Need test types for zeros and non zeros + /* Check parameters (all zeroes resets to real resolution) */ + if (cxVirtualDevicePixel == 0 && cyVirtualDevicePixel == 0 && + cxVirtualDeviceMm == 0 && cyVirtualDeviceMm == 0) + { + cxVirtualDevicePixel = NtGdiGetDeviceCaps(hdc, HORZRES); + cyVirtualDevicePixel = NtGdiGetDeviceCaps(hdc, VERTRES); + cxVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, HORZSIZE); + cyVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, VERTSIZE); + } + else if (cxVirtualDevicePixel == 0 || cyVirtualDevicePixel == 0 || + cxVirtualDeviceMm == 0 || cyVirtualDeviceMm == 0) + { + return FALSE; + } dc = DC_LockDc(hdc); if (!dc) return FALSE;

1 0

[gadamopoulos] 44655: [win32k] - Don't store SYSTEM_CURSORINFO inside WINSTATION_OBJECT. Use a global variable instead - Remove IntGetCursorLocation. Use directly gpsi->ptCursor
by gadamopoulos＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: gadamopoulos Date: Sat Dec 19 17:23:05 2009 New Revision: 44655 URL: http://svn.reactos.org/svn/reactos?rev=44655&view=rev Log: [win32k] - Don't store SYSTEM_CURSORINFO inside WINSTATION_OBJECT. Use a global variable instead - Remove IntGetCursorLocation. Use directly gpsi->ptCursor Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -69,21 +69,20 @@ BOOL ScreenSaverRunning; } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; -HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); -BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject); -PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); +BOOL FASTCALL InitCursorImpl(); +PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process); - -BOOL FASTCALL IntGetCursorLocation(PWINSTATION_OBJECT WinStaObject, POINT *loc); BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); +BOOL FASTCALL UserSetCursorPos( INT x, INT y); + int APIENTRY UserShowCursor(BOOL bShow); -#define IntGetSysCursorInfo(WinStaObj) \ - (PSYSTEM_CURSORINFO)((WinStaObj)->SystemCursor) +PSYSTEM_CURSORINFO FASTCALL +IntGetSysCursorInfo(); #define IntReleaseCurIconObject(CurIconObj) \ UserDereferenceObject(CurIconObj) Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -29,7 +29,6 @@ LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; HANDLE SystemMenuTemplate; - PVOID SystemCursor; UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -44,13 +44,36 @@ static PAGED_LOOKASIDE_LIST gProcessLookasideList; static LIST_ENTRY gCurIconList; +SYSTEM_CURSORINFO gSysCursorInfo; + BOOL FASTCALL -IntGetCursorLocation(PWINSTATION_OBJECT WinSta, POINT *loc) -{ - loc->x = gpsi->ptCursor.x; - loc->y = gpsi->ptCursor.y; +InitCursorImpl() +{ + ExInitializePagedLookasideList(&gProcessLookasideList, + NULL, + NULL, + 0, + sizeof(CURICON_PROCESS), + TAG_DIB, + 128); + InitializeListHead(&gCurIconList); + + gSysCursorInfo.Enabled = FALSE; + gSysCursorInfo.ButtonsDown = 0; + gSysCursorInfo.CursorClipInfo.IsClipped = FALSE; + gSysCursorInfo.LastBtnDown = 0; + gSysCursorInfo.CurrentCursorObject = NULL; + gSysCursorInfo.ShowingCursor = 0; + gSysCursorInfo.ClickLockActive = FALSE; + gSysCursorInfo.ClickLockTime = 0; return TRUE; +} + +PSYSTEM_CURSORINFO FASTCALL +IntGetSysCursorInfo() +{ + return &gSysCursorInfo; } /* This function creates a reference for the object! */ @@ -78,8 +101,7 @@ HCURSOR FASTCALL -IntSetCursor( - PWINSTATION_OBJECT WinSta, +UserSetCursor( PCURICON_OBJECT NewCursor, BOOL ForceChange) { @@ -88,8 +110,9 @@ HCURSOR hOldCursor = (HCURSOR)0; HDC hdcScreen; BOOL bResult; - - CurInfo = IntGetSysCursorInfo(WinSta); + + CurInfo = IntGetSysCursorInfo(); + OldCursor = CurInfo->CurrentCursorObject; if (OldCursor) { @@ -152,22 +175,6 @@ return hOldCursor; } - -BOOL FASTCALL -IntSetupCurIconHandles(PWINSTATION_OBJECT WinSta) -{ - ExInitializePagedLookasideList(&gProcessLookasideList, - NULL, - NULL, - 0, - sizeof(CURICON_PROCESS), - TAG_DIB, - 128); - InitializeListHead(&gCurIconList); - - return TRUE; -} - /* * We have to register that this object is in use by the current * process. The only way to do that seems to be to walk the list @@ -207,7 +214,7 @@ } PCURICON_OBJECT FASTCALL -IntFindExistingCurIconObject(PWINSTATION_OBJECT WinSta, HMODULE hModule, +IntFindExistingCurIconObject(HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy) { PCURICON_OBJECT CurIcon; @@ -241,7 +248,7 @@ } PCURICON_OBJECT FASTCALL -IntCreateCurIconHandle(PWINSTATION_OBJECT WinSta) +IntCreateCurIconHandle() { PCURICON_OBJECT CurIcon; HANDLE hCurIcon; @@ -271,7 +278,7 @@ } BOOLEAN FASTCALL -IntDestroyCurIconObject(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT CurIcon, BOOL ProcessCleanup) +IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, BOOL ProcessCleanup) { PSYSTEM_CURSORINFO CurInfo; HBITMAP bmpMask, bmpColor; @@ -321,12 +328,12 @@ RemoveEntryList(&CurIcon->ListEntry); } - CurInfo = IntGetSysCursorInfo(WinSta); + CurInfo = IntGetSysCursorInfo(); if (CurInfo->CurrentCursorObject == CurIcon) { /* Hide the cursor if we're destroying the current cursor */ - IntSetCursor(WinSta, NULL, TRUE); + UserSetCursor(NULL, TRUE); } bmpMask = CurIcon->IconInfo.hbmMask; @@ -356,15 +363,8 @@ VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { - PWINSTATION_OBJECT WinSta; PCURICON_OBJECT CurIcon, tmp; PCURICON_PROCESS ProcessData; - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - return; - } LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) { @@ -376,7 +376,7 @@ if (Win32Process == ProcessData->Process) { RemoveEntryList(&CurIcon->ListEntry); - IntDestroyCurIconObject(WinSta, CurIcon, TRUE); + IntDestroyCurIconObject(CurIcon, TRUE); CurIcon = NULL; break; } @@ -391,7 +391,6 @@ } } - ObDereferenceObject(WinSta); } /* @@ -402,7 +401,6 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect) { PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; PSURFACE psurfBmp; NTSTATUS Status; HANDLE Ret; @@ -411,16 +409,9 @@ DPRINT("Enter NtUserCreateCursorIconHandle\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN((HANDLE)0); - } - - if (!(CurIcon = IntCreateCurIconHandle(WinSta))) + if (!(CurIcon = IntCreateCurIconHandle())) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - ObDereferenceObject(WinSta); RETURN((HANDLE)0); } @@ -473,7 +464,6 @@ } UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); RETURN(Ret); CLEANUP: @@ -643,7 +633,6 @@ { CURSORINFO SafeCi; PSYSTEM_CURSORINFO CurInfo; - PWINSTATION_OBJECT WinSta; NTSTATUS Status = STATUS_SUCCESS; PCURICON_OBJECT CurIcon; BOOL Ret = FALSE; @@ -652,20 +641,14 @@ DPRINT("Enter NtUserGetCursorInfo\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - - CurInfo = IntGetSysCursorInfo(WinSta); + CurInfo = IntGetSysCursorInfo(); CurIcon = (PCURICON_OBJECT)CurInfo->CurrentCursorObject; SafeCi.cbSize = sizeof(CURSORINFO); SafeCi.flags = ((CurInfo->ShowingCursor && CurIcon) ? CURSOR_SHOWING : 0); SafeCi.hCursor = (CurIcon ? (HCURSOR)CurIcon->Self : (HCURSOR)0); - IntGetCursorLocation(WinSta, &SafeCi.ptScreenPos); + SafeCi.ptScreenPos = gpsi->ptCursor; _SEH2_TRY { @@ -690,7 +673,6 @@ SetLastNtError(Status); } - ObDereferenceObject(WinSta); RETURN(Ret); CLEANUP: @@ -709,35 +691,23 @@ RECTL *UnsafeRect) { /* FIXME - check if process has WINSTA_WRITEATTRIBUTES */ - - PWINSTATION_OBJECT WinSta; PSYSTEM_CURSORINFO CurInfo; RECTL Rect; PWINDOW_OBJECT DesktopWindow = NULL; - POINT MousePos = {0}; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserClipCursor\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - if (NULL != UnsafeRect && ! NT_SUCCESS(MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)))) { - ObDereferenceObject(WinSta); SetLastWin32Error(ERROR_INVALID_PARAMETER); RETURN(FALSE); } - CurInfo = IntGetSysCursorInfo(WinSta); - IntGetCursorLocation(WinSta, &MousePos); - - if (WinSta->ActiveDesktop) - DesktopWindow = UserGetWindowObject(WinSta->ActiveDesktop->DesktopWindow); + CurInfo = IntGetSysCursorInfo(); + + DesktopWindow = UserGetDesktopWindow(); if ((Rect.right > Rect.left) && (Rect.bottom > Rect.top) && DesktopWindow && UnsafeRect != NULL) @@ -750,8 +720,8 @@ CurInfo->CursorClipInfo.Right = min(Rect.right - 1, DesktopWindow->Wnd->rcWindow.right - 1); CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->Wnd->rcWindow.bottom - 1); - mi.dx = MousePos.x; - mi.dy = MousePos.y; + mi.dx = gpsi->ptCursor.x; + mi.dy = gpsi->ptCursor.y; mi.mouseData = 0; mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; mi.time = 0; @@ -762,8 +732,6 @@ } CurInfo->CursorClipInfo.IsClipped = FALSE; - ObDereferenceObject(WinSta); - RETURN(TRUE); CLEANUP: @@ -782,7 +750,6 @@ HANDLE hCurIcon, DWORD Unknown) { - PWINSTATION_OBJECT WinSta; PCURICON_OBJECT CurIcon; BOOL ret; DECLARE_RETURN(BOOL); @@ -790,22 +757,14 @@ DPRINT("Enter NtUserDestroyCursorIcon\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { RETURN(FALSE); } - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - ret = IntDestroyCurIconObject(WinSta, CurIcon, FALSE); + ret = IntDestroyCurIconObject(CurIcon, FALSE); /* Note: IntDestroyCurIconObject will remove our reference for us! */ - ObDereferenceObject(WinSta); RETURN(ret); CLEANUP: @@ -827,31 +786,22 @@ LONG cy) { PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; HANDLE Ret = (HANDLE)0; DECLARE_RETURN(HICON); DPRINT("Enter NtUserFindExistingCursorIcon\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { + CurIcon = IntFindExistingCurIconObject(hModule, hRsrc, cx, cy); + if (CurIcon) + { + Ret = CurIcon->Self; + +// IntReleaseCurIconObject(CurIcon);//faxme: is this correct? does IntFindExistingCurIconObject add a ref? RETURN(Ret); } - CurIcon = IntFindExistingCurIconObject(WinSta, hModule, hRsrc, cx, cy); - if (CurIcon) - { - Ret = CurIcon->Self; - -// IntReleaseCurIconObject(CurIcon);//faxme: is this correct? does IntFindExistingCurIconObject add a ref? - ObDereferenceObject(WinSta); - RETURN(Ret); - } - SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); - ObDereferenceObject(WinSta); RETURN((HANDLE)0); CLEANUP: @@ -871,7 +821,6 @@ { /* FIXME - check if process has WINSTA_READATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; - PWINSTATION_OBJECT WinSta; RECTL Rect; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -882,13 +831,7 @@ if (!lpRect) RETURN(FALSE); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - - CurInfo = IntGetSysCursorInfo(WinSta); + CurInfo = IntGetSysCursorInfo(); if (CurInfo->CursorClipInfo.IsClipped) { Rect.left = CurInfo->CursorClipInfo.Left; @@ -907,12 +850,9 @@ Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT)); if (!NT_SUCCESS(Status)) { - ObDereferenceObject(WinSta); SetLastNtError(Status); RETURN(FALSE); } - - ObDereferenceObject(WinSta); RETURN(TRUE); @@ -933,23 +873,15 @@ { PCURICON_OBJECT CurIcon; HICON OldCursor; - PWINSTATION_OBJECT WinSta; DECLARE_RETURN(HCURSOR); DPRINT("Enter NtUserSetCursor\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(NULL); - } - if (hCursor) { if (!(CurIcon = UserGetCurIconObject(hCursor))) { - ObDereferenceObject(WinSta); RETURN(NULL); } } @@ -958,13 +890,12 @@ CurIcon = NULL; } - OldCursor = IntSetCursor(WinSta, CurIcon, FALSE); + OldCursor = UserSetCursor(CurIcon, FALSE); if (CurIcon) { UserDereferenceObject(CurIcon); } - ObDereferenceObject(WinSta); RETURN(OldCursor); @@ -987,7 +918,6 @@ PCURICON_OBJECT CurIcon; ICONINFO IconInfo; PSURFACE psurfBmp; - PWINSTATION_OBJECT WinSta; NTSTATUS Status; BOOL Ret = FALSE; DECLARE_RETURN(BOOL); @@ -995,15 +925,8 @@ DPRINT("Enter NtUserSetCursorContents\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - ObDereferenceObject(WinSta); RETURN(FALSE); } @@ -1057,7 +980,6 @@ { UserDereferenceObject(CurIcon); } - ObDereferenceObject(WinSta); RETURN(Ret); CLEANUP: @@ -1080,7 +1002,6 @@ PICONINFO pIconInfo) { PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; PSURFACE psurfBmp; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; @@ -1089,15 +1010,8 @@ DPRINT("Enter NtUserSetCursorIconData\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - if (!(CurIcon = UserGetCurIconObject(Handle))) { - ObDereferenceObject(WinSta); RETURN(FALSE); } @@ -1149,7 +1063,6 @@ Ret = TRUE; UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); RETURN(Ret); CLEANUP: @@ -1169,7 +1082,6 @@ HRSRC hGroupRsrc) { PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; NTSTATUS Status; POINT SafeHotspot; BOOL Ret = FALSE; @@ -1178,15 +1090,8 @@ DPRINT("Enter NtUserSetCursorIconData\n"); UserEnterExclusive(); - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); - } - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - ObDereferenceObject(WinSta); RETURN(FALSE); } @@ -1231,7 +1136,6 @@ done: UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); RETURN(Ret); @@ -1608,10 +1512,7 @@ APIENTRY UserShowCursor(BOOL bShow) { - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PWINSTATION_OBJECT WinSta = pti->Desktop->WindowStation; PSYSTEM_CURSORINFO CurInfo; - HDC Screen; PDC dc; SURFOBJ *SurfObj; @@ -1619,6 +1520,8 @@ PDEVOBJ *ppdev; GDIPOINTER *pgp; int showpointer=0; + + CurInfo = IntGetSysCursorInfo(); if (!(Screen = IntGetScreenDC())) { @@ -1656,8 +1559,6 @@ } pgp = &ppdev->Pointer; - - CurInfo = IntGetSysCursorInfo(WinSta); if (bShow == FALSE) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -1684,18 +1684,23 @@ RETURN(FALSE); } - /* FIXME: Fail if the desktop belong to an invisible window station */ + if(DesktopObject->WindowStation != InputWindowStation) + { + ObDereferenceObject(DesktopObject); + DPRINT1("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hDesktop); + RETURN(FALSE); + } + /* FIXME: Fail if the process is associated with a secured desktop such as Winlogon or Screen-Saver */ /* FIXME: Connect to input device */ /* Set the active desktop in the desktop's window station. */ - DesktopObject->WindowStation->ActiveDesktop = DesktopObject; + InputWindowStation->ActiveDesktop = DesktopObject; /* Set the global state. */ InputDesktop = DesktopObject; InputDesktopHandle = hDesktop; - InputWindowStation = DesktopObject->WindowStation; ObDereferenceObject(DesktopObject); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -1095,7 +1095,7 @@ ASSERT(WinSta); - CurInfo = IntGetSysCursorInfo(WinSta); + CurInfo = IntGetSysCursorInfo(); if(!mi->time) { @@ -1107,9 +1107,7 @@ SwapButtons = gspv.bMouseBtnSwap; DoMove = FALSE; - IntGetCursorLocation(WinSta, &MousePos); - OrgPos.x = MousePos.x; - OrgPos.y = MousePos.y; + OrgPos = MousePos = gpsi->ptCursor; if(mi->dwFlags & MOUSEEVENTF_MOVE) { @@ -1410,8 +1408,7 @@ /* All messages have to contain the cursor point. */ pti = PsGetCurrentThreadWin32Thread(); - IntGetCursorLocation(pti->Desktop->WindowStation, - &Msg.pt); + Msg.pt = gpsi->ptCursor; DPRINT1("Kbd Hook msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, vk_hook, Msg.lParam); @@ -1464,8 +1461,8 @@ FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; - IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, - &Msg.pt); + Msg.pt = gpsi->ptCursor; + MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -441,8 +441,7 @@ return FALSE; /* All messages have to contain the cursor point. */ - IntGetCursorLocation(pti->Desktop->WindowStation, - &NewMsg.pt); + NewMsg.pt = gpsi->ptCursor; switch (lpMsg->wParam) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -454,14 +454,9 @@ { WPARAM wParam; PSYSTEM_CURSORINFO CurInfo; - - if(!IntGetWindowStationObject(InputWindowStation)) - { - break; - } - CurInfo = IntGetSysCursorInfo(InputWindowStation); + CurInfo = IntGetSysCursorInfo(); + wParam = (WPARAM)(CurInfo->ButtonsDown); - ObDereferenceObject(InputWindowStation); co_IntSendMessage(Msg->hwnd, WM_MOUSEMOVE, wParam, Msg->lParam); co_IntSendMessage(Msg->hwnd, WM_SETCURSOR, (WPARAM)Msg->hwnd, MAKELPARAM(HTCLIENT, Msg->message)); @@ -1094,7 +1089,8 @@ Message.message = Msg; Message.wParam = wParam; Message.lParam = lParam; - IntGetCursorLocation(pThread->Desktop->WindowStation, &Message.pt); + Message.pt = gpsi->ptCursor; + KeQueryTickCount(&LargeTickCount); pThread->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); @@ -1180,7 +1176,7 @@ Message.message = Msg; Message.wParam = wParam; Message.lParam = lParam; - IntGetCursorLocation(pti->Desktop->WindowStation, &Message.pt); + Message.pt = gpsi->ptCursor; KeQueryTickCount(&LargeTickCount); pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(Window->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -23,27 +23,10 @@ FASTCALL InitMetrics(VOID) { - NTSTATUS Status; - PWINSTATION_OBJECT WinStaObject; - ULONG Width = 640, Height = 480; - PSYSTEM_CURSORINFO CurInfo; INT *piSysMet; - Width = pPrimarySurface->gdiinfo.ulHorzRes; - Height = pPrimarySurface->gdiinfo.ulVertRes; - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObject); - if (NT_SUCCESS(Status)) - { - CurInfo = IntGetSysCursorInfo(WinStaObject); - } - else - { - CurInfo = NULL; - } + ULONG Width = pPrimarySurface->gdiinfo.ulHorzRes; + ULONG Height = pPrimarySurface->gdiinfo.ulVertRes; piSysMet = gpsi->aiSysMet; @@ -175,11 +158,6 @@ gpsi->dwSRVIFlags |= SRVINFO_METRICS; Setup = TRUE; - if (NT_SUCCESS(Status)) - { - ObDereferenceObject(WinStaObject); - } - return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -236,7 +236,6 @@ MsqIsClkLck(LPMSG Msg, BOOL Remove) { PTHREADINFO pti; - PWINSTATION_OBJECT WinStaObject; PSYSTEM_CURSORINFO CurInfo; BOOL Res = FALSE; @@ -246,9 +245,7 @@ return FALSE; } - WinStaObject = pti->Desktop->WindowStation; - - CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo = IntGetSysCursorInfo(); switch (Msg->message) { @@ -279,7 +276,6 @@ MsqIsDblClk(LPMSG Msg, BOOL Remove) { PTHREADINFO pti; - PWINSTATION_OBJECT WinStaObject; PSYSTEM_CURSORINFO CurInfo; LONG dX, dY; BOOL Res; @@ -290,9 +286,7 @@ return FALSE; } - WinStaObject = pti->Desktop->WindowStation; - - CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo = IntGetSysCursorInfo(); Res = (Msg->hwnd == (HWND)CurInfo->LastClkWnd) && ((Msg->time - CurInfo->LastBtnDown) < gspv.iDblClickTime); if(Res) @@ -841,8 +835,7 @@ FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; - IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, - &Msg.pt); + Msg.pt = gpsi->ptCursor; MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); } else @@ -859,7 +852,6 @@ { PWINDOW_OBJECT Window; PTHREADINFO Win32Thread; - PWINSTATION_OBJECT WinSta; MSG Mesg; LARGE_INTEGER LargeTickCount; NTSTATUS Status; @@ -878,7 +870,6 @@ return; } - WinSta = Win32Thread->Desktop->WindowStation; Window = IntGetWindowObject(hWnd); if (!Window) { @@ -892,7 +883,7 @@ Mesg.lParam = lParam; KeQueryTickCount(&LargeTickCount); Mesg.time = MsqCalculateMessageTime(&LargeTickCount); - IntGetCursorLocation(WinSta, &Mesg.pt); + Mesg.pt = gpsi->ptCursor; MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); UserDereferenceObject(Window); ObDereferenceObject (Thread); @@ -1876,7 +1867,6 @@ LARGE_INTEGER LargeTickCount; PLIST_ENTRY EnumEntry; BOOLEAN GotMessage; - PTHREADINFO pti; DPRINT("MsqGetTimerMessage queue %p msg %p restart %s\n", MessageQueue, Msg, Restart ? "TRUE" : "FALSE"); @@ -1928,9 +1918,7 @@ Msg->lParam = (LPARAM) Timer->TimerFunc; KeQueryTickCount(&LargeTickCount); Msg->time = MsqCalculateMessageTime(&LargeTickCount); - pti = PsGetCurrentThreadWin32Thread(); - IntGetCursorLocation(pti->Desktop->WindowStation, - &Msg->pt); + Msg->pt = gpsi->ptCursor; if (Restart) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -203,54 +203,34 @@ case ONEPARAM_ROUTINE_CREATECURICONHANDLE: { PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { + + if (!(CurIcon = IntCreateCurIconHandle())) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); RETURN(0); } - if (!(CurIcon = IntCreateCurIconHandle(WinSta))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - ObDereferenceObject(WinSta); - RETURN(0); - } - - ObDereferenceObject(WinSta); RETURN((DWORD)CurIcon->Self); } case ONEPARAM_ROUTINE_GETCURSORPOSITION: { - PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - POINT Pos; - - if(!Param) - RETURN( (DWORD)FALSE); - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinSta); - if (!NT_SUCCESS(Status)) - RETURN( (DWORD)FALSE); - - /* FIXME - check if process has WINSTA_READATTRIBUTES */ - IntGetCursorLocation(WinSta, &Pos); - - Status = MmCopyToCaller((PPOINT)Param, &Pos, sizeof(POINT)); - if(!NT_SUCCESS(Status)) - { - ObDereferenceObject(WinSta); - SetLastNtError(Status); - RETURN( FALSE); - } - - ObDereferenceObject(WinSta); - - RETURN( (DWORD)TRUE); + BOOL ret = TRUE; + + + _SEH2_TRY + { + ProbeForWrite((POINT*)Param,sizeof(POINT),1); + RtlCopyMemory((POINT*)Param,&gpsi->ptCursor,sizeof(POINT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + ret = FALSE; + } + _SEH2_END; + + RETURN (ret); } case ONEPARAM_ROUTINE_ISWINDOWINDESTROY: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sat Dec 19 17:23:05 2009 @@ -395,7 +395,6 @@ DWORD Unknown5, DWORD Unknown6) { - PSYSTEM_CURSORINFO CurInfo; UNICODE_STRING WindowStationName; UNICODE_STRING FullWindowStationName; PWINSTATION_OBJECT WindowStationObject; @@ -522,61 +521,16 @@ WindowStationObject->FlatMenu = FALSE; - if(!(CurInfo = ExAllocatePool(PagedPool, sizeof(SYSTEM_CURSORINFO)))) - { - ExFreePool(FullWindowStationName.Buffer); - /* FIXME - Delete window station object */ - ObDereferenceObject(WindowStationObject); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; - } - - CurInfo->Enabled = FALSE; - CurInfo->ButtonsDown = 0; - CurInfo->CursorClipInfo.IsClipped = FALSE; - CurInfo->LastBtnDown = 0; - CurInfo->CurrentCursorObject = NULL; - CurInfo->ShowingCursor = 0; - CurInfo->ClickLockActive = FALSE; - CurInfo->ClickLockTime = 0; - -/* - // not used anymore - CurInfo->WheelScroLines = gspv.iWheelScrollLines; -#if (_WIN32_WINNT >= 0x0600) - CurInfo->WheelScroChars = gspv.iWheelScrollChars; -#endif - CurInfo->SwapButtons = gspv.bMouseBtnSwap; - CurInfo->DblClickSpeed = gspv.iDblClickTime; - CurInfo->DblClickWidth = gspv.iDblClickWidth; - CurInfo->DblClickHeight = gspv.iDblClickHeight; - - CurInfo->MouseSpeed = gspv.iMouseSpeed; - CurInfo->CursorAccelerationInfo.FirstThreshold = gspv.caiMouse.FirstThreshold; - CurInfo->CursorAccelerationInfo.SecondThreshold = gspv.caiMouse.SecondThreshold; - CurInfo->CursorAccelerationInfo.Acceleration = gspv.caiMouse.Acceleration; - - CurInfo->MouseHoverTime = gspv.iMouseHoverTime; - CurInfo->MouseHoverWidth = gspv.iMouseHoverWidth; - CurInfo->MouseHoverHeight = gspv.iMouseHoverHeight; -*/ - -// WindowStationObject->ScreenSaverActive = FALSE; -// WindowStationObject->ScreenSaverTimeOut = 10; - WindowStationObject->SystemCursor = CurInfo; - - /* END FIXME loading from register */ - if (!IntSetupClipboard(WindowStationObject)) { DPRINT1("WindowStation: Error Setting up the clipboard!!!\n"); } - if (!IntSetupCurIconHandles(WindowStationObject)) - { - DPRINT1("Setting up the Cursor/Icon Handle table failed!\n"); - /* FIXME: Complain more loudly? */ - ExFreePool(FullWindowStationName.Buffer); + if (InputWindowStation == NULL) + { + InputWindowStation = WindowStationObject; + + InitCursorImpl(); } DPRINT("Window station successfully created (%wZ)\n", &FullWindowStationName); @@ -708,12 +662,6 @@ DPRINT("Validation of window station handle (0x%X) failed\n", hWinSta); return FALSE; } - -#if 0 - /* FIXME - free the cursor information when actually deleting the object!! */ - ASSERT(Object->SystemCursor); - ExFreePool(Object->SystemCursor); -#endif ObDereferenceObject(Object);

1 0

[gschneider] 44654: [win32k] - Simplify GdiExtSelectClipRgn slightly - Add missing line break
by gschneider＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: gschneider Date: Sat Dec 19 14:08:53 2009 New Revision: 44654 URL: http://svn.reactos.org/svn/reactos?rev=44654&view=rev Log: [win32k] - Simplify GdiExtSelectClipRgn slightly - Add missing line break Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Sat Dec 19 14:08:53 2009 @@ -729,7 +729,7 @@ if(!SBID_IS_VALID(Obj)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d", Obj); + DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d\n", Obj); RETURN( FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Sat Dec 19 14:08:53 2009 @@ -96,10 +96,9 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc, - HRGN hrgn, - int fnMode) -{ - int retval; + HRGN hrgn, + int fnMode) +{ // dc->fs &= ~DC_FLAG_DIRTY_RAO; if (!hrgn) @@ -110,7 +109,6 @@ { GreDeleteObject(dc->rosdc.hClipRgn); dc->rosdc.hClipRgn = NULL; - retval = NULLREGION; } } else @@ -144,8 +142,7 @@ NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, hrgn, fnMode); } - retval = CLIPPING_UpdateGCRegion(dc); - return retval; + return CLIPPING_UpdateGCRegion(dc); }

1 0

[tkreuzer] 44653: [MM] - Improve MiGetPteForProcess Implement MiGetPteProtection, MiSetPteProtection, MmCreateVirtualMappingUnsafe, MmCreateVirtualMapping
by tkreuzer＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: tkreuzer Date: Sat Dec 19 04:43:33 2009 New Revision: 44653 URL: http://svn.reactos.org/svn/reactos?rev=44653&view=rev Log: [MM] - Improve MiGetPteForProcess Implement MiGetPteProtection, MiSetPteProtection, MmCreateVirtualMappingUnsafe, MmCreateVirtualMapping Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sat Dec 19 04:43:33 2009 @@ -18,6 +18,14 @@ #pragma alloc_text(INIT, MiInitPageDirectoryMap) #endif +#undef InterlockedExchangePte +#define InterlockedExchangePte(pte1, pte2) \ + InterlockedExchange64(&pte1->u.Long, pte2.u.Long) + +#define PAGE_EXECUTE_ANY (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY) +#define PAGE_WRITE_ANY (PAGE_EXECUTE_READWRITE|PAGE_READWRITE|PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOPY) +#define PAGE_WRITECOPY_ANY (PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOPY) + extern MMPTE HyperTemplatePte; /* GLOBALS *****************************************************************/ @@ -53,7 +61,7 @@ PVOID Address, BOOLEAN Create) { - PMMPTE Pte; + MMPTE TmplPte, *Pte; /* Check if we need hypersapce mapping */ if (Address < MmSystemRangeStart && @@ -64,25 +72,33 @@ } else if (Create) { + TmplPte.u.Long = 0; + TmplPte.u.Flush.Valid = 1; + TmplPte.u.Flush.Write = 1; + /* Get the PXE */ Pte = MiAddressToPxe(Address); if (!Pte->u.Hard.Valid) - InterlockedBitTestAndSet64(&Pte->u.Long, 0); + { + TmplPte.u.Hard.PageFrameNumber = MiAllocPage(TRUE); + InterlockedExchangePte(Pte, TmplPte); + } /* Get the PPE */ Pte = MiAddressToPpe(Address); if (!Pte->u.Hard.Valid) - InterlockedBitTestAndSet64(&Pte->u.Long, 0); + { + TmplPte.u.Hard.PageFrameNumber = MiAllocPage(TRUE); + InterlockedExchangePte(Pte, TmplPte); + } /* Get the PDE */ Pte = MiAddressToPde(Address); if (!Pte->u.Hard.Valid) - InterlockedBitTestAndSet64(&Pte->u.Long, 0); - - /* Get the PTE */ - Pte = MiAddressToPte(Address); - - return Pte; + { + TmplPte.u.Hard.PageFrameNumber = MiAllocPage(TRUE); + InterlockedExchangePte(Pte, TmplPte); + } } else { @@ -100,14 +116,9 @@ Pte = MiAddressToPde(Address); if (!Pte->u.Hard.Valid) return NULL; - - /* Get the PTE */ - Pte = MiAddressToPte(Address); - - return Pte; - } - - return 0; + } + + return MiAddressToPte(Address); } static @@ -128,75 +139,11 @@ return PteValue; } - -/* FUNCTIONS ***************************************************************/ - -PFN_NUMBER -NTAPI -MmGetPfnForProcess(PEPROCESS Process, - PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid ? Pte.u.Hard.PageFrameNumber : 0; -} - -PHYSICAL_ADDRESS -NTAPI -MmGetPhysicalAddress(PVOID Address) -{ - PHYSICAL_ADDRESS p; - MMPTE Pte; - - Pte.u.Long = MiGetPteValueForProcess(NULL, Address); - if (Pte.u.Hard.Valid) - { - p.QuadPart = Pte.u.Hard.PageFrameNumber * PAGE_SIZE; - p.u.LowPart |= (ULONG_PTR)Address & (PAGE_SIZE - 1); - } - else - { - p.QuadPart = 0; - } - - return p; -} - -BOOLEAN -NTAPI -MmIsPagePresent(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid; -} - -BOOLEAN -NTAPI -MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid && Pte.u.Soft.Transition; -} - -BOOLEAN -NTAPI -MmIsDirtyPage(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid && Pte.u.Hard.Dirty; -} - ULONG NTAPI -MmGetPageProtect(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; +MiGetPteProtection(MMPTE Pte) +{ ULONG Protect; - - Pte.u.Long = MiGetPteValueForProcess(Process, Address); if (!Pte.u.Flush.Valid) { @@ -228,11 +175,93 @@ Protect |= PAGE_WRITETHROUGH; // PAGE_GUARD ? - return Protect; } -#define PAGE_EXECUTE_ANY (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY) +VOID +NTAPI +MiSetPteProtection(PMMPTE Pte, ULONG Protection) +{ + Pte->u.Flush.CopyOnWrite = (Protection & PAGE_WRITECOPY_ANY) ? 1 : 0; + Pte->u.Flush.Write = (Protection & PAGE_WRITE_ANY) ? 1 : 0; + Pte->u.Flush.CacheDisable = (Protection & PAGE_NOCACHE) ? 1 : 0; + Pte->u.Flush.WriteThrough = (Protection & PAGE_WRITETHROUGH) ? 1 : 0; + + // FIXME: This doesn't work. Why? +// Pte->u.Flush.NoExecute = (Protection & PAGE_EXECUTE_ANY) ? 0 : 1; +} + +/* FUNCTIONS ***************************************************************/ + +PFN_NUMBER +NTAPI +MmGetPfnForProcess(PEPROCESS Process, + PVOID Address) +{ + MMPTE Pte; + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + return Pte.u.Hard.Valid ? Pte.u.Hard.PageFrameNumber : 0; +} + +PHYSICAL_ADDRESS +NTAPI +MmGetPhysicalAddress(PVOID Address) +{ + PHYSICAL_ADDRESS p; + MMPTE Pte; + + Pte.u.Long = MiGetPteValueForProcess(NULL, Address); + if (Pte.u.Hard.Valid) + { + p.QuadPart = Pte.u.Hard.PageFrameNumber * PAGE_SIZE; + p.u.LowPart |= (ULONG_PTR)Address & (PAGE_SIZE - 1); + } + else + { + p.QuadPart = 0; + } + + return p; +} + +BOOLEAN +NTAPI +MmIsPagePresent(PEPROCESS Process, PVOID Address) +{ + MMPTE Pte; + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + return Pte.u.Hard.Valid; +} + +BOOLEAN +NTAPI +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +{ + MMPTE Pte; + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + return Pte.u.Hard.Valid && Pte.u.Soft.Transition; +} + +BOOLEAN +NTAPI +MmIsDirtyPage(PEPROCESS Process, PVOID Address) +{ + MMPTE Pte; + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + return Pte.u.Hard.Valid && Pte.u.Hard.Dirty; +} + +ULONG +NTAPI +MmGetPageProtect(PEPROCESS Process, PVOID Address) +{ + MMPTE Pte; + ULONG Protect; + + Pte.u.Long = MiGetPteValueForProcess(Process, Address); + + return MiGetPteProtection(Pte); +} VOID NTAPI @@ -241,27 +270,14 @@ PMMPTE Pte; MMPTE NewPte; - if (!(flProtect & PAGE_EXECUTE_ANY)) - NewPte.u.Flush.NoExecute = 1; - - if (flProtect & (PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOPY)) - { - NewPte.u.Flush.Write = 1; - NewPte.u.Flush.CopyOnWrite = 1; - } - - if (flProtect & (PAGE_EXECUTE_READWRITE|PAGE_READWRITE)) - NewPte.u.Flush.Write = 1; - - if (flProtect & PAGE_NOCACHE) - NewPte.u.Flush.CacheDisable = 1; - - if (flProtect & PAGE_WRITETHROUGH) - NewPte.u.Flush.WriteThrough = 1; - Pte = MiGetPteForProcess(Process, Address, FALSE); - - InterlockedExchange64(&Pte->u.Long, NewPte.u.Long); + ASSERT(Pte != NULL); + + NewPte = *Pte; + + MiSetPteProtection(&NewPte, flProtect); + + InterlockedExchangePte(Pte, NewPte); MiFlushTlb(Pte, Address); } @@ -409,26 +425,74 @@ NTSTATUS NTAPI -MmCreateVirtualMappingUnsafe(PEPROCESS Process, - PVOID Address, - ULONG flProtect, - PPFN_NUMBER Pages, - ULONG PageCount) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; +MmCreateVirtualMappingUnsafe( + PEPROCESS Process, + PVOID Address, + ULONG PageProtection, + PPFN_NUMBER Pages, + ULONG PageCount) +{ + ULONG i; + MMPTE TmplPte, *Pte; + + /* Check if the range is valid */ + if ((Process == NULL && Address < MmSystemRangeStart) || + (Process != NULL && Address > MmHighestUserAddress)) + { + DPRINT1("Address 0x%p is invalid for process %p\n", Address, Process); + ASSERT(FALSE); + } + + TmplPte.u.Long = 0; + TmplPte.u.Hard.Valid = 1; + MiSetPteProtection(&TmplPte, PageProtection); + +//__debugbreak(); + + for (i = 0; i < PageCount; i++) + { + TmplPte.u.Hard.PageFrameNumber = Pages[i]; + + Pte = MiGetPteForProcess(Process, Address, TRUE); + +DPRINT1("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", + Address, TmplPte.u.Long, Pte); + + if (InterlockedExchangePte(Pte, TmplPte)) + { + KeInvalidateTlbEntry(Address); + } + + if (MiIsHyperspaceAddress(Pte)) + MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); + + Address = (PVOID)((ULONG64)Address + PAGE_SIZE); + } + + + return STATUS_SUCCESS; } NTSTATUS NTAPI MmCreateVirtualMapping(PEPROCESS Process, PVOID Address, - ULONG flProtect, + ULONG Protect, PPFN_NUMBER Pages, ULONG PageCount) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + ULONG i; + + for (i = 0; i < PageCount; i++) + { + if (!MmIsPageInUse(Pages[i])) + { + DPRINT1("Page %x not in use\n", Pages[i]); + KeBugCheck(MEMORY_MANAGEMENT); + } + } + + return MmCreateVirtualMappingUnsafe(Process, Address, Protect, Pages, PageCount); } NTSTATUS

1 0

[tkreuzer] 44652: [KDBG] Port KdbEnter to amd64 assembly. Untested.
by tkreuzer＠svn.reactos.org 19 Dec '09

19 Dec '09

Author: tkreuzer Date: Sat Dec 19 01:04:37 2009 New Revision: 44652 URL: http://svn.reactos.org/svn/reactos?rev=44652&view=rev Log: [KDBG] Port KdbEnter to amd64 assembly. Untested. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb_help.S - copied, changed from r44597, branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/kdb_help.S Copied: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb_help.S (from r44597, branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/kdb_help.S) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/kdb_help.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb_help.S [iso-8859-1] Sat Dec 19 01:04:37 2009 @@ -1,140 +1,127 @@ -#include <ndk/asm.h> -.text +#include <ndk/amd64/asm.h> +#include <ndk/amd64/asmmacro.S> .globl _KdbEnter _KdbEnter: - /* - * Set up a trap frame - */ - pushfl /* Eflags */ - pushl %cs /* Cs */ - pushl $0 /* ErrorCode */ - pushl %ebp /* Ebp */ - pushl %ebx /* Ebx */ - movl 20(%esp), %ebp /* Eip */ - movl 16(%esp), %ebx /* Eflags */ - movl %ebx, 20(%esp) - movl 12(%esp), %ebx /* Cs */ - movl %ebx, 16(%esp) - movl %ebp, 12(%esp) - pushl %esi /* Esi */ - pushl %edi /* Edi */ - pushl %fs /* Fs */ - pushl $0 /* ExceptionList */ - pushl $0 /* PreviousMode */ - pushl %eax /* Eax */ - pushl %ecx /* Ecx */ - pushl %edx /* Edx */ - pushl %ds /* Ds */ - pushl %es /* Es */ - pushl %gs /* Gs */ - movl %dr7, %eax - pushl %eax /* Dr7 */ + + /* save flags */ + pushfq + + /* Make room for a KTRAP_FRAME */ + sub rsp, SIZE_KTRAP_FRAME + .allocstack SIZE_KTRAP_FRAME + + /* Save rbp */ + mov [rsp + KTRAP_FRAME_Rbp], rbp + + /* Save non-volatile registers */ + mov [rsp + KTRAP_FRAME_Rbx], rbx + mov [rsp + KTRAP_FRAME_Rdi], rdi + mov [rsp + KTRAP_FRAME_Rsi], rsi + + /* Save volatile registers */ + mov [rsp + KTRAP_FRAME_Rax], rax + mov [rsp + KTRAP_FRAME_Rcx], rcx + mov [rsp + KTRAP_FRAME_Rdx], rdx + mov [rsp + KTRAP_FRAME_R8], r8 + mov [rsp + KTRAP_FRAME_R9], r9 + mov [rsp + KTRAP_FRAME_R10], r10 + mov [rsp + KTRAP_FRAME_R11], r11 + + /* Save xmm registers */ +// movdqa [rbp + KTRAP_FRAME_Xmm0], xmm0 +// movdqa [rbp + KTRAP_FRAME_Xmm1], xmm1 +// movdqa [rbp + KTRAP_FRAME_Xmm2], xmm2 +// movdqa [rbp + KTRAP_FRAME_Xmm3], xmm3 +// movdqa [rbp + KTRAP_FRAME_Xmm4], xmm4 +// movdqa [rbp + KTRAP_FRAME_Xmm5], xmm5 + + /* Save cs and previous mode */ + mov ax, cs + mov [rsp + KTRAP_FRAME_SegCs], ax + and ax, 1 + mov [rsp + KTRAP_FRAME_PreviousMode], al + + /* Save segment selectors */ + mov ax, ds + mov [rbp + KTRAP_FRAME_SegDs], ax + mov ax, es + mov [rbp + KTRAP_FRAME_SegEs], ax + mov ax, fs + mov [rbp + KTRAP_FRAME_SegFs], ax + mov ax, gs + mov [rbp + KTRAP_FRAME_SegGs], ax + + /* Save previous irql */ + mov rax, cr8 + mov [rsp + KTRAP_FRAME_PreviousIrql], al + + /* Save debug registers */ + mov rax, dr0 + mov [rsp + KTRAP_FRAME_Dr0], rax + mov rax, dr1 + mov [rsp + KTRAP_FRAME_Dr1], rax + mov rax, dr2 + mov [rsp + KTRAP_FRAME_Dr2], rax + mov rax, dr3 + mov [rsp + KTRAP_FRAME_Dr3], rax + mov rax, dr6 + mov [rsp + KTRAP_FRAME_Dr6], rax + mov rax, dr7 + mov [rsp + KTRAP_FRAME_Dr7], rax + + /* Point rbp, where rsp was initially */ + lea rbp, [rsp + SIZE_KTRAP_FRAME + 8] + mov [rsp + KTRAP_FRAME_Rsp], rbp + + /* Store the EFLAGS we previously pushed on the stack */ + mov rax, [rbp] + mov [rsp + KTRAP_FRAME_EFlags], rax + + /* Get RIP from the stack */ + mov rax, [rbp + 8] + mov [rsp + KTRAP_FRAME_Rip], rax + + /* Make sure the direction flag is cleared */ + cld /* Clear all breakpoint enables in dr7. */ - andl $0xFFFF0000, %eax - movl %eax, %dr7 - movl %dr6, %eax - pushl %eax /* Dr6 */ - movl %dr3, %eax - pushl %eax /* Dr3 */ - movl %dr2, %eax - pushl %eax /* Dr2 */ - movl %dr1, %eax - pushl %eax /* Dr1 */ - movl %dr0, %eax - pushl %eax /* Dr0 */ - leal 0x58(%esp), %eax - pushl %eax /* TempEsp */ - pushl %ss /* TempSegSs */ - pushl $0 /* DebugPointer */ - pushl $3 /* DebugArgMark (Exception number) */ - pushl 0x60(%esp) /* DebugEip */ - pushl %ebp /* DebugEbp */ + mov rax, dr7 + and rax, 0xFFFF0000 + mov dr7, rax - /* - * Call KDB - */ - movl %esp, %eax - pushl $1 /* FirstChance */ - pushl %eax /* Push a pointer to the trap frame */ - pushl $0 /* Context */ - pushl $0 /* PreviousMode (KernelMode) */ - pushl $0 /* ExceptionRecord */ - call _KdbEnterDebuggerException + /* Call KDB */ + mov byte ptr [rsp + KTRAP_FRAME_P5], 1 /* FirstChance */ + mov r9, rsp /* Pointer to the trap frame */ + mov r8, 0 /* Context */ + mov dl, 0 /* PreviousMode (KernelMode) */ + mov rcx, 0 /* ExceptionRecord */ + call _KdbEnterDebuggerException - /* - * Pop the arguments and unused portions of the trap frame: - * DebugEbp - * DebugEip - * DebugArgMark - * DebugPointer - * TempSegSs - * TempEsp - */ - addl $(11*4), %esp + /* Restore segment selectors */ + mov ax, [rsp + KTRAP_FRAME_SegDs] + mov ds, ax + mov ax, [rsp + KTRAP_FRAME_SegEs] + mov es, ax + mov ax, [rsp + KTRAP_FRAME_SegFs] + mov fs, ax - /* - * Restore/update debugging registers. - */ - popl %eax /* Dr0 */ - movl %eax, %dr0 - popl %eax /* Dr1 */ - movl %eax, %dr1 - popl %eax /* Dr2 */ - movl %eax, %dr2 - popl %eax /* Dr3 */ - movl %eax, %dr3 - popl %eax /* Dr6 */ - movl %eax, %dr6 - popl %eax /* Dr7 */ - movl %eax, %dr7 + /* Restore non-volatile registers */ + mov rbx, [rsp + KTRAP_FRAME_Rbx] + mov rdi, [rsp + KTRAP_FRAME_Rdi] + mov rsi, [rsp + KTRAP_FRAME_Rsi] - /* - * Restore registers including any that might have been changed - * inside the debugger. - */ - popl %gs /* Gs */ - popl %es /* Es */ - popl %ds /* Ds */ - popl %edx /* Edx */ - popl %ecx /* Ecx */ - popl %eax /* Eax */ - addl $8, %esp /* PreviousMode, ExceptionList */ - popl %fs /* Fs */ - popl %edi /* Edi */ - popl %esi /* Esi */ - popl %ebx /* Ebx */ - popl %ebp /* Ebp */ - addl $4, %esp /* ErrorCode */ + /* Restore volatile registers */ + mov rax, [rsp + KTRAP_FRAME_Rax] + mov rcx, [rsp + KTRAP_FRAME_Rcx] + mov rdx, [rsp + KTRAP_FRAME_Rdx] + mov r8, [rsp + KTRAP_FRAME_R8] + mov r9, [rsp + KTRAP_FRAME_R9] + mov r10, [rsp + KTRAP_FRAME_R10] + mov r11, [rsp + KTRAP_FRAME_R11] - /* - * Return to the caller. - */ + /* Restore RSP */ + mov rsp, [rsp + KTRAP_FRAME_Rsp] + iret - - -.globl _KdbpStackSwitchAndCall@8 -_KdbpStackSwitchAndCall@8: - pushl %ebp - movl %esp, %ebp - - movl 0x8(%esp), %eax /* New stack */ - movl 0xC(%esp), %ecx /* Function to call */ - movl %esp, %edx /* Old stack */ - - /* Switch stack */ - movl %eax, %esp - pushl %edx - - /* Call function */ - call *%ecx - - /* Switch back to old stack */ - popl %esp - - /* Return */ - popl %ebp - ret $8 -

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