Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 45023: [usb/usbehci] - DeviceArrivalWorkItem: Check the device object returned from IoGetAttachedDeviceReference. if its the PDO, deref and return. - Pass upper attached device object pointer to the completion routine. - ArrivalNotificationCompletion: Dereference the upper attached device object before returning.
by mjmartin＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: mjmartin Date: Sun Jan 10 12:08:51 2010 New Revision: 45023 URL: http://svn.reactos.org/svn/reactos?rev=45023&view=rev Log: [usb/usbehci] - DeviceArrivalWorkItem: Check the device object returned from IoGetAttachedDeviceReference. if its the PDO, deref and return. - Pass upper attached device object pointer to the completion routine. - ArrivalNotificationCompletion: Dereference the upper attached device object before returning. Modified: trunk/reactos/drivers/usb/usbehci/irp.c Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Sun Jan 10 12:08:51 2010 @@ -98,7 +98,9 @@ NTAPI ArrivalNotificationCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID PContext) { + PDEVICE_OBJECT PortDeviceObject = (PDEVICE_OBJECT) PContext; IoFreeIrp(Irp); + ObDereferenceObject(PortDeviceObject); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -120,6 +122,12 @@ return; } + if (PortDeviceObject == DeviceObject) + { + /* Piontless to send query relations to ourself */ + ObDereferenceObject(PortDeviceObject); + } + Irp = IoAllocateIrp(PortDeviceObject->StackSize, FALSE); if (!Irp) @@ -129,7 +137,7 @@ IoSetCompletionRoutine(Irp, (PIO_COMPLETION_ROUTINE)ArrivalNotificationCompletion, - NULL, + (PVOID) PortDeviceObject, TRUE, TRUE, TRUE);

1 0

[mjmartin] 45022: [usb/usbehci] - StartDevice: Remove ASSERT for unhanded resource types. - Add case for CmResourceTypeDevicePrivate, and do nothing for it for now, will fix later if needed. - Fixes crash on windows.
by mjmartin＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: mjmartin Date: Sun Jan 10 10:03:53 2010 New Revision: 45022 URL: http://svn.reactos.org/svn/reactos?rev=45022&view=rev Log: [usb/usbehci] - StartDevice: Remove ASSERT for unhanded resource types. - Add case for CmResourceTypeDevicePrivate, and do nothing for it for now, will fix later if needed. - Fixes crash on windows. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Sun Jan 10 10:03:53 2010 @@ -520,10 +520,15 @@ DPRINT("Dma Port: %d\n", resource->u.Dma.Port); break; } + case CmResourceTypeDevicePrivate: + { + /* Windows does this. */ + DPRINT1("CmResourceTypeDevicePrivate not handled\n"); + break; + } default: { - DPRINT1("PNP Manager gave invalid resource type!! Notify Developers!\n"); - ASSERT(FALSE); + DPRINT1("PNP Manager gave resource type not handled!! Notify Developers!\n"); break; } }

1 0

[jimtabor] 45021: [Win32k] - Removed NtUserGetScrollInfo and replaced it, move more type names in window object to WND.
by jimtabor＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: jimtabor Date: Sun Jan 10 08:50:57 2010 New Revision: 45021 URL: http://svn.reactos.org/svn/reactos?rev=45021&view=rev Log: [Win32k] - Removed NtUserGetScrollInfo and replaced it, move more type names in window object to WND. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -573,7 +573,7 @@ { SCROLLINFO Info; - NtUserGetScrollInfo(Wnd, Bar, &Info); + NtUserSBGetParms(Wnd, Bar, NULL, &Info); *ArrowSize = GetSystemMetrics(SM_CXVSCROLL); Pixels -= (2 * GetSystemMetrics(SM_CXVSCROLL)); @@ -637,7 +637,7 @@ si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_RANGE | SIF_PAGE; - NtUserGetScrollInfo(Wnd, SBType, &si); + NtUserSBGetParms(Wnd, SBType, NULL, &si); if ((Pixels -= 2 * ScrollBarInfo->dxyLineButton) <= 0) { return si.nMin; @@ -1139,7 +1139,7 @@ ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_POS; - if (! NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo)) + if (! NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo)) { return 0; } @@ -1161,7 +1161,7 @@ ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; - Result = NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo); + Result = NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo); if (Result) { *MinPos = ScrollInfo.nMin; @@ -1431,7 +1431,7 @@ return NtUserSetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam, wParam); case SBM_GETSCROLLINFO: - return NtUserGetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam); + return NtUserSBGetParms(Wnd, SB_CTL, NULL, (SCROLLINFO *) lParam); case 0x00e5: case 0x00e7: @@ -1502,14 +1502,24 @@ BOOL WINAPI RealGetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) { - if (SB_CTL == SBType) - { - return SendMessageW(Wnd, SBM_GETSCROLLINFO, 0, (LPARAM) Info); - } - else - { - return NtUserGetScrollInfo(Wnd, SBType, Info); - } + PWND pWnd; + PSBDATA pSBData = NULL; + + if (SB_CTL == SBType) + { + return SendMessageW(Wnd, SBM_GETSCROLLINFO, 0, (LPARAM) Info); + } + + pWnd = ValidateHwnd(Wnd); + if (!pWnd) return FALSE; + + if (SBType < SB_HORZ || SBType > SB_VERT) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + // FIXME add support to set pSBData from pWnd->pSBInfo + return NtUserSBGetParms(Wnd, SBType, pSBData, Info); } /* @@ -1636,10 +1646,10 @@ ScrollInfo.fMask = SIF_POS; /* - * Call NtUserGetScrollInfo() to get the previous position that + * Call NtUserSBGetParms() to get the previous position that * we will later return. */ - if (NtUserGetScrollInfo(hWnd, nBar, &ScrollInfo)) + if (NtUserSBGetParms(hWnd, nBar, NULL, &ScrollInfo)) { Result = ScrollInfo.nPos; if (Result != nPos) Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -2459,13 +2459,13 @@ NtUserResolveDesktopForWOW( DWORD Unknown0); -DWORD +BOOL NTAPI NtUserSBGetParms( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hwnd, + int fnBar, + PSBDATA pSBData, + LPSCROLLINFO lpsi); BOOL NTAPI @@ -3129,12 +3129,6 @@ OUT LPMONITORINFO pMonitorInfo); /* Should be done in usermode */ -BOOL -NTAPI -NtUserGetScrollInfo( - HWND hwnd, - int fnBar, - LPSCROLLINFO lpsi); /* (other FocusedItem values give the position of the focused item) */ #define NO_SELECTED_ITEM 0xffff Modified: trunk/reactos/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -1,17 +1,17 @@ #ifndef _WIN32K_SCROLL_H #define _WIN32K_SCROLL_H -typedef struct _WINDOW_SCROLLINFO +typedef struct _SBINFOEX { SCROLLBARINFO ScrollBarInfo; SCROLLINFO ScrollInfo; -} WINDOW_SCROLLINFO, *PWINDOW_SCROLLINFO; +} SBINFOEX, *PSBINFOEX; #define IntGetScrollbarInfoFromWindow(Window, i) \ - ((PSCROLLBARINFO)(&((Window)->Scroll + i)->ScrollBarInfo)) + ((PSCROLLBARINFO)(&((Window)->pSBInfo + i)->ScrollBarInfo)) #define IntGetScrollInfoFromWindow(Window, i) \ - ((LPSCROLLINFO)(&((Window)->Scroll + i)->ScrollInfo)) + ((LPSCROLLINFO)(&((Window)->pSBInfo + i)->ScrollInfo)) #define SBOBJ_TO_SBID(Obj) ((Obj) - OBJID_HSCROLL) #define SBID_IS_VALID(id) (id == SB_HORZ || id == SB_VERT || id == SB_CTL) Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -32,13 +32,13 @@ /* Entry in the thread's list of windows. */ LIST_ENTRY ListEntry; /* Handle for the window. */ - HWND hSelf; + HWND hSelf; // Use Wnd->head.h /* Window flags. */ ULONG state; /* Handle of region of the window to be updated. */ - HANDLE UpdateRegion; + HANDLE hrgnUpdate; /* Handle of the window region. */ - HANDLE WindowRegion; + HANDLE hrgnClip; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* spwndChild; @@ -53,13 +53,12 @@ /* DC Entries (DCE) */ PDCE Dce; /* Scrollbar info */ - PWINDOW_SCROLLINFO Scroll; + PSBINFOEX pSBInfo; // convert to PSBINFO PETHREAD OwnerThread; // Use Wnd->head.pti - HWND hWndLastPopup; /* handle to last active popup window (wine doesn't use pointer, for unk. reason)*/ /* counter for tiled child windows */ ULONG TiledCounter; /* WNDOBJ list */ - LIST_ENTRY WndObjListHead; + LIST_ENTRY WndObjListHead; // Use Props } WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */ /* Window flags. */ @@ -93,13 +92,15 @@ #define IntWndBelongsToThread(WndObj, W32Thread) \ (((WndObj->OwnerThread && WndObj->OwnerThread->Tcb.Win32Thread)) && \ (WndObj->OwnerThread->Tcb.Win32Thread == W32Thread)) +// ((WndObj->head.pti) && (WndObj->head.pti == W32Thread)) #define IntGetWndThreadId(WndObj) \ WndObj->OwnerThread->Cid.UniqueThread +// WndObj->head.pti->pEThread->Cid.UniqueThread #define IntGetWndProcessId(WndObj) \ WndObj->OwnerThread->ThreadsProcess->UniqueProcessId - +// WndObj->head.pti->pEThread->ThreadsProcess->UniqueProcessId BOOL FASTCALL IntIsWindow(HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -10,8 +10,8 @@ (x) < (WndObject)->Wnd->rcWindow.right && \ (y) >= (WndObject)->Wnd->rcWindow.top && \ (y) < (WndObject)->Wnd->rcWindow.bottom && \ - (!(WndObject)->WindowRegion || ((WndObject)->Wnd->style & WS_MINIMIZE) || \ - NtGdiPtInRegion((WndObject)->WindowRegion, (INT)((x) - (WndObject)->Wnd->rcWindow.left), \ + (!(WndObject)->hrgnClip || ((WndObject)->Wnd->style & WS_MINIMIZE) || \ + NtGdiPtInRegion((WndObject)->hrgnClip, (INT)((x) - (WndObject)->Wnd->rcWindow.left), \ (INT)((y) - (WndObject)->Wnd->rcWindow.top)))) UINT 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] Sun Jan 10 08:50:57 2010 @@ -650,7 +650,7 @@ Window = UserGetDesktopWindow(); IntInvalidateWindows( Window, - Window->UpdateRegion, + Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -505,25 +505,10 @@ return 0; } - DWORD APIENTRY NtUserRegisterTasklist( DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - - -DWORD -APIENTRY -NtUserSBGetParms( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -76,7 +76,7 @@ if (ParentWnd->style & WS_CLIPCHILDREN) break; - if (ParentWindow->UpdateRegion != 0) + if (ParentWindow->hrgnUpdate != 0) { if (Recurse) return FALSE; @@ -110,12 +110,12 @@ else hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Wnd->rcWindow); - if (Window->WindowRegion != NULL && !(Wnd->style & WS_MINIMIZE)) + if (Window->hrgnClip != NULL && !(Wnd->style & WS_MINIMIZE)) { NtGdiOffsetRgn(hRgnWindow, -Wnd->rcWindow.left, -Wnd->rcWindow.top); - RgnType = NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->WindowRegion, RGN_AND); + RgnType = NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->hrgnClip, RGN_AND); NtGdiOffsetRgn(hRgnWindow, Wnd->rcWindow.left, Wnd->rcWindow.top); @@ -146,8 +146,8 @@ HRGN hRgnWindow; UINT RgnType; - if (Window->UpdateRegion != NULL && - Window->UpdateRegion != (HRGN)1) + if (Window->hrgnUpdate != NULL && + Window->hrgnUpdate != (HRGN)1) { hRgnNonClient = IntCalcWindowRgn(Window, FALSE); @@ -189,12 +189,12 @@ if (Validate) { - if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, + if (NtGdiCombineRgn(Window->hrgnUpdate, Window->hrgnUpdate, hRgnWindow, RGN_AND) == NULLREGION) { - GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - GreDeleteObject(Window->UpdateRegion); - Window->UpdateRegion = NULL; + GDIOBJ_SetOwnership(Window->hrgnUpdate, PsGetCurrentProcess()); + GreDeleteObject(Window->hrgnUpdate); + Window->hrgnUpdate = NULL; if (!(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)) MsqDecPaintCountQueue(Window->MessageQueue); } @@ -206,7 +206,7 @@ } else { - return Window->UpdateRegion; + return Window->hrgnUpdate; } } @@ -228,15 +228,15 @@ if (Flags & (RDW_ERASENOW | RDW_UPDATENOW)) { - if (Window->UpdateRegion) - { - if (!IntValidateParent(Window, Window->UpdateRegion, Recurse)) + if (Window->hrgnUpdate) + { + if (!IntValidateParent(Window, Window->hrgnUpdate, Recurse)) return; } if (Flags & RDW_UPDATENOW) { - if (Window->UpdateRegion != NULL || + if (Window->hrgnUpdate != NULL || Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) { co_IntSendMessage(hWnd, WM_PAINT, 0, 0); @@ -259,9 +259,9 @@ if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND) { - if (Window->UpdateRegion) + if (Window->hrgnUpdate) { - hDC = UserGetDCEx(Window, Window->UpdateRegion, + hDC = UserGetDCEx(Window, Window->hrgnUpdate, DCX_CACHE | DCX_USESTYLE | DCX_INTERSECTRGN | DCX_KEEPCLIPRGN); if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) @@ -343,7 +343,7 @@ * Clip the given region with window rectangle (or region) */ - if (!Window->WindowRegion || (Wnd->style & WS_MINIMIZE)) + if (!Window->hrgnClip || (Wnd->style & WS_MINIMIZE)) { HRGN hRgnWindow; @@ -356,7 +356,7 @@ NtGdiOffsetRgn(hRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); - RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->WindowRegion, RGN_AND); + RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->hrgnClip, RGN_AND); NtGdiOffsetRgn(hRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); @@ -366,7 +366,7 @@ * Save current state of pending updates */ - HadPaintMessage = Window->UpdateRegion != NULL || + HadPaintMessage = Window->hrgnUpdate != NULL || Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; @@ -376,18 +376,18 @@ if (Flags & RDW_INVALIDATE && RgnType != NULLREGION) { - if (Window->UpdateRegion == NULL) - { - Window->UpdateRegion = NtGdiCreateRectRgn(0, 0, 0, 0); - GDIOBJ_SetOwnership(Window->UpdateRegion, NULL); - } - - if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, + if (Window->hrgnUpdate == NULL) + { + Window->hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); + GDIOBJ_SetOwnership(Window->hrgnUpdate, NULL); + } + + if (NtGdiCombineRgn(Window->hrgnUpdate, Window->hrgnUpdate, hRgn, RGN_OR) == NULLREGION) { - GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - GreDeleteObject(Window->UpdateRegion); - Window->UpdateRegion = NULL; + GDIOBJ_SetOwnership(Window->hrgnUpdate, PsGetCurrentProcess()); + GreDeleteObject(Window->hrgnUpdate); + Window->hrgnUpdate = NULL; } if (Flags & RDW_FRAME) @@ -400,18 +400,18 @@ if (Flags & RDW_VALIDATE && RgnType != NULLREGION) { - if (Window->UpdateRegion != NULL) - { - if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, + if (Window->hrgnUpdate != NULL) + { + if (NtGdiCombineRgn(Window->hrgnUpdate, Window->hrgnUpdate, hRgn, RGN_DIFF) == NULLREGION) { - GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); - GreDeleteObject(Window->UpdateRegion); - Window->UpdateRegion = NULL; + GDIOBJ_SetOwnership(Window->hrgnUpdate, PsGetCurrentProcess()); + GreDeleteObject(Window->hrgnUpdate); + Window->hrgnUpdate = NULL; } } - if (Window->UpdateRegion == NULL) + if (Window->hrgnUpdate == NULL) Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; if (Flags & RDW_NOFRAME) Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; @@ -443,7 +443,7 @@ if (Child->Wnd->style & WS_VISIBLE) { /* - * Recursive call to update children UpdateRegion + * Recursive call to update children hrgnUpdate */ HRGN hRgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0); NtGdiCombineRgn(hRgnTemp, hRgn, 0, RGN_COPY); @@ -458,7 +458,7 @@ * Fake post paint messages to window message queue if needed */ - HasPaintMessage = Window->UpdateRegion != NULL || + HasPaintMessage = Window->hrgnUpdate != NULL || Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; HasNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; @@ -611,7 +611,7 @@ { PWND Wnd = Window->Wnd; return (Wnd->style & WS_VISIBLE) && - ((Window->UpdateRegion != NULL) || + ((Window->hrgnUpdate != NULL) || (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) || (Window->state & WINDOWOBJECT_NEED_NCPAINT)); } @@ -787,19 +787,19 @@ RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); - Ps.hdc = UserGetDCEx(Window, Window->UpdateRegion, DCX_INTERSECTRGN | DCX_USESTYLE); + Ps.hdc = UserGetDCEx(Window, Window->hrgnUpdate, DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps.hdc) { RETURN(NULL); } - if (Window->UpdateRegion != NULL) + if (Window->hrgnUpdate != NULL) { MsqDecPaintCountQueue(Window->MessageQueue); GdiGetClipBox(Ps.hdc, &Ps.rcPaint); - GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); + GDIOBJ_SetOwnership(Window->hrgnUpdate, PsGetCurrentProcess()); /* The region is part of the dc now and belongs to the process! */ - Window->UpdateRegion = NULL; + Window->hrgnUpdate = NULL; } else { @@ -820,14 +820,14 @@ { Ps.fErase = FALSE; } - if (Window->UpdateRegion) + if (Window->hrgnUpdate) { if (!(Wnd->style & WS_CLIPCHILDREN)) { PWINDOW_OBJECT Child; for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { - IntInvalidateWindows(Child, Window->UpdateRegion, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); + IntInvalidateWindows(Child, Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); } } } @@ -912,7 +912,7 @@ ASSERT_REFS_CO(Window); - if (Window->UpdateRegion == NULL) + if (Window->hrgnUpdate == NULL) { RegionType = (NtGdiSetRectRgn(hRgn, 0, 0, 0, 0) ? NULLREGION : ERROR); } @@ -921,7 +921,7 @@ Rect = Window->Wnd->rcClient; IntIntersectWithParents(Window, &Rect); NtGdiSetRectRgn(hRgn, Rect.left, Rect.top, Rect.right, Rect.bottom); - RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->UpdateRegion, RGN_AND); + RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->hrgnUpdate, RGN_AND); NtGdiOffsetRgn(hRgn, -Window->Wnd->rcClient.left, -Window->Wnd->rcClient.top); } @@ -993,20 +993,20 @@ RETURN(FALSE); } - if (Window->UpdateRegion == NULL) + if (Window->hrgnUpdate == NULL) { Rect.left = Rect.top = Rect.right = Rect.bottom = 0; } else { /* Get the update region bounding box. */ - if (Window->UpdateRegion == (HRGN)1) + if (Window->hrgnUpdate == (HRGN)1) { Rect = Window->Wnd->rcClient; } else { - RgnData = RGNOBJAPI_Lock(Window->UpdateRegion, NULL); + RgnData = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); ASSERT(RgnData != NULL); RegionType = REGION_GetRgnBox(RgnData, &Rect); RGNOBJAPI_Unlock(RgnData); 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] Sun Jan 10 08:50:57 2010 @@ -167,7 +167,7 @@ LPSCROLLINFO psi; ASSERT(Window); - ASSERT(Window->Scroll); + ASSERT(Window->pSBInfo); sbi = IntGetScrollbarInfoFromWindow(Window, wBar); psi = IntGetScrollInfoFromWindow(Window, wBar); @@ -429,21 +429,21 @@ ASSERT_REFS_CO(Window); - if(Window->Scroll) + if(Window->pSBInfo) { /* no need to create it anymore */ return TRUE; } /* allocate memory for all scrollbars (HORZ, VERT, CONTROL) */ - Size = 3 * (sizeof(WINDOW_SCROLLINFO)); - if(!(Window->Scroll = ExAllocatePoolWithTag(PagedPool, Size, TAG_SBARINFO))) + Size = 3 * (sizeof(SBINFOEX)); + if(!(Window->pSBInfo = ExAllocatePoolWithTag(PagedPool, Size, TAG_SBARINFO))) { DPRINT1("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->hSelf); return FALSE; } - RtlZeroMemory(Window->Scroll, Size); + RtlZeroMemory(Window->pSBInfo, Size); Result = co_WinPosGetNonClientSize(Window, &Window->Wnd->rcWindow, @@ -470,10 +470,10 @@ BOOL FASTCALL IntDestroyScrollBars(PWINDOW_OBJECT Window) { - if(Window->Scroll) - { - ExFreePool(Window->Scroll); - Window->Scroll = NULL; + if(Window->pSBInfo) + { + ExFreePool(Window->pSBInfo); + Window->pSBInfo = NULL; return TRUE; } return FALSE; @@ -567,7 +567,11 @@ BOOL APIENTRY -NtUserGetScrollInfo(HWND hWnd, int fnBar, LPSCROLLINFO lpsi) +NtUserSBGetParms( + HWND hWnd, + int fnBar, + PSBDATA pSBData, + LPSCROLLINFO lpsi) { NTSTATUS Status; PWINDOW_OBJECT Window; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -98,10 +98,10 @@ { ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentSiblingWnd->rcWindow); /* Combine it with the window region if available */ - if (CurrentSibling->WindowRegion && !(CurrentSiblingWnd->style & WS_MINIMIZE)) + if (CurrentSibling->hrgnClip && !(CurrentSiblingWnd->style & WS_MINIMIZE)) { NtGdiOffsetRgn(ClipRgn, -CurrentSiblingWnd->rcWindow.left, -CurrentSiblingWnd->rcWindow.top); - NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentSibling->WindowRegion, RGN_AND); + NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentSibling->hrgnClip, RGN_AND); NtGdiOffsetRgn(ClipRgn, CurrentSiblingWnd->rcWindow.left, CurrentSiblingWnd->rcWindow.top); } NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); @@ -127,10 +127,10 @@ { ClipRgn = UnsafeIntCreateRectRgnIndirect(&CurrentWnd->rcWindow); /* Combine it with the window region if available */ - if (CurrentWindow->WindowRegion && !(CurrentWnd->style & WS_MINIMIZE)) + if (CurrentWindow->hrgnClip && !(CurrentWnd->style & WS_MINIMIZE)) { NtGdiOffsetRgn(ClipRgn, -CurrentWnd->rcWindow.left, -CurrentWnd->rcWindow.top); - NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentWindow->WindowRegion, RGN_AND); + NtGdiCombineRgn(ClipRgn, ClipRgn, CurrentWindow->hrgnClip, RGN_AND); NtGdiOffsetRgn(ClipRgn, CurrentWnd->rcWindow.left, CurrentWnd->rcWindow.top); } NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); @@ -140,10 +140,10 @@ } } - if (Window->WindowRegion && !(Wnd->style & WS_MINIMIZE)) + if (Window->hrgnClip && !(Wnd->style & WS_MINIMIZE)) { NtGdiOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); - NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); + NtGdiCombineRgn(VisRgn, VisRgn, Window->hrgnClip, RGN_AND); NtGdiOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -536,7 +536,7 @@ { Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; Dce->DCXFlags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; - ClipRegion = Window->UpdateRegion; + ClipRegion = Window->hrgnUpdate; } if (ClipRegion == (HRGN) 1) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -498,9 +498,9 @@ Window->pti->ppi); Wnd->pcls = NULL; - if(Window->WindowRegion) - { - GreDeleteObject(Window->WindowRegion); + if(Window->hrgnClip) + { + GreDeleteObject(Window->hrgnClip); } ASSERT(Window->Wnd != NULL); @@ -2312,7 +2312,6 @@ } IntLinkWindow(Window, ParentWindow, InsertAfter /* prev sibling */); - } } @@ -4552,8 +4551,8 @@ VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcWindow); NtGdiOffsetRgn(VisRgn, -Window->Wnd->rcWindow.left, -Window->Wnd->rcWindow.top); /* if there's a region assigned to the window, combine them both */ - if(Window->WindowRegion && !(Wnd->style & WS_MINIMIZE)) - NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); + if(Window->hrgnClip && !(Wnd->style & WS_MINIMIZE)) + NtGdiCombineRgn(VisRgn, VisRgn, Window->hrgnClip, RGN_AND); /* Copy the region into hRgn */ NtGdiCombineRgn(hRgn, VisRgn, NULL, RGN_COPY); @@ -4593,8 +4592,8 @@ VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcWindow); NtGdiOffsetRgn(VisRgn, -Window->Wnd->rcWindow.left, -Window->Wnd->rcWindow.top); /* if there's a region assigned to the window, combine them both */ - if(Window->WindowRegion && !(Wnd->style & WS_MINIMIZE)) - NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); + if(Window->hrgnClip && !(Wnd->style & WS_MINIMIZE)) + NtGdiCombineRgn(VisRgn, VisRgn, Window->hrgnClip, RGN_AND); if((pRgn = RGNOBJAPI_Lock(VisRgn, NULL))) { @@ -4634,12 +4633,12 @@ /* FIXME - Verify if hRgn is a valid handle!!!! Propably make this operation thread-safe, but maybe it's not necessary */ - if(Window->WindowRegion) + if(Window->hrgnClip) { /* Delete no longer needed region handle */ - GreDeleteObject(Window->WindowRegion); - } - Window->WindowRegion = hRgn; + GreDeleteObject(Window->hrgnClip); + } + Window->hrgnClip = hRgn; /* FIXME - send WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED messages to the window */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -1097,9 +1097,9 @@ Window->Wnd->style |= WS_VISIBLE; } - if (Window->UpdateRegion != NULL && Window->UpdateRegion != (HRGN)1) - { - NtGdiOffsetRgn(Window->UpdateRegion, + if (Window->hrgnUpdate != NULL && Window->hrgnUpdate != (HRGN)1) + { + NtGdiOffsetRgn(Window->hrgnUpdate, NewWindowRect.left - OldWindowRect.left, NewWindowRect.top - OldWindowRect.top); } @@ -1162,10 +1162,10 @@ } /* No use in copying bits which are in the update region. */ - if (Window->UpdateRegion != NULL) + if (Window->hrgnUpdate != NULL) { NtGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); - NtGdiCombineRgn(CopyRgn, CopyRgn, Window->UpdateRegion, RGN_DIFF); + NtGdiCombineRgn(CopyRgn, CopyRgn, Window->hrgnUpdate, RGN_DIFF); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Jan 10 08:50:57 2010 @@ -689,7 +689,6 @@ NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 -NtUserGetScrollInfo 3 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3

1 0

[ekohl] 45020: Removed outdated email addresses.
by ekohl＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: ekohl Date: Sat Jan 9 23:43:16 2010 New Revision: 45020 URL: http://svn.reactos.org/svn/reactos?rev=45020&view=rev Log: Removed outdated email addresses. Modified: trunk/reactos/CREDITS trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/user32/misc/exit.c trunk/reactos/drivers/base/beep/beep.c trunk/reactos/drivers/filesystems/fastfat/shutdown.c trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/storage/class/include/class2.h trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/hal/halamd64/generic/misc.c trunk/reactos/hal/halppc/generic/beep.c trunk/reactos/hal/halppc/generic/cmos.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halppc/generic/misc.c trunk/reactos/hal/halppc/generic/portio.c trunk/reactos/hal/halppc/generic/reboot.c trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/mp/ipi_mp.c trunk/reactos/hal/halx86/mp/spinlock.c trunk/reactos/include/reactos/libs/samlib/samlib.h trunk/reactos/include/reactos/libs/syssetup/syssetup.h trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/rtl/compress.c trunk/reactos/lib/rtl/handle.c trunk/reactos/lib/rtl/luid.c trunk/reactos/lib/rtl/message.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=45020&r1=45019… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -16,7 +16,7 @@ David Welch <welch(a)cwcom.net> Dmitry Chapyshev <dmitry(a)reactos.org> Emanuele Aliberti <ea(a)iol.it> -Eric Kohl <ekohl(a)rz-online.de> +Eric Kohl Eugene Ingerman <geneing(a)myrealbox.com> Filip Navara <xnavara(a)volny.cz> Frederik Leemans Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/audit.c * PURPOSE: Audit functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * Created 07/19/2003 */ Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -21,7 +21,7 @@ * PROJECT: ReactOS system libraries * PURPOSE: Computer name functions * FILE: lib/kernel32/misc/computername.c - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMER: Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/dll/win32/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exit… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/exit.c * PURPOSE: Shutdown related functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl */ #include <user32.h> Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: drivers/base/beep/beep.c * PURPOSE: Beep Device Driver * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/shutdown.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: services/dd/blue/blue.c * PURPOSE: Console (blue screen) device driver - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * ??? Created */ Modified: trunk/reactos/drivers/storage/class/include/class2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/incl… ============================================================================== --- trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS kernel * FILE: services/storage/include/class2.h * PURPOSE: SCSI class driver definitions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl */ #ifndef __INCLUDE_DDK_CLASS2_H Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -21,7 +21,7 @@ * PROJECT: ReactOS Storage Stack * FILE: drivers/storage/scsiport/scsiport.c * PURPOSE: SCSI port driver - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl * Aleksey Bragin (aleksey reactos org) */ Modified: trunk/reactos/hal/halamd64/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/misc.… ============================================================================== --- trunk/reactos/hal/halamd64/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/misc.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: hal/halx86/generic/misc.c * PURPOSE: Miscellanous Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halppc/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/beep.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/beep.c * PURPOSE: Speaker function (it's only one) - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * Created 31/01/99 */ Modified: trunk/reactos/hal/halppc/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/cmos.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: hal/halx86/generic/cmos.c * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -22,7 +22,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/display.c * PURPOSE: Blue screen display - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * Created 08/10/99 */ Modified: trunk/reactos/hal/halppc/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: hal/halx86/generic/misc.c * PURPOSE: Miscellanous Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halppc/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/portio.… ============================================================================== --- trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/portio.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/portio.c * PURPOSE: Port I/O functions - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * Created 18/10/99 */ Modified: trunk/reactos/hal/halppc/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/reboot.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/reboot.c * PURPOSE: Reboot functions. - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * PROGRAMMER: Eric Kohl * UPDATE HISTORY: * Created 11/10/99 */ Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: hal/halx86/generic/cmos.c * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: hal/halx86/generic/reboot.c * PURPOSE: Reboot functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ipi_mp.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/ipi_mp.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/ipi_mp.c * PURPOSE: IPI functions for MP - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMER: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/hal/x86/spinlock.c * PURPOSE: Implements spinlocks * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl * UPDATE HISTORY: * 09/06/2000 Created */ Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli… ============================================================================== --- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -8,7 +8,7 @@ * This file is part of the ReactOS Operating System. * * Contributors: - * Created by Eric Kohl <ekohl(a)rz-online.de> + * Created by Eric Kohl * * THIS SOFTWARE IS NOT COPYRIGHTED * Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -8,7 +8,7 @@ * This file is part of the ReactOS Operating System. * * Contributors: - * Created by Eric Kohl <ekohl(a)rz-online.de> + * Created by Eric Kohl * * THIS SOFTWARE IS NOT COPYRIGHTED * Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: fat12.c * PURPOSE: Fat12 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl * REVISIONS: * EK 05/04-2003 Created */ Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: fat16.c * PURPOSE: Fat16 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl * REVISIONS: * EK 05/04-2003 Created */ Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: fat32.c * PURPOSE: Fat32 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl * REVISIONS: * EK 05/04-2003 Created */ Modified: trunk/reactos/lib/rtl/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/compress.c?rev=450… ============================================================================== --- trunk/reactos/lib/rtl/compress.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/compress.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS system libraries * PURPOSE: Compression and decompression functions * FILE: lib/rtl/compress.c - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMER: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=45020… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS system libraries * PURPOSE: Handle table * FILE: lib/rtl/handle.c - * PROGRAMER: Eric Kohl <ekohl(a)rz-online.de> + * PROGRAMER: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/lib/rtl/luid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/luid.c?rev=45020&r… ============================================================================== --- trunk/reactos/lib/rtl/luid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/luid.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS system libraries * PURPOSE: Locally unique identifier (LUID) helper functions * FILE: lib/rtl/luid.c - * PROGRAMER: Eric Kohl <ekohl(a)zr-online.de> + * PROGRAMER: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/lib/rtl/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=4502… ============================================================================== --- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/rtl/message.c * PURPOSE: Message table functions - * PROGRAMMERS: Eric Kohl <ekohl(a)zr-online.de> + * PROGRAMMERS: Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=450… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/ex/init.c * PURPOSE: Executive Initialization Code * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/fstub/disksup.c * PURPOSE: I/O HAL Routines for Disk Access * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -* Eric Kohl (ekohl(a)rz-online.de) +* Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/io/iomgr/arcname.c * PURPOSE: ARC Path Initialization Functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -* Eric Kohl (ekohl(a)rz-online.de) +* Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=4502… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -5,7 +5,7 @@ * PURPOSE: Deferred Procedure Call (DPC) Support * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Philip Susi (phreak(a)iag.net) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -5,7 +5,7 @@ * PURPOSE: Implements kernel queues * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes - * Eric Kohl (ekohl(a)rz-online.de) + * Eric Kohl */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 9 23:43:16 2010 @@ -6,7 +6,6 @@ * * ElTorito-Support * by Eric Kohl - * ekohl(a)rz-online.de * * Linux port * by Casper S. Hornstrup

1 0

[ekohl] 45019: Reverted some coding-style changes as per Alekseys request.
by ekohl＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: ekohl Date: Sat Jan 9 22:57:00 2010 New Revision: 45019 URL: http://svn.reactos.org/svn/reactos?rev=45019&view=rev Log: Reverted some coding-style changes as per Alekseys request. Modified: trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/fls.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -848,16 +848,16 @@ &ProcessBasicInfo, sizeof(ProcessBasicInfo), NULL); - if (!NT_SUCCESS(Status)) - goto Error; + + if (!NT_SUCCESS(Status)) goto Error; Status = NtReadVirtualMemory(ProcessHandle, ProcessBasicInfo.PebBaseAddress, &Peb, sizeof(Peb), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) - goto Error; + + if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) goto Error; memset(&DosHeader, 0, sizeof(DosHeader)); Status = NtReadVirtualMemory(ProcessHandle, @@ -866,11 +866,8 @@ sizeof(DosHeader), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) - goto Error; - - if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) - goto Error; + if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) goto Error; + if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) goto Error; memset(&NtHeaders, 0, sizeof(NtHeaders)); Status = NtReadVirtualMemory(ProcessHandle, @@ -879,11 +876,8 @@ sizeof(NtHeaders), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) - goto Error; - - if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) - goto Error; + if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) goto Error; + if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) goto Error; Version = MAKELONG(NtHeaders.OptionalHeader.MinorSubsystemVersion, NtHeaders.OptionalHeader.MajorSubsystemVersion); @@ -897,8 +891,7 @@ } _SEH2_FINALLY { - if (ProcessHandle) - CloseHandle(ProcessHandle); + if (ProcessHandle) CloseHandle(ProcessHandle); } _SEH2_END; @@ -1075,11 +1068,9 @@ &Needed); Result = DynamicBuffer; } - else - Result = (PUNICODE_STRING)Buffer; - - if (!NT_SUCCESS(Status)) - goto Cleanup; + else Result = (PUNICODE_STRING)Buffer; + + if (!NT_SUCCESS(Status)) goto Cleanup; if (Result->Length / sizeof(WCHAR) + 1 > *pdwSize) { Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -294,8 +294,7 @@ "Address: %p\n", ProcessHandle, StandardHandle, Address); /* Don't touch Console Handles */ - if (IsConsoleHandle(StandardHandle)) - return; + if (IsConsoleHandle(StandardHandle)) return; /* Duplicate the handle */ Status = NtDuplicateObject(NtCurrentProcess(), @@ -1018,8 +1017,7 @@ CmdLineLength = wcslen(CMD_STRING) + wcslen(lpCommandLine) + 1; /* If we found quotes, then add them into the length size */ - if (CmdLineIsAppName || FoundQuotes) - CmdLineLength += 2; + if (CmdLineIsAppName || FoundQuotes) CmdLineLength += 2; CmdLineLength *= sizeof(WCHAR); /* Allocate space for the new command line */ @@ -1313,8 +1311,7 @@ if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) { lpEnvironment = BasepConvertUnicodeEnvironment(&EnvSize, lpEnvironment); - if (!lpEnvironment) - goto Cleanup; + if (!lpEnvironment) goto Cleanup; } /* Create Process Environment */ @@ -1422,31 +1419,21 @@ Cleanup: /* De-allocate heap strings */ - if (NameBuffer) - RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); - + if (NameBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); if (ApplicationName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); - - if (CurrentDirectory) - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory); - - if (QuotedCmdLine) - RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine); + if (CurrentDirectory) RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory); + if (QuotedCmdLine) RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine); /* Kill any handles still alive */ - if (hSection) - NtClose(hSection); - + if (hSection) NtClose(hSection); if (hThread) { /* We don't know any more details then this */ NtTerminateProcess(hProcess, STATUS_UNSUCCESSFUL); NtClose(hThread); } - - if (hProcess) - NtClose(hProcess); + if (hProcess) NtClose(hProcess); /* Return Success */ return Ret; Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -26,9 +26,8 @@ /* Initialize the critical section and raise an exception if we failed */ Status = RtlInitializeCriticalSection( - (PRTL_CRITICAL_SECTION)lpCriticalSection); - if (!NT_SUCCESS(Status)) - RtlRaiseStatus(Status); + (PRTL_CRITICAL_SECTION)lpCriticalSection); + if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status); } /* Modified: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/mutex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/mutex.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -75,8 +75,7 @@ BOOLEAN InitialOwner; /* Now check if we got a name */ - if (lpName) - RtlInitUnicodeString(&ObjectName, lpName); + if (lpName) RtlInitUnicodeString(&ObjectName, lpName); if (dwFlags & ~(CREATE_MUTEX_INITIAL_OWNER)) { @@ -258,8 +257,7 @@ /* Release the mutant */ Status = NtReleaseMutant(hMutex, NULL); - if (NT_SUCCESS(Status)) - return TRUE; + if (NT_SUCCESS(Status)) return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/sem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/sem.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -80,8 +80,7 @@ UNICODE_STRING ObjectName; /* Now check if we got a name */ - if (lpName) - RtlInitUnicodeString(&ObjectName, lpName); + if (lpName) RtlInitUnicodeString(&ObjectName, lpName); if (dwFlags != 0) { @@ -261,8 +260,7 @@ /* Release the semaphore */ Status = NtReleaseSemaphore(hSemaphore, lReleaseCount, lpPreviousCount); - if (NT_SUCCESS(Status)) - return TRUE; + if (NT_SUCCESS(Status)) return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/timer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/timer.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -75,8 +75,7 @@ TIMER_TYPE TimerType; /* Now check if we got a name */ - if (lpTimerName) - RtlInitUnicodeString(&ObjectName, lpTimerName); + if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName); if (dwFlags & ~(CREATE_WAITABLE_TIMER_MANUAL_RESET)) { @@ -269,8 +268,7 @@ (BOOLEAN)fResume, lPeriod, NULL); - if (NT_SUCCESS(Status)) - return TRUE; + if (NT_SUCCESS(Status)) return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); @@ -288,8 +286,7 @@ /* Cancel the timer */ Status = NtCancelTimer(hTimer, NULL); - if (NT_SUCCESS(Status)) - return TRUE; + if (NT_SUCCESS(Status)) return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -69,8 +69,7 @@ DPRINT1("Converting Thread to Fiber\n"); /* the current thread is already a fiber */ - if (pTeb->HasFiberData && pTeb->Tib.FiberData) - return pTeb->Tib.FiberData; + if(pTeb->HasFiberData && pTeb->Tib.FiberData) return pTeb->Tib.FiberData; /* allocate the fiber */ pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), @@ -228,8 +227,7 @@ RtlFreeHeap(GetProcessHeap(), 0, lpFiber); /* the fiber is deleting itself: let the system deallocate the stack */ - if (NtCurrentTeb()->Tib.FiberData == lpFiber) - ExitThread(1); + if(NtCurrentTeb()->Tib.FiberData == lpFiber) ExitThread(1); /* deallocate the stack */ NtFreeVirtualMemory(NtCurrentProcess(), Modified: trunk/reactos/dll/win32/kernel32/thread/fls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fls.c [iso-8859-1] Sat Jan 9 22:57:00 2010 @@ -55,13 +55,11 @@ PVOID *ppFlsSlots; PVOID pRetVal; - if (dwFlsIndex >= 128) - goto l_InvalidParam; + if(dwFlsIndex >= 128) goto l_InvalidParam; ppFlsSlots = NtCurrentTeb()->FlsData; - if (ppFlsSlots == NULL) - goto l_InvalidParam; + if(ppFlsSlots == NULL) goto l_InvalidParam; SetLastError(0); pRetVal = ppFlsSlots[dwFlsIndex + 2]; @@ -84,8 +82,7 @@ PVOID *ppFlsSlots; TEB *pTeb = NtCurrentTeb(); - if (dwFlsIndex >= 128) - goto l_InvalidParam; + if(dwFlsIndex >= 128) goto l_InvalidParam; ppFlsSlots = pTeb->FlsData; @@ -96,8 +93,7 @@ ppFlsSlots = RtlAllocateHeap(pPeb->ProcessHeap, HEAP_ZERO_MEMORY, (128 + 2) * sizeof(PVOID)); - if (ppFlsSlots == NULL) - goto l_OutOfMemory; + if(ppFlsSlots == NULL) goto l_OutOfMemory; pTeb->FlsData = ppFlsSlots;

1 0

[ekohl] 45018: Fix indentation and coding style. No code changes.
by ekohl＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: ekohl Date: Sat Jan 9 21:51:33 2010 New Revision: 45018 URL: http://svn.reactos.org/svn/reactos?rev=45018&view=rev Log: Fix indentation and coding style. No code changes. Modified: trunk/reactos/dll/win32/kernel32/process/cmdline.c trunk/reactos/dll/win32/kernel32/process/job.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/process/session.c trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/event.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/synch/wait.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/fls.c trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/process/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/cmdline.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -27,80 +27,85 @@ /* FUNCTIONS ****************************************************************/ -static VOID -InitCommandLines (VOID) +static +VOID +InitCommandLines(VOID) { - PRTL_USER_PROCESS_PARAMETERS Params; + PRTL_USER_PROCESS_PARAMETERS Params; - /* FIXME - not thread-safe! */ + /* FIXME - not thread-safe! */ - // get command line - Params = NtCurrentPeb()->ProcessParameters; - RtlNormalizeProcessParams (Params); + // get command line + Params = NtCurrentPeb()->ProcessParameters; + RtlNormalizeProcessParams (Params); - // initialize command line buffers - CommandLineStringW.Length = Params->CommandLine.Length; - CommandLineStringW.MaximumLength = CommandLineStringW.Length + sizeof(WCHAR); - CommandLineStringW.Buffer = RtlAllocateHeap(GetProcessHeap(), - HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, - CommandLineStringW.MaximumLength); - if (CommandLineStringW.Buffer == NULL) - { - return; - } + // initialize command line buffers + CommandLineStringW.Length = Params->CommandLine.Length; + CommandLineStringW.MaximumLength = CommandLineStringW.Length + sizeof(WCHAR); + CommandLineStringW.Buffer = RtlAllocateHeap(GetProcessHeap(), + HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, + CommandLineStringW.MaximumLength); + if (CommandLineStringW.Buffer == NULL) + { + return; + } - RtlInitAnsiString(&CommandLineStringA, NULL); + RtlInitAnsiString(&CommandLineStringA, NULL); - // copy command line - RtlCopyUnicodeString (&CommandLineStringW, - &(Params->CommandLine)); - CommandLineStringW.Buffer[CommandLineStringW.Length / sizeof(WCHAR)] = 0; + /* Copy command line */ + RtlCopyUnicodeString(&CommandLineStringW, + &(Params->CommandLine)); + CommandLineStringW.Buffer[CommandLineStringW.Length / sizeof(WCHAR)] = 0; - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&CommandLineStringA, - &CommandLineStringW, - TRUE); - else - RtlUnicodeStringToOemString (&CommandLineStringA, - &CommandLineStringW, - TRUE); + /* convert unicode string to ansi (or oem) */ + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString(&CommandLineStringA, + &CommandLineStringW, + TRUE); + else + RtlUnicodeStringToOemString(&CommandLineStringA, + &CommandLineStringW, + TRUE); - CommandLineStringA.Buffer[CommandLineStringA.Length] = 0; + CommandLineStringA.Buffer[CommandLineStringA.Length] = 0; - bCommandLineInitialized = TRUE; + bCommandLineInitialized = TRUE; } /* * @implemented */ -LPSTR WINAPI GetCommandLineA(VOID) +LPSTR +WINAPI +GetCommandLineA(VOID) { - if (bCommandLineInitialized == FALSE) - { - InitCommandLines (); - } + if (bCommandLineInitialized == FALSE) + { + InitCommandLines(); + } - DPRINT ("CommandLine \'%s\'\n", CommandLineStringA.Buffer); + DPRINT("CommandLine \'%s\'\n", CommandLineStringA.Buffer); - return(CommandLineStringA.Buffer); + return CommandLineStringA.Buffer; } /* * @implemented */ -LPWSTR WINAPI GetCommandLineW (VOID) +LPWSTR +WINAPI +GetCommandLineW(VOID) { - if (bCommandLineInitialized == FALSE) - { - InitCommandLines (); - } + if (bCommandLineInitialized == FALSE) + { + InitCommandLines(); + } - DPRINT ("CommandLine \'%S\'\n", CommandLineStringW.Buffer); + DPRINT("CommandLine \'%S\'\n", CommandLineStringW.Buffer); - return(CommandLineStringW.Buffer); + return CommandLineStringW.Buffer; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/job.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -27,31 +27,32 @@ CreateJobObjectA(LPSECURITY_ATTRIBUTES lpJobAttributes, LPCSTR lpName) { - HANDLE hJob; - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - - if(lpName != NULL) - { - NTSTATUS Status; - - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - } - - hJob = CreateJobObjectW(lpJobAttributes, - ((lpName != NULL) ? UnicodeName.Buffer : NULL)); - - if(lpName != NULL) - { - RtlFreeUnicodeString(&UnicodeName); - } - return hJob; + HANDLE hJob; + ANSI_STRING AnsiName; + UNICODE_STRING UnicodeName; + + if (lpName != NULL) + { + NTSTATUS Status; + + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + } + + hJob = CreateJobObjectW(lpJobAttributes, + ((lpName != NULL) ? UnicodeName.Buffer : NULL)); + + if (lpName != NULL) + { + RtlFreeUnicodeString(&UnicodeName); + } + + return hJob; } @@ -63,47 +64,48 @@ CreateJobObjectW(LPSECURITY_ATTRIBUTES lpJobAttributes, LPCWSTR lpName) { - UNICODE_STRING JobName; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG Attributes = 0; - PVOID SecurityDescriptor; - HANDLE hJob; - NTSTATUS Status; - - if(lpName != NULL) - { - RtlInitUnicodeString(&JobName, lpName); - } - - if(lpJobAttributes != NULL) - { - if(lpJobAttributes->bInheritHandle) - { - Attributes |= OBJ_INHERIT; - } - SecurityDescriptor = lpJobAttributes->lpSecurityDescriptor; - } - else - { - SecurityDescriptor = NULL; - } - - InitializeObjectAttributes(&ObjectAttributes, - ((lpName != NULL) ? &JobName : NULL), - Attributes, - NULL, - SecurityDescriptor); - - Status = NtCreateJobObject(&hJob, - JOB_OBJECT_ALL_ACCESS, - &ObjectAttributes); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return hJob; + UNICODE_STRING JobName; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG Attributes = 0; + PVOID SecurityDescriptor; + HANDLE hJob; + NTSTATUS Status; + + if (lpName != NULL) + { + RtlInitUnicodeString(&JobName, lpName); + } + + if (lpJobAttributes != NULL) + { + if (lpJobAttributes->bInheritHandle) + { + Attributes |= OBJ_INHERIT; + } + + SecurityDescriptor = lpJobAttributes->lpSecurityDescriptor; + } + else + { + SecurityDescriptor = NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, + ((lpName != NULL) ? &JobName : NULL), + Attributes, + NULL, + SecurityDescriptor); + + Status = NtCreateJobObject(&hJob, + JOB_OBJECT_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return NULL; + } + + return hJob; } @@ -116,36 +118,35 @@ BOOL bInheritHandle, LPCWSTR lpName) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING JobName; - HANDLE hJob; - NTSTATUS Status; - - if(lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&JobName, lpName); - - InitializeObjectAttributes(&ObjectAttributes, - &JobName, - (bInheritHandle ? OBJ_INHERIT : 0), - NULL, - NULL); - - Status = NtOpenJobObject(&hJob, - dwDesiredAccess, - &ObjectAttributes); - - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return hJob; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING JobName; + HANDLE hJob; + NTSTATUS Status; + + if (lpName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + RtlInitUnicodeString(&JobName, lpName); + + InitializeObjectAttributes(&ObjectAttributes, + &JobName, + (bInheritHandle ? OBJ_INHERIT : 0), + NULL, + NULL); + + Status = NtOpenJobObject(&hJob, + dwDesiredAccess, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return NULL; + } + + return hJob; } @@ -158,31 +159,31 @@ BOOL bInheritHandle, LPCSTR lpName) { - ANSI_STRING AnsiName; - UNICODE_STRING UnicodeName; - HANDLE hJob; - NTSTATUS Status; - - if(lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitAnsiString(&AnsiName, lpName); - Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - hJob = OpenJobObjectW(dwDesiredAccess, - bInheritHandle, - UnicodeName.Buffer); - - RtlFreeUnicodeString(&UnicodeName); - return hJob; + ANSI_STRING AnsiName; + UNICODE_STRING UnicodeName; + HANDLE hJob; + NTSTATUS Status; + + if (lpName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, TRUE); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + hJob = OpenJobObjectW(dwDesiredAccess, + bInheritHandle, + UnicodeName.Buffer); + + RtlFreeUnicodeString(&UnicodeName); + return hJob; } @@ -195,17 +196,17 @@ HANDLE JobHandle, PBOOL Result) { - NTSTATUS Status; - - Status = NtIsProcessInJob(ProcessHandle, JobHandle); - if(NT_SUCCESS(Status)) - { - *Result = (Status == STATUS_PROCESS_IN_JOB); - return TRUE; - } - - SetLastErrorByStatus(Status); - return FALSE; + NTSTATUS Status; + + Status = NtIsProcessInJob(ProcessHandle, JobHandle); + if (NT_SUCCESS(Status)) + { + *Result = (Status == STATUS_PROCESS_IN_JOB); + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; } @@ -217,15 +218,16 @@ AssignProcessToJobObject(HANDLE hJob, HANDLE hProcess) { - NTSTATUS Status; - - Status = NtAssignProcessToJobObject(hJob, hProcess); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; + NTSTATUS Status; + + Status = NtAssignProcessToJobObject(hJob, hProcess); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } @@ -240,66 +242,74 @@ DWORD cbJobObjectInformationLength, LPDWORD lpReturnLength) { - NTSTATUS Status; - - Status = NtQueryInformationJobObject(hJob, - JobObjectInformationClass, - lpJobObjectInformation, - cbJobObjectInformationLength, - lpReturnLength); - if(NT_SUCCESS(Status)) - { - PJOBOBJECT_BASIC_LIMIT_INFORMATION BasicInfo; - switch(JobObjectInformationClass) - { - case JobObjectBasicLimitInformation: - BasicInfo = (PJOBOBJECT_BASIC_LIMIT_INFORMATION)lpJobObjectInformation; - break; - case JobObjectExtendedLimitInformation: - BasicInfo = &((PJOBOBJECT_EXTENDED_LIMIT_INFORMATION)lpJobObjectInformation)->BasicLimitInformation; - break; - - default: - BasicInfo = NULL; - break; - } - - if(BasicInfo != NULL) - { - /* we need to convert the process priority classes in the - JOBOBJECT_BASIC_LIMIT_INFORMATION structure the same way as - GetPriorityClass() converts it! */ - switch(BasicInfo->PriorityClass) - { - case PROCESS_PRIORITY_CLASS_IDLE: - BasicInfo->PriorityClass = IDLE_PRIORITY_CLASS; - break; - case PROCESS_PRIORITY_CLASS_BELOW_NORMAL: - BasicInfo->PriorityClass = BELOW_NORMAL_PRIORITY_CLASS; - break; - case PROCESS_PRIORITY_CLASS_NORMAL: - BasicInfo->PriorityClass = NORMAL_PRIORITY_CLASS; - break; - case PROCESS_PRIORITY_CLASS_ABOVE_NORMAL: - BasicInfo->PriorityClass = ABOVE_NORMAL_PRIORITY_CLASS; - break; - case PROCESS_PRIORITY_CLASS_HIGH: - BasicInfo->PriorityClass = HIGH_PRIORITY_CLASS; - break; - case PROCESS_PRIORITY_CLASS_REALTIME: - BasicInfo->PriorityClass = REALTIME_PRIORITY_CLASS; - break; - default: - BasicInfo->PriorityClass = NORMAL_PRIORITY_CLASS; - break; - } - } - - return TRUE; - } - - SetLastErrorByStatus(Status); - return FALSE; + NTSTATUS Status; + + Status = NtQueryInformationJobObject(hJob, + JobObjectInformationClass, + lpJobObjectInformation, + cbJobObjectInformationLength, + lpReturnLength); + if (NT_SUCCESS(Status)) + { + PJOBOBJECT_BASIC_LIMIT_INFORMATION BasicInfo; + + switch (JobObjectInformationClass) + { + case JobObjectBasicLimitInformation: + BasicInfo = (PJOBOBJECT_BASIC_LIMIT_INFORMATION)lpJobObjectInformation; + break; + + case JobObjectExtendedLimitInformation: + BasicInfo = &((PJOBOBJECT_EXTENDED_LIMIT_INFORMATION)lpJobObjectInformation)->BasicLimitInformation; + break; + + default: + BasicInfo = NULL; + break; + } + + if (BasicInfo != NULL) + { + /* we need to convert the process priority classes in the + JOBOBJECT_BASIC_LIMIT_INFORMATION structure the same way as + GetPriorityClass() converts it! */ + switch (BasicInfo->PriorityClass) + { + case PROCESS_PRIORITY_CLASS_IDLE: + BasicInfo->PriorityClass = IDLE_PRIORITY_CLASS; + break; + + case PROCESS_PRIORITY_CLASS_BELOW_NORMAL: + BasicInfo->PriorityClass = BELOW_NORMAL_PRIORITY_CLASS; + break; + + case PROCESS_PRIORITY_CLASS_NORMAL: + BasicInfo->PriorityClass = NORMAL_PRIORITY_CLASS; + break; + + case PROCESS_PRIORITY_CLASS_ABOVE_NORMAL: + BasicInfo->PriorityClass = ABOVE_NORMAL_PRIORITY_CLASS; + break; + + case PROCESS_PRIORITY_CLASS_HIGH: + BasicInfo->PriorityClass = HIGH_PRIORITY_CLASS; + break; + + case PROCESS_PRIORITY_CLASS_REALTIME: + BasicInfo->PriorityClass = REALTIME_PRIORITY_CLASS; + break; + + default: + BasicInfo->PriorityClass = NORMAL_PRIORITY_CLASS; + break; + } + } + + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; } @@ -313,83 +323,91 @@ LPVOID lpJobObjectInformation, DWORD cbJobObjectInformationLength) { - JOBOBJECT_EXTENDED_LIMIT_INFORMATION ExtendedLimitInfo; - PJOBOBJECT_BASIC_LIMIT_INFORMATION BasicInfo; - PVOID ObjectInfo; - NTSTATUS Status; - - switch(JobObjectInformationClass) - { - case JobObjectBasicLimitInformation: - if(cbJobObjectInformationLength != sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION)) - { - SetLastError(ERROR_BAD_LENGTH); + JOBOBJECT_EXTENDED_LIMIT_INFORMATION ExtendedLimitInfo; + PJOBOBJECT_BASIC_LIMIT_INFORMATION BasicInfo; + PVOID ObjectInfo; + NTSTATUS Status; + + switch (JobObjectInformationClass) + { + case JobObjectBasicLimitInformation: + if (cbJobObjectInformationLength != sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION)) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + + ObjectInfo = &ExtendedLimitInfo.BasicLimitInformation; + BasicInfo = (PJOBOBJECT_BASIC_LIMIT_INFORMATION)ObjectInfo; + RtlCopyMemory(ObjectInfo, lpJobObjectInformation, cbJobObjectInformationLength); + break; + + case JobObjectExtendedLimitInformation: + if (cbJobObjectInformationLength != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + + ObjectInfo = &ExtendedLimitInfo; + BasicInfo = &ExtendedLimitInfo.BasicLimitInformation; + RtlCopyMemory(ObjectInfo, lpJobObjectInformation, cbJobObjectInformationLength); + break; + + default: + ObjectInfo = lpJobObjectInformation; + BasicInfo = NULL; + break; + } + + if (BasicInfo != NULL) + { + /* we need to convert the process priority classes in the + JOBOBJECT_BASIC_LIMIT_INFORMATION structure the same way as + SetPriorityClass() converts it! */ + switch(BasicInfo->PriorityClass) + { + case IDLE_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_IDLE; + break; + + case BELOW_NORMAL_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_BELOW_NORMAL; + break; + + case NORMAL_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; + break; + + case ABOVE_NORMAL_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_ABOVE_NORMAL; + break; + + case HIGH_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; + break; + + case REALTIME_PRIORITY_CLASS: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_REALTIME; + break; + + default: + BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; + break; + } + } + + Status = NtSetInformationJobObject(hJob, + JobObjectInformationClass, + ObjectInfo, + cbJobObjectInformationLength); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); return FALSE; - } - ObjectInfo = &ExtendedLimitInfo.BasicLimitInformation; - BasicInfo = (PJOBOBJECT_BASIC_LIMIT_INFORMATION)ObjectInfo; - RtlCopyMemory(ObjectInfo, lpJobObjectInformation, cbJobObjectInformationLength); - break; - - case JobObjectExtendedLimitInformation: - if(cbJobObjectInformationLength != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) - { - SetLastError(ERROR_BAD_LENGTH); - return FALSE; - } - ObjectInfo = &ExtendedLimitInfo; - BasicInfo = &ExtendedLimitInfo.BasicLimitInformation; - RtlCopyMemory(ObjectInfo, lpJobObjectInformation, cbJobObjectInformationLength); - break; - - default: - ObjectInfo = lpJobObjectInformation; - BasicInfo = NULL; - break; - } - - if(BasicInfo != NULL) - { - /* we need to convert the process priority classes in the - JOBOBJECT_BASIC_LIMIT_INFORMATION structure the same way as - SetPriorityClass() converts it! */ - switch(BasicInfo->PriorityClass) - { - case IDLE_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_IDLE; - break; - case BELOW_NORMAL_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_BELOW_NORMAL; - break; - case NORMAL_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - break; - case ABOVE_NORMAL_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_ABOVE_NORMAL; - break; - case HIGH_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; - break; - case REALTIME_PRIORITY_CLASS: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_REALTIME; - break; - default: - BasicInfo->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - break; - } - } - - Status = NtSetInformationJobObject(hJob, - JobObjectInformationClass, - ObjectInfo, - cbJobObjectInformationLength); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; + } + + return TRUE; } @@ -401,17 +419,16 @@ TerminateJobObject(HANDLE hJob, UINT uExitCode) { - NTSTATUS Status; - - Status = NtTerminateJobObject(hJob, uExitCode); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; -} - + NTSTATUS Status; + + Status = NtTerminateJobObject(hJob, uExitCode); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -33,275 +33,286 @@ /* * @implemented */ -BOOL WINAPI -GetProcessAffinityMask (HANDLE hProcess, - LPDWORD lpProcessAffinityMask, - LPDWORD lpSystemAffinityMask) -{ - PROCESS_BASIC_INFORMATION ProcessInfo; - SYSTEM_BASIC_INFORMATION SystemInfo; - NTSTATUS Status; - - Status = NtQuerySystemInformation(SystemBasicInformation, - &SystemInfo, - sizeof(SystemInfo), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - Status = NtQueryInformationProcess (hProcess, - ProcessBasicInformation, - (PVOID)&ProcessInfo, - sizeof(PROCESS_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - *lpProcessAffinityMask = (DWORD)ProcessInfo.AffinityMask; - *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessorsAffinityMask; - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -SetProcessAffinityMask (HANDLE hProcess, - DWORD dwProcessAffinityMask) -{ - NTSTATUS Status; - - Status = NtSetInformationProcess (hProcess, - ProcessAffinityMask, - (PVOID)&dwProcessAffinityMask, - sizeof(DWORD)); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -GetProcessShutdownParameters (LPDWORD lpdwLevel, - LPDWORD lpdwFlags) -{ - CSR_API_MESSAGE CsrRequest; - ULONG Request; - NTSTATUS Status; - - Request = GET_SHUTDOWN_PARAMETERS; - Status = CsrClientCallServer(&CsrRequest, - NULL, - MAKE_CSR_API(Request, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { - SetLastErrorByStatus (Status); - return(FALSE); - } - - *lpdwLevel = CsrRequest.Data.GetShutdownParametersRequest.Level; - *lpdwFlags = CsrRequest.Data.GetShutdownParametersRequest.Flags; - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetProcessShutdownParameters (DWORD dwLevel, - DWORD dwFlags) -{ - CSR_API_MESSAGE CsrRequest; - ULONG Request; - NTSTATUS Status; - - CsrRequest.Data.SetShutdownParametersRequest.Level = dwLevel; - CsrRequest.Data.SetShutdownParametersRequest.Flags = dwFlags; - - Request = SET_SHUTDOWN_PARAMETERS; - Status = CsrClientCallServer(&CsrRequest, - NULL, - MAKE_CSR_API(Request, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { - SetLastErrorByStatus (Status); - return(FALSE); - } - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetProcessWorkingSetSize (HANDLE hProcess, - PSIZE_T lpMinimumWorkingSetSize, - PSIZE_T lpMaximumWorkingSetSize) -{ - QUOTA_LIMITS QuotaLimits; - NTSTATUS Status; - - Status = NtQueryInformationProcess(hProcess, - ProcessQuotaLimits, - &QuotaLimits, - sizeof(QUOTA_LIMITS), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - - *lpMinimumWorkingSetSize = QuotaLimits.MinimumWorkingSetSize; - *lpMaximumWorkingSetSize = QuotaLimits.MaximumWorkingSetSize; - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI +BOOL +WINAPI +GetProcessAffinityMask(HANDLE hProcess, + LPDWORD lpProcessAffinityMask, + LPDWORD lpSystemAffinityMask) +{ + PROCESS_BASIC_INFORMATION ProcessInfo; + SYSTEM_BASIC_INFORMATION SystemInfo; + NTSTATUS Status; + + Status = NtQuerySystemInformation(SystemBasicInformation, + &SystemInfo, + sizeof(SystemInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + Status = NtQueryInformationProcess(hProcess, + ProcessBasicInformation, + (PVOID)&ProcessInfo, + sizeof(PROCESS_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + *lpProcessAffinityMask = (DWORD)ProcessInfo.AffinityMask; + *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessorsAffinityMask; + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +SetProcessAffinityMask(HANDLE hProcess, + DWORD dwProcessAffinityMask) +{ + NTSTATUS Status; + + Status = NtSetInformationProcess(hProcess, + ProcessAffinityMask, + (PVOID)&dwProcessAffinityMask, + sizeof(DWORD)); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetProcessShutdownParameters(LPDWORD lpdwLevel, + LPDWORD lpdwFlags) +{ + CSR_API_MESSAGE CsrRequest; + ULONG Request; + NTSTATUS Status; + + Request = GET_SHUTDOWN_PARAMETERS; + Status = CsrClientCallServer(&CsrRequest, + NULL, + MAKE_CSR_API(Request, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + *lpdwLevel = CsrRequest.Data.GetShutdownParametersRequest.Level; + *lpdwFlags = CsrRequest.Data.GetShutdownParametersRequest.Flags; + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +SetProcessShutdownParameters(DWORD dwLevel, + DWORD dwFlags) +{ + CSR_API_MESSAGE CsrRequest; + ULONG Request; + NTSTATUS Status; + + CsrRequest.Data.SetShutdownParametersRequest.Level = dwLevel; + CsrRequest.Data.SetShutdownParametersRequest.Flags = dwFlags; + + Request = SET_SHUTDOWN_PARAMETERS; + Status = CsrClientCallServer(&CsrRequest, + NULL, + MAKE_CSR_API(Request, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetProcessWorkingSetSize(HANDLE hProcess, + PSIZE_T lpMinimumWorkingSetSize, + PSIZE_T lpMaximumWorkingSetSize) +{ + QUOTA_LIMITS QuotaLimits; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessQuotaLimits, + &QuotaLimits, + sizeof(QUOTA_LIMITS), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + *lpMinimumWorkingSetSize = QuotaLimits.MinimumWorkingSetSize; + *lpMaximumWorkingSetSize = QuotaLimits.MaximumWorkingSetSize; + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI SetProcessWorkingSetSize(HANDLE hProcess, - SIZE_T dwMinimumWorkingSetSize, - SIZE_T dwMaximumWorkingSetSize) -{ - QUOTA_LIMITS QuotaLimits; - NTSTATUS Status; - - QuotaLimits.MinimumWorkingSetSize = dwMinimumWorkingSetSize; - QuotaLimits.MaximumWorkingSetSize = dwMaximumWorkingSetSize; - - Status = NtSetInformationProcess(hProcess, - ProcessQuotaLimits, - &QuotaLimits, - sizeof(QUOTA_LIMITS)); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI + SIZE_T dwMinimumWorkingSetSize, + SIZE_T dwMaximumWorkingSetSize) +{ + QUOTA_LIMITS QuotaLimits; + NTSTATUS Status; + + QuotaLimits.MinimumWorkingSetSize = dwMinimumWorkingSetSize; + QuotaLimits.MaximumWorkingSetSize = dwMaximumWorkingSetSize; + + Status = NtSetInformationProcess(hProcess, + ProcessQuotaLimits, + &QuotaLimits, + sizeof(QUOTA_LIMITS)); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI GetProcessTimes(HANDLE hProcess, - LPFILETIME lpCreationTime, - LPFILETIME lpExitTime, - LPFILETIME lpKernelTime, - LPFILETIME lpUserTime) -{ - KERNEL_USER_TIMES Kut; - NTSTATUS Status; - - Status = NtQueryInformationProcess(hProcess, - ProcessTimes, - &Kut, - sizeof(Kut), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - - lpCreationTime->dwLowDateTime = Kut.CreateTime.u.LowPart; - lpCreationTime->dwHighDateTime = Kut.CreateTime.u.HighPart; - - lpExitTime->dwLowDateTime = Kut.ExitTime.u.LowPart; - lpExitTime->dwHighDateTime = Kut.ExitTime.u.HighPart; - - lpKernelTime->dwLowDateTime = Kut.KernelTime.u.LowPart; - lpKernelTime->dwHighDateTime = Kut.KernelTime.u.HighPart; - - lpUserTime->dwLowDateTime = Kut.UserTime.u.LowPart; - lpUserTime->dwHighDateTime = Kut.UserTime.u.HighPart; - - return(TRUE); -} - - -/* - * @implemented - */ -HANDLE WINAPI + LPFILETIME lpCreationTime, + LPFILETIME lpExitTime, + LPFILETIME lpKernelTime, + LPFILETIME lpUserTime) +{ + KERNEL_USER_TIMES Kut; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessTimes, + &Kut, + sizeof(Kut), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + lpCreationTime->dwLowDateTime = Kut.CreateTime.u.LowPart; + lpCreationTime->dwHighDateTime = Kut.CreateTime.u.HighPart; + + lpExitTime->dwLowDateTime = Kut.ExitTime.u.LowPart; + lpExitTime->dwHighDateTime = Kut.ExitTime.u.HighPart; + + lpKernelTime->dwLowDateTime = Kut.KernelTime.u.LowPart; + lpKernelTime->dwHighDateTime = Kut.KernelTime.u.HighPart; + + lpUserTime->dwLowDateTime = Kut.UserTime.u.LowPart; + lpUserTime->dwHighDateTime = Kut.UserTime.u.HighPart; + + return TRUE; +} + + +/* + * @implemented + */ +HANDLE +WINAPI GetCurrentProcess(VOID) { - return((HANDLE)NtCurrentProcess()); -} - - -/* - * @implemented - */ -HANDLE WINAPI + return (HANDLE)NtCurrentProcess(); +} + + +/* + * @implemented + */ +HANDLE +WINAPI GetCurrentThread(VOID) { - return((HANDLE)NtCurrentThread()); -} - - -/* - * @implemented - */ -DWORD WINAPI + return (HANDLE)NtCurrentThread(); +} + + +/* + * @implemented + */ +DWORD +WINAPI GetCurrentProcessId(VOID) { - return((DWORD)GetTeb()->ClientId.UniqueProcess); -} - - -/* - * @implemented - */ -BOOL WINAPI + return (DWORD)GetTeb()->ClientId.UniqueProcess; +} + + +/* + * @implemented + */ +BOOL +WINAPI GetExitCodeProcess(HANDLE hProcess, - LPDWORD lpExitCode) -{ - PROCESS_BASIC_INFORMATION ProcessBasic; - NTSTATUS Status; - - Status = NtQueryInformationProcess(hProcess, - ProcessBasicInformation, - &ProcessBasic, - sizeof(PROCESS_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - - *lpExitCode = (DWORD)ProcessBasic.ExitStatus; - - return(TRUE); + LPDWORD lpExitCode) +{ + PROCESS_BASIC_INFORMATION ProcessBasic; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessBasicInformation, + &ProcessBasic, + sizeof(PROCESS_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + *lpExitCode = (DWORD)ProcessBasic.ExitStatus; + + return TRUE; } @@ -312,226 +323,230 @@ WINAPI GetProcessId(HANDLE Process) { - PROCESS_BASIC_INFORMATION ProcessBasic; - NTSTATUS Status; - - Status = NtQueryInformationProcess(Process, - ProcessBasicInformation, - &ProcessBasic, - sizeof(PROCESS_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return 0; - } - - return (DWORD)ProcessBasic.UniqueProcessId; -} - - -/* - * @implemented - */ -HANDLE WINAPI + PROCESS_BASIC_INFORMATION ProcessBasic; + NTSTATUS Status; + + Status = NtQueryInformationProcess(Process, + ProcessBasicInformation, + &ProcessBasic, + sizeof(PROCESS_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + + return (DWORD)ProcessBasic.UniqueProcessId; +} + + +/* + * @implemented + */ +HANDLE +WINAPI OpenProcess(DWORD dwDesiredAccess, - BOOL bInheritHandle, - DWORD dwProcessId) -{ - NTSTATUS errCode; - HANDLE ProcessHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId; - - ClientId.UniqueProcess = (HANDLE)dwProcessId; - ClientId.UniqueThread = 0; - - InitializeObjectAttributes(&ObjectAttributes, - NULL, - (bInheritHandle ? OBJ_INHERIT : 0), - NULL, - NULL); - - errCode = NtOpenProcess(&ProcessHandle, - dwDesiredAccess, - &ObjectAttributes, - &ClientId); - if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus (errCode); - return NULL; - } - return ProcessHandle; -} - - -/* - * @implemented - */ -UINT WINAPI + BOOL bInheritHandle, + DWORD dwProcessId) +{ + NTSTATUS errCode; + HANDLE ProcessHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + CLIENT_ID ClientId; + + ClientId.UniqueProcess = (HANDLE)dwProcessId; + ClientId.UniqueThread = 0; + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + (bInheritHandle ? OBJ_INHERIT : 0), + NULL, + NULL); + + errCode = NtOpenProcess(&ProcessHandle, + dwDesiredAccess, + &ObjectAttributes, + &ClientId); + if (!NT_SUCCESS(errCode)) + { + SetLastErrorByStatus(errCode); + return NULL; + } + + return ProcessHandle; +} + + +/* + * @implemented + */ +UINT +WINAPI WinExec(LPCSTR lpCmdLine, - UINT uCmdShow) -{ - STARTUPINFOA StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD dosErr; - - RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); - StartupInfo.cb = sizeof(STARTUPINFOA); - StartupInfo.wShowWindow = (WORD)uCmdShow; - StartupInfo.dwFlags = 0; - - if (! CreateProcessA(NULL, - (PVOID)lpCmdLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation)) - { - dosErr = GetLastError(); - return dosErr < 32 ? dosErr : ERROR_BAD_FORMAT; - } - if (NULL != lpfnGlobalRegisterWaitForInputIdle) - { - lpfnGlobalRegisterWaitForInputIdle ( - ProcessInformation.hProcess, - 10000 - ); - } - NtClose(ProcessInformation.hProcess); - NtClose(ProcessInformation.hThread); - - return 33; /* Something bigger than 31 means success. */ -} - - -/* - * @implemented - */ -VOID WINAPI -RegisterWaitForInputIdle ( - WaitForInputIdleType lpfnRegisterWaitForInputIdle - ) -{ - lpfnGlobalRegisterWaitForInputIdle = lpfnRegisterWaitForInputIdle; - return; -} - -/* - * @implemented - */ -VOID WINAPI + UINT uCmdShow) +{ + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD dosErr; + + RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(STARTUPINFOA); + StartupInfo.wShowWindow = (WORD)uCmdShow; + StartupInfo.dwFlags = 0; + + if (!CreateProcessA(NULL, + (PVOID)lpCmdLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation)) + { + dosErr = GetLastError(); + return dosErr < 32 ? dosErr : ERROR_BAD_FORMAT; + } + + if (NULL != lpfnGlobalRegisterWaitForInputIdle) + { + lpfnGlobalRegisterWaitForInputIdle(ProcessInformation.hProcess, + 10000); + } + + NtClose(ProcessInformation.hProcess); + NtClose(ProcessInformation.hThread); + + return 33; /* Something bigger than 31 means success. */ +} + + +/* + * @implemented + */ +VOID +WINAPI +RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle) +{ + lpfnGlobalRegisterWaitForInputIdle = lpfnRegisterWaitForInputIdle; + return; +} + +/* + * @implemented + */ +VOID +WINAPI GetStartupInfoW(LPSTARTUPINFOW lpStartupInfo) { - PRTL_USER_PROCESS_PARAMETERS Params; - - if (lpStartupInfo == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return; - } - - Params = NtCurrentPeb()->ProcessParameters; - - lpStartupInfo->cb = sizeof(STARTUPINFOW); - lpStartupInfo->lpDesktop = Params->DesktopInfo.Buffer; - lpStartupInfo->lpTitle = Params->WindowTitle.Buffer; - lpStartupInfo->dwX = Params->StartingX; - lpStartupInfo->dwY = Params->StartingY; - lpStartupInfo->dwXSize = Params->CountX; - lpStartupInfo->dwYSize = Params->CountY; - lpStartupInfo->dwXCountChars = Params->CountCharsX; - lpStartupInfo->dwYCountChars = Params->CountCharsY; - lpStartupInfo->dwFillAttribute = Params->FillAttribute; - lpStartupInfo->dwFlags = Params->WindowFlags; - lpStartupInfo->wShowWindow = (WORD)Params->ShowWindowFlags; - lpStartupInfo->cbReserved2 = Params->RuntimeData.Length; - lpStartupInfo->lpReserved2 = (LPBYTE)Params->RuntimeData.Buffer; - - lpStartupInfo->hStdInput = Params->StandardInput; - lpStartupInfo->hStdOutput = Params->StandardOutput; - lpStartupInfo->hStdError = Params->StandardError; -} - - -/* - * @implemented - */ -VOID WINAPI + PRTL_USER_PROCESS_PARAMETERS Params; + + if (lpStartupInfo == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + + Params = NtCurrentPeb()->ProcessParameters; + + lpStartupInfo->cb = sizeof(STARTUPINFOW); + lpStartupInfo->lpDesktop = Params->DesktopInfo.Buffer; + lpStartupInfo->lpTitle = Params->WindowTitle.Buffer; + lpStartupInfo->dwX = Params->StartingX; + lpStartupInfo->dwY = Params->StartingY; + lpStartupInfo->dwXSize = Params->CountX; + lpStartupInfo->dwYSize = Params->CountY; + lpStartupInfo->dwXCountChars = Params->CountCharsX; + lpStartupInfo->dwYCountChars = Params->CountCharsY; + lpStartupInfo->dwFillAttribute = Params->FillAttribute; + lpStartupInfo->dwFlags = Params->WindowFlags; + lpStartupInfo->wShowWindow = (WORD)Params->ShowWindowFlags; + lpStartupInfo->cbReserved2 = Params->RuntimeData.Length; + lpStartupInfo->lpReserved2 = (LPBYTE)Params->RuntimeData.Buffer; + + lpStartupInfo->hStdInput = Params->StandardInput; + lpStartupInfo->hStdOutput = Params->StandardOutput; + lpStartupInfo->hStdError = Params->StandardError; +} + + +/* + * @implemented + */ +VOID +WINAPI GetStartupInfoA(LPSTARTUPINFOA lpStartupInfo) { - PRTL_USER_PROCESS_PARAMETERS Params; - ANSI_STRING AnsiString; - - if (lpStartupInfo == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return; - } - - Params = NtCurrentPeb ()->ProcessParameters; - - RtlAcquirePebLock (); - - /* FIXME - not thread-safe */ - if (lpLocalStartupInfo == NULL) - { - /* create new local startup info (ansi) */ - lpLocalStartupInfo = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - sizeof(STARTUPINFOA)); + PRTL_USER_PROCESS_PARAMETERS Params; + ANSI_STRING AnsiString; + + if (lpStartupInfo == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + + Params = NtCurrentPeb ()->ProcessParameters; + + RtlAcquirePebLock (); + + /* FIXME - not thread-safe */ + if (lpLocalStartupInfo == NULL) + { + /* create new local startup info (ansi) */ + lpLocalStartupInfo = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(STARTUPINFOA)); if (lpLocalStartupInfo == NULL) { - RtlReleasePebLock (); + RtlReleasePebLock(); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return; } - lpLocalStartupInfo->cb = sizeof(STARTUPINFOA); - - /* copy window title string */ - RtlUnicodeStringToAnsiString (&AnsiString, - &Params->WindowTitle, - TRUE); - lpLocalStartupInfo->lpTitle = AnsiString.Buffer; - - /* copy desktop info string */ - RtlUnicodeStringToAnsiString (&AnsiString, - &Params->DesktopInfo, - TRUE); - lpLocalStartupInfo->lpDesktop = AnsiString.Buffer; - - /* copy shell info string */ - RtlUnicodeStringToAnsiString (&AnsiString, - &Params->ShellInfo, - TRUE); - lpLocalStartupInfo->lpReserved = AnsiString.Buffer; - - lpLocalStartupInfo->dwX = Params->StartingX; - lpLocalStartupInfo->dwY = Params->StartingY; - lpLocalStartupInfo->dwXSize = Params->CountX; - lpLocalStartupInfo->dwYSize = Params->CountY; - lpLocalStartupInfo->dwXCountChars = Params->CountCharsX; - lpLocalStartupInfo->dwYCountChars = Params->CountCharsY; - lpLocalStartupInfo->dwFillAttribute = Params->FillAttribute; - lpLocalStartupInfo->dwFlags = Params->WindowFlags; - lpLocalStartupInfo->wShowWindow = (WORD)Params->ShowWindowFlags; - lpLocalStartupInfo->cbReserved2 = Params->RuntimeData.Length; - lpLocalStartupInfo->lpReserved2 = (LPBYTE)Params->RuntimeData.Buffer; - - lpLocalStartupInfo->hStdInput = Params->StandardInput; - lpLocalStartupInfo->hStdOutput = Params->StandardOutput; - lpLocalStartupInfo->hStdError = Params->StandardError; - } - - RtlReleasePebLock (); - - /* copy local startup info data to external startup info */ - memcpy (lpStartupInfo, + lpLocalStartupInfo->cb = sizeof(STARTUPINFOA); + + /* copy window title string */ + RtlUnicodeStringToAnsiString(&AnsiString, + &Params->WindowTitle, + TRUE); + lpLocalStartupInfo->lpTitle = AnsiString.Buffer; + + /* copy desktop info string */ + RtlUnicodeStringToAnsiString(&AnsiString, + &Params->DesktopInfo, + TRUE); + lpLocalStartupInfo->lpDesktop = AnsiString.Buffer; + + /* copy shell info string */ + RtlUnicodeStringToAnsiString(&AnsiString, + &Params->ShellInfo, + TRUE); + lpLocalStartupInfo->lpReserved = AnsiString.Buffer; + + lpLocalStartupInfo->dwX = Params->StartingX; + lpLocalStartupInfo->dwY = Params->StartingY; + lpLocalStartupInfo->dwXSize = Params->CountX; + lpLocalStartupInfo->dwYSize = Params->CountY; + lpLocalStartupInfo->dwXCountChars = Params->CountCharsX; + lpLocalStartupInfo->dwYCountChars = Params->CountCharsY; + lpLocalStartupInfo->dwFillAttribute = Params->FillAttribute; + lpLocalStartupInfo->dwFlags = Params->WindowFlags; + lpLocalStartupInfo->wShowWindow = (WORD)Params->ShowWindowFlags; + lpLocalStartupInfo->cbReserved2 = Params->RuntimeData.Length; + lpLocalStartupInfo->lpReserved2 = (LPBYTE)Params->RuntimeData.Buffer; + + lpLocalStartupInfo->hStdInput = Params->StandardInput; + lpLocalStartupInfo->hStdOutput = Params->StandardOutput; + lpLocalStartupInfo->hStdError = Params->StandardError; + } + + RtlReleasePebLock(); + + /* copy local startup info data to external startup info */ + memcpy(lpStartupInfo, lpLocalStartupInfo, sizeof(STARTUPINFOA)); } @@ -540,112 +555,118 @@ /* * @implemented */ -BOOL WINAPI -FlushInstructionCache (HANDLE hProcess, - LPCVOID lpBaseAddress, - DWORD dwSize) -{ - NTSTATUS Status; - - Status = NtFlushInstructionCache(hProcess, - (PVOID)lpBaseAddress, - dwSize); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); +BOOL +WINAPI +FlushInstructionCache(HANDLE hProcess, + LPCVOID lpBaseAddress, + DWORD dwSize) +{ + NTSTATUS Status; + + Status = NtFlushInstructionCache(hProcess, + (PVOID)lpBaseAddress, + dwSize); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +VOID +WINAPI +ExitProcess(UINT uExitCode) +{ + CSR_API_MESSAGE CsrRequest; + ULONG Request; + NTSTATUS Status; + + /* kill sibling threads ... we want to be alone at this point */ + NtTerminateProcess(NULL, 0); + + /* unload all dll's */ + LdrShutdownProcess(); + + /* notify csrss of process termination */ + Request = TERMINATE_PROCESS; + Status = CsrClientCallServer(&CsrRequest, + NULL, + MAKE_CSR_API(Request, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) + { + DPRINT("Failed to tell csrss about terminating process\n"); + } + + NtTerminateProcess(NtCurrentProcess (), + uExitCode); + + /* should never get here */ + ASSERT(0); + while(1); +} + + +/* + * @implemented + */ +BOOL +WINAPI +TerminateProcess(HANDLE hProcess, + UINT uExitCode) +{ + NTSTATUS Status; + + if (hProcess == NULL) + { return FALSE; } - return TRUE; -} - - -/* - * @implemented - */ -VOID WINAPI -ExitProcess(UINT uExitCode) -{ - CSR_API_MESSAGE CsrRequest; - ULONG Request; - NTSTATUS Status; - - /* kill sibling threads ... we want to be alone at this point */ - NtTerminateProcess (NULL, 0); - - /* unload all dll's */ - LdrShutdownProcess (); - - /* notify csrss of process termination */ - Request = TERMINATE_PROCESS; - Status = CsrClientCallServer(&CsrRequest, - NULL, - MAKE_CSR_API(Request, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) - { - DPRINT("Failed to tell csrss about terminating process\n"); - } - - - NtTerminateProcess (NtCurrentProcess (), - uExitCode); - - /* should never get here */ - ASSERT(0); - while(1); -} - - -/* - * @implemented - */ -BOOL WINAPI -TerminateProcess (HANDLE hProcess, - UINT uExitCode) -{ - NTSTATUS Status; - - if (hProcess == NULL) - { - return FALSE; - } - - Status = NtTerminateProcess (hProcess, uExitCode); - if (NT_SUCCESS(Status)) - { - return TRUE; - } - SetLastErrorByStatus (Status); - return FALSE; + + Status = NtTerminateProcess(hProcess, uExitCode); + if (NT_SUCCESS(Status)) + { + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; } /* * @unimplemented */ -VOID WINAPI +VOID +WINAPI FatalAppExitA(UINT uAction, - LPCSTR lpMessageText) -{ - UNICODE_STRING MessageTextU; - ANSI_STRING MessageText; - - RtlInitAnsiString (&MessageText, (LPSTR) lpMessageText); - - RtlAnsiStringToUnicodeString (&MessageTextU, - &MessageText, - TRUE); - - FatalAppExitW (uAction, MessageTextU.Buffer); - - RtlFreeUnicodeString (&MessageTextU); + LPCSTR lpMessageText) +{ + UNICODE_STRING MessageTextU; + ANSI_STRING MessageText; + + RtlInitAnsiString(&MessageText, (LPSTR)lpMessageText); + + RtlAnsiStringToUnicodeString(&MessageTextU, + &MessageText, + TRUE); + + FatalAppExitW(uAction, MessageTextU.Buffer); + + RtlFreeUnicodeString(&MessageTextU); } /* * @unimplemented */ -VOID WINAPI +VOID +WINAPI FatalAppExitW(UINT uAction, LPCWSTR lpMessageText) { @@ -657,7 +678,7 @@ DPRINT1("AppExit\n"); if (hModule) - pMessageBoxW = (MessageBoxW_Proc) GetProcAddress(hModule, "MessageBoxW"); + pMessageBoxW = (MessageBoxW_Proc)GetProcAddress(hModule, "MessageBoxW"); if (pMessageBoxW) pMessageBoxW(0, lpMessageText, NULL, MB_SYSTEMMODAL | MB_OK); @@ -671,18 +692,20 @@ /* * @implemented */ -VOID WINAPI -FatalExit (int ExitCode) -{ - ExitProcess(ExitCode); -} - - -/* - * @implemented - */ -DWORD WINAPI -GetPriorityClass (HANDLE hProcess) +VOID +WINAPI +FatalExit(int ExitCode) +{ + ExitProcess(ExitCode); +} + + +/* + * @implemented + */ +DWORD +WINAPI +GetPriorityClass(HANDLE hProcess) { NTSTATUS Status; PROCESS_PRIORITY_CLASS PriorityClass; @@ -727,65 +750,66 @@ /* * @implemented */ -BOOL WINAPI -SetPriorityClass (HANDLE hProcess, - DWORD dwPriorityClass) -{ - NTSTATUS Status; - PROCESS_PRIORITY_CLASS PriorityClass; - - switch(dwPriorityClass) - { - case IDLE_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_IDLE; - break; - - case BELOW_NORMAL_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_BELOW_NORMAL; - break; - - case NORMAL_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - break; - - case ABOVE_NORMAL_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_ABOVE_NORMAL; - break; - - case HIGH_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; - break; - - case REALTIME_PRIORITY_CLASS: - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_REALTIME; - break; - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - PriorityClass.Foreground = FALSE; - - Status = NtSetInformationProcess(hProcess, - ProcessPriorityClass, - &PriorityClass, - sizeof(PROCESS_PRIORITY_CLASS)); - - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -DWORD WINAPI +BOOL +WINAPI +SetPriorityClass(HANDLE hProcess, + DWORD dwPriorityClass) +{ + NTSTATUS Status; + PROCESS_PRIORITY_CLASS PriorityClass; + + switch (dwPriorityClass) + { + case IDLE_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_IDLE; + break; + + case BELOW_NORMAL_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_BELOW_NORMAL; + break; + + case NORMAL_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; + break; + + case ABOVE_NORMAL_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_ABOVE_NORMAL; + break; + + case HIGH_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; + break; + + case REALTIME_PRIORITY_CLASS: + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_REALTIME; + break; + + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + PriorityClass.Foreground = FALSE; + + Status = NtSetInformationProcess(hProcess, + ProcessPriorityClass, + &PriorityClass, + sizeof(PROCESS_PRIORITY_CLASS)); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +DWORD +WINAPI GetProcessVersion(DWORD ProcessId) { DWORD Version = 0; @@ -801,17 +825,18 @@ _SEH2_TRY { - /* Caller's */ if (0 == ProcessId || GetCurrentProcessId() == ProcessId) { + /* Caller's */ BaseAddress = (PVOID) NtCurrentPeb()->ImageBaseAddress; NtHeader = RtlImageNtHeader(BaseAddress); Version = (NtHeader->OptionalHeader.MajorOperatingSystemVersion << 16) | (NtHeader->OptionalHeader.MinorOperatingSystemVersion); } - else /* other process */ + else { + /* Other process */ ProcessHandle = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, ProcessId); @@ -823,14 +848,16 @@ &ProcessBasicInfo, sizeof(ProcessBasicInfo), NULL); - if (!NT_SUCCESS(Status)) goto Error; + if (!NT_SUCCESS(Status)) + goto Error; Status = NtReadVirtualMemory(ProcessHandle, ProcessBasicInfo.PebBaseAddress, &Peb, sizeof(Peb), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) goto Error; + if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) + goto Error; memset(&DosHeader, 0, sizeof(DosHeader)); Status = NtReadVirtualMemory(ProcessHandle, @@ -839,8 +866,11 @@ sizeof(DosHeader), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) goto Error; - if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) goto Error; + if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) + goto Error; + + if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) + goto Error; memset(&NtHeaders, 0, sizeof(NtHeaders)); Status = NtReadVirtualMemory(ProcessHandle, @@ -849,8 +879,11 @@ sizeof(NtHeaders), &Count); - if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) goto Error; - if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) goto Error; + if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) + goto Error; + + if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) + goto Error; Version = MAKELONG(NtHeaders.OptionalHeader.MinorSubsystemVersion, NtHeaders.OptionalHeader.MajorSubsystemVersion); @@ -864,7 +897,8 @@ } _SEH2_FINALLY { - if (ProcessHandle) CloseHandle(ProcessHandle); + if (ProcessHandle) + CloseHandle(ProcessHandle); } _SEH2_END; @@ -877,24 +911,23 @@ */ BOOL WINAPI -GetProcessIoCounters( - HANDLE hProcess, - PIO_COUNTERS lpIoCounters) -{ - NTSTATUS Status; - - Status = NtQueryInformationProcess(hProcess, - ProcessIoCounters, - lpIoCounters, - sizeof(IO_COUNTERS), - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - - return TRUE; +GetProcessIoCounters(HANDLE hProcess, + PIO_COUNTERS lpIoCounters) +{ + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessIoCounters, + lpIoCounters, + sizeof(IO_COUNTERS), + NULL); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } @@ -906,22 +939,22 @@ GetProcessPriorityBoost(HANDLE hProcess, PBOOL pDisablePriorityBoost) { - NTSTATUS Status; - ULONG PriorityBoost; - - Status = NtQueryInformationProcess(hProcess, - ProcessPriorityBoost, - &PriorityBoost, - sizeof(ULONG), - NULL); - if (NT_SUCCESS(Status)) - { - *pDisablePriorityBoost = PriorityBoost; - return TRUE; - } - - SetLastErrorByStatus(Status); - return FALSE; + NTSTATUS Status; + ULONG PriorityBoost; + + Status = NtQueryInformationProcess(hProcess, + ProcessPriorityBoost, + &PriorityBoost, + sizeof(ULONG), + NULL); + if (NT_SUCCESS(Status)) + { + *pDisablePriorityBoost = PriorityBoost; + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; } @@ -933,20 +966,20 @@ SetProcessPriorityBoost(HANDLE hProcess, BOOL bDisablePriorityBoost) { - NTSTATUS Status; - ULONG PriorityBoost = (bDisablePriorityBoost ? TRUE : FALSE); /* prevent setting values other than 1 and 0 */ - - Status = NtSetInformationProcess(hProcess, - ProcessPriorityBoost, - &PriorityBoost, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; + NTSTATUS Status; + ULONG PriorityBoost = (bDisablePriorityBoost ? TRUE : FALSE); /* prevent setting values other than 1 and 0 */ + + Status = NtSetInformationProcess(hProcess, + ProcessPriorityBoost, + &PriorityBoost, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } @@ -982,10 +1015,8 @@ */ BOOL WINAPI -IsWow64Process( - HANDLE hProcess, - PBOOL Wow64Process - ) +IsWow64Process(HANDLE hProcess, + PBOOL Wow64Process) { ULONG pbi; NTSTATUS Status; @@ -995,7 +1026,6 @@ &pbi, sizeof(pbi), NULL); - if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -1003,6 +1033,7 @@ } *Wow64Process = (pbi != 0); + return TRUE; } @@ -1044,9 +1075,11 @@ &Needed); Result = DynamicBuffer; } - else Result = (PUNICODE_STRING)Buffer; - - if (!NT_SUCCESS(Status)) goto Cleanup; + else + Result = (PUNICODE_STRING)Buffer; + + if (!NT_SUCCESS(Status)) + goto Cleanup; if (Result->Length / sizeof(WCHAR) + 1 > *pdwSize) { @@ -1065,6 +1098,7 @@ { SetLastErrorByStatus(Status); } + return !Status; } @@ -1101,6 +1135,7 @@ lpExeName, *pdwSize, NULL, NULL)); + if (Result) *pdwSize = strlen(lpExeName); Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -294,7 +294,8 @@ "Address: %p\n", ProcessHandle, StandardHandle, Address); /* Don't touch Console Handles */ - if (IsConsoleHandle(StandardHandle)) return; + if (IsConsoleHandle(StandardHandle)) + return; /* Duplicate the handle */ Status = NtDuplicateObject(NtCurrentProcess(), @@ -1017,7 +1018,8 @@ CmdLineLength = wcslen(CMD_STRING) + wcslen(lpCommandLine) + 1; /* If we found quotes, then add them into the length size */ - if (CmdLineIsAppName || FoundQuotes) CmdLineLength += 2; + if (CmdLineIsAppName || FoundQuotes) + CmdLineLength += 2; CmdLineLength *= sizeof(WCHAR); /* Allocate space for the new command line */ @@ -1177,7 +1179,7 @@ hSection, hDebug, NULL); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create process, status 0x%x\n", Status); SetLastErrorByStatus(Status); @@ -1311,7 +1313,8 @@ if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) { lpEnvironment = BasepConvertUnicodeEnvironment(&EnvSize, lpEnvironment); - if (!lpEnvironment) goto Cleanup; + if (!lpEnvironment) + goto Cleanup; } /* Create Process Environment */ @@ -1419,21 +1422,31 @@ Cleanup: /* De-allocate heap strings */ - if (NameBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); + if (NameBuffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); + if (ApplicationName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); - if (CurrentDirectory) RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory); - if (QuotedCmdLine) RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine); + + if (CurrentDirectory) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory); + + if (QuotedCmdLine) + RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine); /* Kill any handles still alive */ - if (hSection) NtClose(hSection); + if (hSection) + NtClose(hSection); + if (hThread) { /* We don't know any more details then this */ NtTerminateProcess(hProcess, STATUS_UNSUCCESSFUL); NtClose(hThread); } - if (hProcess) NtClose(hProcess); + + if (hProcess) + NtClose(hProcess); /* Return Success */ return Ret; Modified: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -19,11 +19,14 @@ /* * @unimplemented */ -DWORD WINAPI -DosPathToSessionPathW (DWORD SessionID, LPWSTR InPath, LPWSTR * OutPath) +DWORD +WINAPI +DosPathToSessionPathW(DWORD SessionID, + LPWSTR InPath, + LPWSTR *OutPath) { UNIMPLEMENTED; - return 0; + return 0; } /* @@ -39,68 +42,74 @@ * * @unimplemented */ -DWORD WINAPI -DosPathToSessionPathA (DWORD SessionId, LPSTR InPath, LPSTR * OutPath) +DWORD +WINAPI +DosPathToSessionPathA(DWORD SessionId, + LPSTR InPath, + LPSTR *OutPath) { - //DosPathToSessionPathW (SessionId,InPathW,OutPathW); + //DosPathToSessionPathW (SessionId,InPathW,OutPathW); UNIMPLEMENTED; - return 0; + return 0; } /* * @implemented */ -BOOL WINAPI ProcessIdToSessionId (IN DWORD dwProcessId, - OUT DWORD* pSessionId) +BOOL +WINAPI +ProcessIdToSessionId(IN DWORD dwProcessId, + OUT DWORD *pSessionId) { - PROCESS_SESSION_INFORMATION SessionInformation; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId; - HANDLE ProcessHandle; - NTSTATUS Status; + PROCESS_SESSION_INFORMATION SessionInformation; + OBJECT_ATTRIBUTES ObjectAttributes; + CLIENT_ID ClientId; + HANDLE ProcessHandle; + NTSTATUS Status; - if(IsBadWritePtr(pSessionId, sizeof(DWORD))) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (IsBadWritePtr(pSessionId, sizeof(DWORD))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + ClientId.UniqueProcess = (HANDLE)dwProcessId; + ClientId.UniqueThread = 0; + + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + + Status = NtOpenProcess(&ProcessHandle, + PROCESS_QUERY_INFORMATION, + &ObjectAttributes, + &ClientId); + if (NT_SUCCESS(Status)) + { + Status = NtQueryInformationProcess(ProcessHandle, + ProcessSessionInformation, + &SessionInformation, + sizeof(SessionInformation), + NULL); + NtClose(ProcessHandle); + + if (NT_SUCCESS(Status)) + { + *pSessionId = SessionInformation.SessionId; + return TRUE; + } + } + + SetLastErrorByStatus(Status); return FALSE; - } - - ClientId.UniqueProcess = (HANDLE)dwProcessId; - ClientId.UniqueThread = 0; - - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - - Status = NtOpenProcess(&ProcessHandle, - PROCESS_QUERY_INFORMATION, - &ObjectAttributes, - &ClientId); - if(NT_SUCCESS(Status)) - { - Status = NtQueryInformationProcess(ProcessHandle, - ProcessSessionInformation, - &SessionInformation, - sizeof(SessionInformation), - NULL); - NtClose(ProcessHandle); - - if(NT_SUCCESS(Status)) - { - *pSessionId = SessionInformation.SessionId; - return TRUE; - } - } - - SetLastErrorByStatus(Status); - return FALSE; } /* * @implemented */ -DWORD WINAPI -WTSGetActiveConsoleSessionId (VOID) +DWORD +WINAPI +WTSGetActiveConsoleSessionId(VOID) { - return ActiveConsoleSessionId; + return ActiveConsoleSessionId; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -26,8 +26,9 @@ /* Initialize the critical section and raise an exception if we failed */ Status = RtlInitializeCriticalSection( - (PRTL_CRITICAL_SECTION)lpCriticalSection); - if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status); + (PRTL_CRITICAL_SECTION)lpCriticalSection); + if (!NT_SUCCESS(Status)) + RtlRaiseStatus(Status); } /* Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -72,10 +72,10 @@ /* Now check if we got a name */ if (lpName) RtlInitUnicodeString(&ObjectName, lpName); - /* Check for invalid flags */ + /* Check for invalid flags */ if (dwFlags & ~(CREATE_EVENT_INITIAL_SET | CREATE_EVENT_MANUAL_RESET)) { - /* Fail */ + /* Fail */ SetLastError(ERROR_INVALID_PARAMETER); return NULL; } Modified: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/mutex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/mutex.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -75,7 +75,8 @@ BOOLEAN InitialOwner; /* Now check if we got a name */ - if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + if (lpName) + RtlInitUnicodeString(&ObjectName, lpName); if (dwFlags & ~(CREATE_MUTEX_INITIAL_OWNER)) { @@ -257,7 +258,8 @@ /* Release the mutant */ Status = NtReleaseMutant(hMutex, NULL); - if (NT_SUCCESS(Status)) return TRUE; + if (NT_SUCCESS(Status)) + return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/sem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/sem.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -80,7 +80,8 @@ UNICODE_STRING ObjectName; /* Now check if we got a name */ - if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + if (lpName) + RtlInitUnicodeString(&ObjectName, lpName); if (dwFlags != 0) { @@ -260,7 +261,8 @@ /* Release the semaphore */ Status = NtReleaseSemaphore(hSemaphore, lReleaseCount, lpPreviousCount); - if (NT_SUCCESS(Status)) return TRUE; + if (NT_SUCCESS(Status)) + return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/timer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/timer.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -75,7 +75,8 @@ TIMER_TYPE TimerType; /* Now check if we got a name */ - if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName); + if (lpTimerName) + RtlInitUnicodeString(&ObjectName, lpTimerName); if (dwFlags & ~(CREATE_WAITABLE_TIMER_MANUAL_RESET)) { @@ -268,7 +269,8 @@ (BOOLEAN)fResume, lPeriod, NULL); - if (NT_SUCCESS(Status)) return TRUE; + if (NT_SUCCESS(Status)) + return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); @@ -286,7 +288,8 @@ /* Cancel the timer */ Status = NtCancelTimer(hTimer, NULL); - if (NT_SUCCESS(Status)) return TRUE; + if (NT_SUCCESS(Status)) + return TRUE; /* If we got here, then we failed */ SetLastErrorByStatus(Status); Modified: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/wait.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/wait.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -36,9 +36,9 @@ IN DWORD dwMilliseconds, IN BOOL bAlertable) { - PLARGE_INTEGER TimePtr; - LARGE_INTEGER Time; - NTSTATUS Status; + PLARGE_INTEGER TimePtr; + LARGE_INTEGER Time; + NTSTATUS Status; /* Get real handle */ hHandle = TranslateStdHandle(hHandle); Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -37,7 +37,7 @@ DPRINT1("Converting Fiber to Thread\n"); /* the current thread isn't running a fiber: failure */ - if(!pTeb->HasFiberData) + if (!pTeb->HasFiberData) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -47,7 +47,7 @@ pTeb->HasFiberData = FALSE; /* free the fiber */ - if(pTeb->Tib.FiberData != NULL) + if (pTeb->Tib.FiberData != NULL) { RtlFreeHeap(GetProcessHeap(), 0, pTeb->Tib.FiberData); } @@ -69,7 +69,8 @@ DPRINT1("Converting Thread to Fiber\n"); /* the current thread is already a fiber */ - if(pTeb->HasFiberData && pTeb->Tib.FiberData) return pTeb->Tib.FiberData; + if (pTeb->HasFiberData && pTeb->Tib.FiberData) + return pTeb->Tib.FiberData; /* allocate the fiber */ pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), @@ -77,7 +78,7 @@ sizeof(FIBER)); /* failure */ - if(pfCurFiber == NULL) + if (pfCurFiber == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; @@ -93,7 +94,7 @@ pfCurFiber->GuaranteedStackBytes = pTeb->GuaranteedStackBytes; pfCurFiber->ActivationContextStack = pTeb->ActivationContextStackPointer; pfCurFiber->Context.ContextFlags = CONTEXT_FULL; - + /* Save FPU State if requsted */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { @@ -150,17 +151,17 @@ PVOID ActivationContextStack = NULL; DPRINT1("Creating Fiber\n"); - #ifdef SXS_SUPPORT_ENABLED +#ifdef SXS_SUPPORT_ENABLED /* Allocate the Activation Context Stack */ nErrCode = RtlAllocateActivationContextStack(&ActivationContextStack); - #endif - +#endif + /* Allocate the fiber */ pfCurFiber = (PFIBER)RtlAllocateHeap(GetProcessHeap(), 0, sizeof(FIBER)); /* Failure */ - if(pfCurFiber == NULL) + if (pfCurFiber == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; @@ -181,10 +182,10 @@ SetLastErrorByStatus(nErrCode); return NULL; } - + /* Clear the context */ RtlZeroMemory(&pfCurFiber->Context, sizeof(CONTEXT)); - + /* copy the data into the fiber */ pfCurFiber->StackBase = usFiberInitialTeb.StackBase; pfCurFiber->StackLimit = usFiberInitialTeb.StackLimit; @@ -195,20 +196,20 @@ pfCurFiber->FlsData = NULL; pfCurFiber->ActivationContextStack = ActivationContextStack; pfCurFiber->Context.ContextFlags = CONTEXT_FULL; - + /* Save FPU State if requsted */ if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) { pfCurFiber->Context.ContextFlags |= CONTEXT_FLOATING_POINT; } - + /* initialize the context for the fiber */ BasepInitializeContext(&ctxFiberContext, lpParameter, lpStartAddress, usFiberInitialTeb.StackBase, 2); - + /* Return the Fiber */ return pfCurFiber; } @@ -227,7 +228,8 @@ RtlFreeHeap(GetProcessHeap(), 0, lpFiber); /* the fiber is deleting itself: let the system deallocate the stack */ - if(NtCurrentTeb()->Tib.FiberData == lpFiber) ExitThread(1); + if (NtCurrentTeb()->Tib.FiberData == lpFiber) + ExitThread(1); /* deallocate the stack */ NtFreeVirtualMemory(NtCurrentProcess(), Modified: trunk/reactos/dll/win32/kernel32/thread/fls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fls.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -18,101 +18,109 @@ /* * @unimplemented */ -DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) +DWORD +WINAPI +FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) { - (void)lpCallback; + (void)lpCallback; - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FLS_OUT_OF_INDEXES; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FLS_OUT_OF_INDEXES; } /* * @unimplemented */ -BOOL WINAPI FlsFree(DWORD dwFlsIndex) +BOOL +WINAPI +FlsFree(DWORD dwFlsIndex) { - (void)dwFlsIndex; + (void)dwFlsIndex; - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* * @implemented */ -PVOID WINAPI FlsGetValue(DWORD dwFlsIndex) +PVOID +WINAPI +FlsGetValue(DWORD dwFlsIndex) { - PVOID * ppFlsSlots; - PVOID pRetVal; + PVOID *ppFlsSlots; + PVOID pRetVal; - if(dwFlsIndex >= 128) goto l_InvalidParam; + if (dwFlsIndex >= 128) + goto l_InvalidParam; - ppFlsSlots = NtCurrentTeb()->FlsData; + ppFlsSlots = NtCurrentTeb()->FlsData; - if(ppFlsSlots == NULL) goto l_InvalidParam; + if (ppFlsSlots == NULL) + goto l_InvalidParam; - SetLastError(0); - pRetVal = ppFlsSlots[dwFlsIndex + 2]; + SetLastError(0); + pRetVal = ppFlsSlots[dwFlsIndex + 2]; - return pRetVal; + return pRetVal; l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } /* * @implemented */ -BOOL WINAPI FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) +BOOL +WINAPI +FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) { - PVOID * ppFlsSlots; - TEB * pTeb = NtCurrentTeb(); + PVOID *ppFlsSlots; + TEB *pTeb = NtCurrentTeb(); - if(dwFlsIndex >= 128) goto l_InvalidParam; + if (dwFlsIndex >= 128) + goto l_InvalidParam; - ppFlsSlots = pTeb->FlsData; + ppFlsSlots = pTeb->FlsData; - if(ppFlsSlots == NULL) - { - PEB * pPeb = pTeb->ProcessEnvironmentBlock; + if (ppFlsSlots == NULL) + { + PEB *pPeb = pTeb->ProcessEnvironmentBlock; - ppFlsSlots = RtlAllocateHeap - ( - pPeb->ProcessHeap, - HEAP_ZERO_MEMORY, - (128 + 2) * sizeof(PVOID) - ); + ppFlsSlots = RtlAllocateHeap(pPeb->ProcessHeap, + HEAP_ZERO_MEMORY, + (128 + 2) * sizeof(PVOID)); + if (ppFlsSlots == NULL) + goto l_OutOfMemory; - if(ppFlsSlots == NULL) goto l_OutOfMemory; + pTeb->FlsData = ppFlsSlots; - pTeb->FlsData = ppFlsSlots; + RtlAcquirePebLock(); - RtlAcquirePebLock(); + /* TODO: initialization */ - /* TODO: initialization */ + RtlReleasePebLock(); + } - RtlReleasePebLock(); - } + ppFlsSlots[dwFlsIndex + 2] = lpFlsData; - ppFlsSlots[dwFlsIndex + 2] = lpFlsData; - - return TRUE; + return TRUE; l_OutOfMemory: - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto l_Fail; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto l_Fail; l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); l_Fail: - return FALSE; + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] Sat Jan 9 21:51:33 2010 @@ -82,7 +82,7 @@ TlsFree(DWORD Index) { BOOL BitSet; - + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) { SetLastErrorByStatus(STATUS_INVALID_PARAMETER);

1 0

[mjmartin] 45017: [usb/usbehci] - Added numerous structures required for Asynchronous Lists used to communicate with controller. Needs much more work. - Implement initial retrieving Device and String Descriptors from USB devices. - Fixed improper handling of Queued IRPs that was causing crashes. - For now, always queue the Irp if the request is a Urb of type Get Descriptor. - Reorganized code to trim down source files.
by mjmartin＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: mjmartin Date: Sat Jan 9 20:28:29 2010 New Revision: 45017 URL: http://svn.reactos.org/svn/reactos?rev=45017&view=rev Log: [usb/usbehci] - Added numerous structures required for Asynchronous Lists used to communicate with controller. Needs much more work. - Implement initial retrieving Device and String Descriptors from USB devices. - Fixed improper handling of Queued IRPs that was causing crashes. - For now, always queue the Irp if the request is a Urb of type Get Descriptor. - Reorganized code to trim down source files. Added: trunk/reactos/drivers/usb/usbehci/irp.c (with props) trunk/reactos/drivers/usb/usbehci/urbreq.c (with props) Modified: trunk/reactos/drivers/usb/usbehci/common.c trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/misc.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/usbehci.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbehci.rbuild Modified: trunk/reactos/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/common… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/common.c + * PURPOSE: Common operations in FDO/PDO. + * PROGRAMMERS: + * Michael Martin + */ #define INITGUID #include "usbehci.h" Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/fdo.c + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin + */ /* INCLUDES *******************************************************************/ #include "usbehci.h" @@ -73,7 +81,7 @@ tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); DPRINT("port tmp %x\n", tmp); - + GetDeviceDescriptor(FdoDeviceExtension, 0); FdoDeviceExtension->ChildDeviceCount++; CompletePendingRequest(FdoDeviceExtension); @@ -145,7 +153,7 @@ if (CStatus & EHCI_STS_HALT) { - DPRINT("EHCI: Host Controller unexpected halt.\n"); + DPRINT1("EHCI: Host Controller unexpected halt.\n"); /* FIXME: Reset the controller */ } Added: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c (added) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,0 +1,144 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/irp.c + * PURPOSE: IRP Handling. + * PROGRAMMERS: + * Michael Martin + */ + +#include "usbehci.h" + +VOID +RequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; + + KIRQL OldIrql = Irp->CancelIrql; + IoReleaseCancelSpinLock(DISPATCH_LEVEL); + + KeAcquireSpinLockAtDpcLevel(&FdoDeviceExtension->IrpQueueLock); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + KeReleaseSpinLock(&FdoDeviceExtension->IrpQueueLock, OldIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +VOID +QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) +{ + KIRQL OldIrql; + + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &OldIrql); + + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, OldIrql); + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else + { + InsertTailList(&DeviceExtension->IrpQueue, &Irp->Tail.Overlay.ListEntry); + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, OldIrql); + } +} + +VOID +CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension) +{ + PLIST_ENTRY NextIrp = NULL; + PIO_STACK_LOCATION Stack; + KIRQL oldIrql; + PIRP Irp = NULL; + URB *Urb; + + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + + while(!IsListEmpty(&DeviceExtension->IrpQueue)) + { + NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); + Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); + + if (!Irp) + break; + + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + + Urb = (PURB) Stack->Parameters.Others.Argument1; + ASSERT(Urb); + + /* FIXME: Fill in information for Argument1/URB */ + + DPRINT("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); + DPRINT("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + DPRINT("Index %x\n", Urb->UrbControlDescriptorRequest.Index); + DPRINT("DescriptorType %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT("LanguageId %x\n", Urb->UrbControlDescriptorRequest.LanguageId); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + } + + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); +} + +NTSTATUS +NTAPI +ArrivalNotificationCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID PContext) +{ + IoFreeIrp(Irp); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +VOID +DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PIO_STACK_LOCATION IrpStack = NULL; + PDEVICE_OBJECT PortDeviceObject = NULL; + PIRP Irp = NULL; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)Context; + + PortDeviceObject = IoGetAttachedDeviceReference(FdoDeviceExtension->Pdo); + + if (!PortDeviceObject) + { + DPRINT1("Unable to notify Pdos parent of device arrival.\n"); + return; + } + + Irp = IoAllocateIrp(PortDeviceObject->StackSize, FALSE); + + if (!Irp) + { + DPRINT1("Unable to allocate IRP\n"); + } + + IoSetCompletionRoutine(Irp, + (PIO_COMPLETION_ROUTINE)ArrivalNotificationCompletion, + NULL, + TRUE, + TRUE, + TRUE); + + IrpStack = IoGetNextIrpStackLocation(Irp); + IrpStack->Parameters.QueryDeviceRelations.Type = TargetDeviceRelation; + IrpStack->MajorFunction = IRP_MJ_PNP; + IrpStack->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS; + + IoCallDriver(PortDeviceObject, Irp); +} + Propchange: trunk/reactos/drivers/usb/usbehci/irp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbehci/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,121 +1,13 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/misc.c + * PURPOSE: Misceallenous operations. + * PROGRAMMERS: + * Michael Martin + */ #include "usbehci.h" - -VOID -QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) -{ - KIRQL oldIrql; - - KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - InsertTailList(&DeviceExtension->IrpQueue, &Irp->Tail.Overlay.ListEntry); - KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); -} - -VOID -CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension) -{ - PLIST_ENTRY NextIrp = NULL; - PIO_STACK_LOCATION Stack; - KIRQL oldIrql; - PIRP Irp = NULL; - URB *Urb; - - KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - - /* No Irps in Queue? */ - if (IsListEmpty(&DeviceExtension->IrpQueue)) - { - KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - return; - } - - NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); - while(TRUE) - { - Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); - - if (!Irp) - break; - - /* FIXME: Handle cancels */ - /*if (!IoSetCancelRoutine(Irp, NULL)) - { - - }*/ - - - Stack = IoGetCurrentIrpStackLocation(Irp); - - Urb = (PURB) Stack->Parameters.Others.Argument1; - - ASSERT(Urb); - - /* FIXME: Fill in information for Argument1/URB */ - - DPRINT("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); - DPRINT("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); - DPRINT("Index %x\n", Urb->UrbControlDescriptorRequest.Index); - DPRINT("DescriptorType %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); - DPRINT("LanguageId %x\n", Urb->UrbControlDescriptorRequest.LanguageId); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - - KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - } - - KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); -} - -NTSTATUS -NTAPI -ArrivalNotificationCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID PContext) -{ - IoFreeIrp(Irp); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -VOID -DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) -{ - PFDO_DEVICE_EXTENSION FdoDeviceExtension; - PIO_STACK_LOCATION IrpStack = NULL; - PDEVICE_OBJECT PortDeviceObject = NULL; - PIRP Irp = NULL; - - FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)Context; - - PortDeviceObject = IoGetAttachedDeviceReference(FdoDeviceExtension->Pdo); - - if (!PortDeviceObject) - { - DPRINT1("Unable to notify Pdos parent of device arrival.\n"); - return; - } - - Irp = IoAllocateIrp(PortDeviceObject->StackSize, FALSE); - - if (!Irp) - { - DPRINT1("Unable to allocate IRP\n"); - } - - IoSetCompletionRoutine(Irp, - (PIO_COMPLETION_ROUTINE)ArrivalNotificationCompletion, - NULL, - TRUE, - TRUE, - TRUE); - - IrpStack = IoGetNextIrpStackLocation(Irp); - IrpStack->Parameters.QueryDeviceRelations.Type = TargetDeviceRelation; - IrpStack->MajorFunction = IRP_MJ_PNP; - IrpStack->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS; - - IoCallDriver(PortDeviceObject, Irp); -} /* Get SymblicName from Parameters in Registry Key Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/pdo.c + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin + */ /* INCLUDES *******************************************************************/ #define INITGUID @@ -55,24 +63,14 @@ Urb = (PURB) Stack->Parameters.Others.Argument1; Urb->UrbHeader.Status = 0; - /* Check for ChildDevices */ - if (!FdoDeviceExtension->ChildDeviceCount) - { - /* No device has been plugged in yet. So just queue - the irp and complete it when a device is connected */ - if (FdoDeviceExtension->DeviceState) - QueueRequest(FdoDeviceExtension, Irp); - - Information = 0; - - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; - } - else - { - DPRINT1("Reporting of device connects not implemented yet.\n"); - Status = STATUS_SUCCESS; - } + DPRINT1("Irp->CancelRoutine %x\n",Irp->CancelRoutine); + QueueRequest(FdoDeviceExtension, Irp); + + Information = 0; + + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + break; } /* FIXME: Handle all other Functions */ @@ -158,7 +156,7 @@ } default: { - DPRINT("Unhandled IoControlCode %x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + DPRINT1("Unhandled IoControlCode %x\n", Stack->Parameters.DeviceIoControl.IoControlCode); break; } } Added: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c (added) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,0 +1,299 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/urbreq.c + * PURPOSE: URB Related Functions. + * PROGRAMMERS: + * Michael Martin + */ + +#include "usbehci.h" + +/* QueueHead must point to the base address in common buffer */ +PVOID +IntializeHeadQueueForStandardRequest(PQUEUE_HEAD QueueHead, + PQUEUE_TRANSFER_DESCRIPTOR *CtrlTD1, + PQUEUE_TRANSFER_DESCRIPTOR *CtrlTD2, + PQUEUE_TRANSFER_DESCRIPTOR *CtrlTD3, + PEHCI_SETUP_FORMAT *CtrlSetup, + PVOID *CtrlData, + ULONG Size) +{ + QueueHead->HorizontalLinkPointer = (ULONG)QueueHead | QH_TYPE_QH; + + /* Set NakCountReload to max value possible */ + QueueHead->EndPointCapabilities1.NakCountReload = 0xF; + + /* 1 for non high speed, 0 for high speed device */ + QueueHead->EndPointCapabilities1.ControlEndPointFlag = 0; + + QueueHead->EndPointCapabilities1.HeadOfReclamation = TRUE; + QueueHead->EndPointCapabilities1.MaximumPacketLength = 64; + + /* Get the Initial Data Toggle from the QEDT */ + QueueHead->EndPointCapabilities1.QEDTDataToggleControl = TRUE; + + /* HIGH SPEED DEVICE */ + QueueHead->EndPointCapabilities1.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + QueueHead->EndPointCapabilities1.EndPointNumber = 0; + + /* Only used for Periodic Schedule and Not High Speed devices. + Setting it to one result in undefined behavior for Async */ + QueueHead->EndPointCapabilities1.InactiveOnNextTransaction = 0; + + QueueHead->EndPointCapabilities1.DeviceAddress = 0; + QueueHead->EndPointCapabilities2.HubAddr = 0; + QueueHead->EndPointCapabilities2.NumberOfTransactionPerFrame = 0x01; + + /* 0 For Async, 1 for periodoc schedule */ + QueueHead->EndPointCapabilities2.InterruptScheduleMask = 0; + + QueueHead->EndPointCapabilities2.PortNumber = 0; + QueueHead->EndPointCapabilities2.SplitCompletionMask = 0; + QueueHead->CurrentLinkPointer = 0; + QueueHead->QETDPointer = TERMINATE_POINTER; + QueueHead->AlternateNextPointer = TERMINATE_POINTER; + QueueHead->Token.Bits.InterruptOnComplete = TRUE; + QueueHead->BufferPointer[0] = 0; + QueueHead->BufferPointer[1] = 0; + QueueHead->BufferPointer[2] = 0; + QueueHead->BufferPointer[3] = 0; + QueueHead->BufferPointer[4] = 0; + /* Queue Head Initialized */ + + /* Queue Transfer Descriptors must be 32 byte aligned and reside in continous physical memory */ + *CtrlTD1 = (PQUEUE_TRANSFER_DESCRIPTOR) (((ULONG)(QueueHead) + sizeof(QUEUE_HEAD) + 0x1F) & ~0x1F); + *CtrlTD2 = (PQUEUE_TRANSFER_DESCRIPTOR) (((ULONG)(*CtrlTD1) + sizeof(QUEUE_TRANSFER_DESCRIPTOR) + 0x1F) & ~0x1F); + *CtrlTD3 = (PQUEUE_TRANSFER_DESCRIPTOR) (((ULONG)(*CtrlTD2) + sizeof(QUEUE_TRANSFER_DESCRIPTOR) + 0x1F) & ~0x1F); + + /* Must be Page aligned */ + *CtrlSetup = (PEHCI_SETUP_FORMAT) (( (ULONG)(*CtrlTD3) + sizeof(QUEUE_TRANSFER_DESCRIPTOR) + 0xFFF) & ~0xFFF); + *CtrlData = (PSTANDARD_DEVICE_DESC) (( (ULONG)(*CtrlSetup) + sizeof(EHCI_SETUP_FORMAT) + 0xFFF) & ~0xFFF); + + (*CtrlTD1)->NextPointer = TERMINATE_POINTER; + (*CtrlTD1)->AlternateNextPointer = TERMINATE_POINTER; + (*CtrlTD1)->BufferPointer[0] = (ULONG)MmGetPhysicalAddress((PVOID) (*CtrlSetup)).LowPart; + (*CtrlTD1)->Token.Bits.DataToggle = FALSE; + (*CtrlTD1)->Token.Bits.InterruptOnComplete = FALSE; + (*CtrlTD1)->Token.Bits.TotalBytesToTransfer = sizeof(EHCI_SETUP_FORMAT); + (*CtrlTD1)->Token.Bits.ErrorCounter = 0x03; + (*CtrlTD1)->Token.Bits.PIDCode = PID_CODE_SETUP_TOKEN; + (*CtrlTD1)->Token.Bits.Active = TRUE; + + (*CtrlTD2)->NextPointer = TERMINATE_POINTER; + (*CtrlTD2)->AlternateNextPointer = TERMINATE_POINTER; + (*CtrlTD2)->BufferPointer[0] = (ULONG)MmGetPhysicalAddress((PVOID) (*CtrlData)).LowPart; + (*CtrlTD2)->Token.Bits.DataToggle = TRUE; + (*CtrlTD2)->Token.Bits.InterruptOnComplete = TRUE; + (*CtrlTD2)->Token.Bits.TotalBytesToTransfer = Size; + (*CtrlTD2)->Token.Bits.ErrorCounter = 0x03; + (*CtrlTD2)->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; + (*CtrlTD2)->Token.Bits.Active = TRUE; + + (*CtrlTD1)->NextPointer = (ULONG)MmGetPhysicalAddress((PVOID)(*CtrlTD2)).LowPart; + + (*CtrlTD3)->NextPointer = TERMINATE_POINTER; + (*CtrlTD3)->AlternateNextPointer = TERMINATE_POINTER; + (*CtrlTD3)->BufferPointer[0] = 0; + (*CtrlTD3)->Token.Bits.Active = TRUE; + (*CtrlTD3)->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; + (*CtrlTD3)->Token.Bits.InterruptOnComplete = TRUE; + (*CtrlTD3)->Token.Bits.DataToggle = TRUE; + (*CtrlTD3)->Token.Bits.ErrorCounter = 0x03; + (*CtrlTD2)->NextPointer = (ULONG) MmGetPhysicalAddress((PVOID)(*CtrlTD3)).LowPart; + return NULL; +} + +BOOLEAN +GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index) +{ + PEHCI_SETUP_FORMAT CtrlSetup = NULL; + PSTANDARD_DEVICE_DESC CtrlData = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD1 = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD2 = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD3 = NULL; + PQUEUE_HEAD QueueHead; + PEHCI_USBCMD_CONTENT UsbCmd; + PEHCI_USBSTS_CONTEXT UsbSts; + LONG Base; + LONG tmp; + + Base = (ULONG) DeviceExtension->ResourceMemory; + + /* Set up the QUEUE HEAD in memory */ + QueueHead = (PQUEUE_HEAD) ((ULONG)DeviceExtension->AsyncListQueueHeadPtr); + + IntializeHeadQueueForStandardRequest(QueueHead, + &CtrlTD1, + &CtrlTD2, + &CtrlTD3, + &CtrlSetup, + (PVOID)&CtrlData, + sizeof(STANDARD_DEVICE_DESC)); + + /* FIXME: Use defines and handle other than Device Desciptors */ + CtrlSetup->bmRequestType = 0x80; + CtrlSetup->bRequest = 0x06; + CtrlSetup->wValue = 0x0100; + CtrlSetup->wIndex = 0; + CtrlSetup->wLength = sizeof(STANDARD_DEVICE_DESC); + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->Run = FALSE; + WRITE_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD), tmp); + + /* Wait for the controller to halt */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(Base + EHCI_USBSTS)); + UsbSts = (PEHCI_USBSTS_CONTEXT)&tmp; + DPRINT("Waiting for Halt, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(Base + EHCI_USBSTS))); + if (UsbSts->HCHalted) + { + break; + } + } + + /* Set to TRUE on interrupt for async completion */ + DeviceExtension->AsyncComplete = FALSE; + QueueHead->QETDPointer = (ULONG) MmGetPhysicalAddress((PVOID)(CtrlTD1)).LowPart; + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->AsyncEnable = TRUE; + + WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + + /* Interrupt on Async completion */ + UsbCmd->DoorBell = TRUE; + UsbCmd->Run = TRUE; + WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); + + for (;;) + { + KeStallExecutionProcessor(10); + DPRINT("Waiting for completion!\n"); + if (DeviceExtension->AsyncComplete == TRUE) + break; + } + + DPRINT1("bLength %d\n", CtrlData->bLength); + DPRINT1("bDescriptorType %x\n", CtrlData->bDescriptorType); + DPRINT1("bcdUSB %x\n", CtrlData->bcdUSB); + DPRINT1("CtrlData->bDeviceClass %x\n", CtrlData->bDeviceClass); + DPRINT1("CtrlData->bDeviceSubClass %x\n", CtrlData->bDeviceSubClass); + DPRINT1("CtrlData->bDeviceProtocal %x\n", CtrlData->bDeviceProtocal); + DPRINT1("CtrlData->bMaxPacketSize %x\n", CtrlData->bMaxPacketSize); + DPRINT1("CtrlData->idVendor %x\n", CtrlData->idVendor); + DPRINT1("CtrlData->idProduct %x\n", CtrlData->idProduct); + DPRINT1("CtrlData->bcdDevice %x\n", CtrlData->bcdDevice); + DPRINT1("CtrlData->iManufacturer %x\n", CtrlData->iManufacturer); + DPRINT1("CtrlData->iProduct %x\n", CtrlData->iProduct); + DPRINT1("CtrlData->iSerialNumber %x\n", CtrlData->iSerialNumber); + DPRINT1("CtrlData->bNumConfigurations %x\n", CtrlData->bNumConfigurations); + + /* Temporary: Remove */ + if (CtrlData->bLength > 0) + { + /* We got valid data, try for strings */ + UCHAR Manufacturer = CtrlData->iManufacturer; + UCHAR Product = CtrlData->iManufacturer; + UCHAR SerialNumber = CtrlData->iSerialNumber; + + GetDeviceStringDescriptor(DeviceExtension, Manufacturer); + GetDeviceStringDescriptor(DeviceExtension, Product); + GetDeviceStringDescriptor(DeviceExtension, SerialNumber); + } + + return TRUE; +} + +BOOLEAN +GetDeviceStringDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index) +{ + PEHCI_SETUP_FORMAT CtrlSetup = NULL; + PSTRING_DESCRIPTOR CtrlData = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD1 = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD2 = NULL; + PQUEUE_TRANSFER_DESCRIPTOR CtrlTD3 = NULL; + PQUEUE_HEAD QueueHead; + PEHCI_USBCMD_CONTENT UsbCmd; + PEHCI_USBSTS_CONTEXT UsbSts; + LONG Base; + LONG tmp; + + Base = (ULONG) DeviceExtension->ResourceMemory; +DPRINT1("Index: %d\n", Index); + /* Set up the QUEUE HEAD in memory */ + QueueHead = (PQUEUE_HEAD) ((ULONG)DeviceExtension->AsyncListQueueHeadPtr); + + IntializeHeadQueueForStandardRequest(QueueHead, + &CtrlTD1, + &CtrlTD2, + &CtrlTD3, + &CtrlSetup, + (PVOID)&CtrlData, + sizeof(STRING_DESCRIPTOR) + 256); + + /* FIXME: Use defines and handle other than Device Desciptors */ + CtrlSetup->bmRequestType = 0x80; + CtrlSetup->bRequest = 0x06; + CtrlSetup->wValue = 0x0300 | Index; + CtrlSetup->wIndex = 0; + /* 256 pulled from thin air */ + CtrlSetup->wLength = sizeof(STRING_DESCRIPTOR) + 256; + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->Run = FALSE; + WRITE_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD), tmp); + + /* Wait for the controller to halt */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(Base + EHCI_USBSTS)); + UsbSts = (PEHCI_USBSTS_CONTEXT)&tmp; + DPRINT("Waiting for Halt, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(Base + EHCI_USBSTS))); + if (UsbSts->HCHalted) + { + break; + } + } + + /* Set to TRUE on interrupt for async completion */ + DeviceExtension->AsyncComplete = FALSE; + QueueHead->QETDPointer = (ULONG) MmGetPhysicalAddress((PVOID)(CtrlTD1)).LowPart; + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->AsyncEnable = TRUE; + + WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); + + tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + + /* Interrupt on Async completion */ + UsbCmd->DoorBell = TRUE; + UsbCmd->Run = TRUE; + WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); + + for (;;) + { + KeStallExecutionProcessor(10); + DPRINT("Waiting for completion!\n"); + if (DeviceExtension->AsyncComplete == TRUE) + break; + } + + DPRINT1("String %S\n", &CtrlData->bString); + + return TRUE; +} + Propchange: trunk/reactos/drivers/usb/usbehci/urbreq.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -1,21 +1,10 @@ /* - * ReactOS USB ehci driver - * Copyright (C) 2009 Michael Martin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/usbehci.c + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin */ /* DEFINES *******************************************************************/ Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -53,119 +53,153 @@ #define EHCI_STS_ASS 0x8000 #define EHCI_ERROR_INT ( EHCI_STS_FATAL | EHCI_STS_ERR ) -typedef struct _EHCI_HCS_CONTENT -{ - ULONG PortCount : 4; - ULONG PortPowerControl: 1; - ULONG Reserved : 2; - ULONG PortRouteRules : 1; - ULONG PortPerCHC : 4; - ULONG CHCCount : 4; - ULONG PortIndicator : 1; - ULONG Reserved2 : 3; - ULONG DbgPortNum : 4; - ULONG Reserved3 : 8; - -} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; - -typedef struct _EHCI_HCC_CONTENT -{ - ULONG CurAddrBits : 1; - ULONG VarFrameList : 1; - ULONG ParkMode : 1; - ULONG Reserved : 1; - ULONG IsoSchedThreshold : 4; - ULONG EECPCapable : 8; - ULONG Reserved2 : 16; - -} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; - -typedef struct _EHCI_CAPS { - UCHAR Length; - UCHAR Reserved; - USHORT HCIVersion; + +/* Last bit in QUEUE ELEMENT TRANSFER DESCRIPTOR Next Pointer */ +/* Used for Queue Element Transfer Descriptor Pointers + and Queue Head Horizontal Link Pointers */ +#define TERMINATE_POINTER 0x01 + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR, Token defines and structs */ + +/* PIDCodes for QETD_TOKEN +OR with QUEUE_TRANSFER_DESCRIPTOR Token.PIDCode*/ +#define PID_CODE_OUT_TOKEN 0x00 +#define PID_CODE_IN_TOKEN 0x01 +#define PID_CODE_SETUP_TOKEN 0x02 + +/* Split Transaction States +OR with QUEUE_TRANSFER_DESCRIPTOR Token.SplitTransactionState */ +#define DO_START_SPLIT 0x00 +#define DO_COMPLETE_SPLIT 0x01 + +/* Ping States, OR with QUEUE_TRANSFER_DESCRIPTOR Token. */ +#define PING_STATE_DO_OUT 0x00 +#define PING_STATE_DO_PING 0x01 + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR TOKEN */ +typedef struct _QETD_TOKEN_BITS +{ + ULONG PingState:1; + ULONG SplitTransactionState:1; + ULONG MissedMicroFrame:1; + ULONG TransactionError:1; + ULONG BabbelDetected:1; + ULONG DataBufferError:1; + ULONG Halted:1; + ULONG Active:1; + ULONG PIDCode:2; + ULONG ErrorCounter:2; + ULONG CurrentPage:3; + ULONG InterruptOnComplete:1; + ULONG TotalBytesToTransfer:15; + ULONG DataToggle:1; +} QETD_TOKEN_BITS, *PQETD_TOKEN_BITS; + + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR */ +typedef struct _QUEUE_TRANSFER_DESCRIPTOR +{ + ULONG NextPointer; + ULONG AlternateNextPointer; union { - EHCI_HCS_CONTENT HCSParams; - ULONG HCSParamsLong; - }; - ULONG HCCParams; - UCHAR PortRoute [8]; -} EHCI_CAPS, *PEHCI_CAPS; - - -typedef struct _COMMON_DEVICE_EXTENSION -{ - BOOLEAN IsFdo; - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; -} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; - -typedef struct _FDO_DEVICE_EXTENSION -{ - COMMON_DEVICE_EXTENSION Common; - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT LowerDevice; - PDEVICE_OBJECT Pdo; - ULONG DeviceState; - - /* USB Specs says a max of 127 devices */ - ULONG ChildDeviceCount; - - PDMA_ADAPTER pDmaAdapter; - - ULONG Vector; - KIRQL Irql; - - KINTERRUPT_MODE Mode; - BOOLEAN IrqShared; - PKINTERRUPT EhciInterrupt; - KDPC DpcObject; - KAFFINITY Affinity; - - LIST_ENTRY IrpQueue; - KSPIN_LOCK IrpQueueLock; - PIRP CurrentIrp; - - ULONG MapRegisters; - - ULONG BusNumber; - ULONG BusAddress; - ULONG PCIAddress; - USHORT VendorId; - USHORT DeviceId; - - BUS_INTERFACE_STANDARD BusInterface; - - EHCI_CAPS ECHICaps; - + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; +} QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; + +/* EndPointSpeeds of END_POINT_CAPABILITIES */ +#define QH_ENDPOINT_FULLSPEED 0x00 +#define QH_ENDPOINT_LOWSPEED 0x01 +#define QH_ENDPOINT_HIGHSPEED 0x02 + +typedef struct _END_POINT_CAPABILITIES1 +{ + ULONG DeviceAddress:7; + ULONG InactiveOnNextTransaction:1; + ULONG EndPointNumber:4; + ULONG EndPointSpeed:2; + ULONG QEDTDataToggleControl:1; + ULONG HeadOfReclamation:1; + ULONG MaximumPacketLength:11; + ULONG ControlEndPointFlag:1; + ULONG NakCountReload:4; +} END_POINT_CAPABILITIES1, *PEND_POINT_CAPABILITIES1; + +typedef struct _END_POINT_CAPABILITIES2 +{ + ULONG InterruptScheduleMask:8; + ULONG SplitCompletionMask:8; + ULONG HubAddr:6; + ULONG PortNumber:6; + /* Multi */ + ULONG NumberOfTransactionPerFrame:2; +} END_POINT_CAPABILITIES2, *PEND_POINT_CAPABILITIES2; + + +/* QUEUE HEAD defines and structs */ + +/* QUEUE HEAD Select Types, OR with QUEUE_HEAD HorizontalLinkPointer */ +#define QH_TYPE_IDT 0x00 +#define QH_TYPE_QH 0x02 +#define QH_TYPE_SITD 0x04 +#define QH_TYPE_FSTN 0x06 + +/* QUEUE HEAD */ +typedef struct _QUEUE_HEAD +{ + ULONG HorizontalLinkPointer; + END_POINT_CAPABILITIES1 EndPointCapabilities1; + END_POINT_CAPABILITIES2 EndPointCapabilities2; + /* TERMINATE_POINTER not valid for this member */ + ULONG CurrentLinkPointer; + /* TERMINATE_POINTER valid */ + ULONG QETDPointer; + /* TERMINATE_POINTER valid, bits 1:4 is NAK_COUNTER */ + ULONG AlternateNextPointer; + /* Only DataToggle, InterruptOnComplete, ErrorCounter, PingState valid */ union { - PULONG ResourcePort; - PULONG ResourceMemory; - }; - - PULONG PeriodicFramList; - PULONG AsyncListQueueHeadPtr; - PHYSICAL_ADDRESS PeriodicFramListPhysAddr; - PHYSICAL_ADDRESS AsyncListQueueHeadPtrPhysAddr; - - BOOLEAN AsyncComplete; - - PULONG ResourceBase; - ULONG Size; - -} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; - -typedef struct _PDO_DEVICE_EXTENSION -{ - COMMON_DEVICE_EXTENSION Common; - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT ControllerFdo; - -} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; - + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; +} QUEUE_HEAD, *PQUEUE_HEAD; + +typedef struct _EHCI_SETUP_FORMAT +{ + UCHAR bmRequestType; + UCHAR bRequest; + USHORT wValue; + USHORT wIndex; + USHORT wLength; +} EHCI_SETUP_FORMAT, *PEHCI_SETUP_FORMAT; + +typedef struct _STANDARD_DEVICE_DESC +{ + UCHAR bLength; + UCHAR bDescriptorType; + USHORT bcdUSB; + UCHAR bDeviceClass; + UCHAR bDeviceSubClass; + UCHAR bDeviceProtocal; + UCHAR bMaxPacketSize; + USHORT idVendor; + USHORT idProduct; + USHORT bcdDevice; + UCHAR iManufacturer; + UCHAR iProduct; + UCHAR iSerialNumber; + UCHAR bNumConfigurations; +} STANDARD_DEVICE_DESC, *PSTANDARD_DEVICE_DESC; + +typedef struct _STRING_DESCRIPTOR +{ + UCHAR bLength; /* Size of this descriptor in bytes */ + UCHAR bDescriptorType; /* STRING Descriptor Type */ + UCHAR bString[0]; /* UNICODE encoded string */ +} STRING_DESCRIPTOR, *PSTRING_DESCRIPTOR; /* USBCMD register 32 bits */ typedef struct _EHCI_USBCMD_CONTENT @@ -218,6 +252,120 @@ ULONG PortOwner:1; } EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; +typedef struct _EHCI_HCS_CONTENT +{ + ULONG PortCount : 4; + ULONG PortPowerControl: 1; + ULONG Reserved : 2; + ULONG PortRouteRules : 1; + ULONG PortPerCHC : 4; + ULONG CHCCount : 4; + ULONG PortIndicator : 1; + ULONG Reserved2 : 3; + ULONG DbgPortNum : 4; + ULONG Reserved3 : 8; + +} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; + +typedef struct _EHCI_HCC_CONTENT +{ + ULONG CurAddrBits : 1; + ULONG VarFrameList : 1; + ULONG ParkMode : 1; + ULONG Reserved : 1; + ULONG IsoSchedThreshold : 4; + ULONG EECPCapable : 8; + ULONG Reserved2 : 16; + +} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; + +typedef struct _EHCI_CAPS { + UCHAR Length; + UCHAR Reserved; + USHORT HCIVersion; + union + { + EHCI_HCS_CONTENT HCSParams; + ULONG HCSParamsLong; + }; + ULONG HCCParams; + UCHAR PortRoute [8]; +} EHCI_CAPS, *PEHCI_CAPS; + + +typedef struct _COMMON_DEVICE_EXTENSION +{ + BOOLEAN IsFdo; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _FDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT LowerDevice; + PDEVICE_OBJECT Pdo; + ULONG DeviceState; + + /* USB Specs says a max of 127 devices */ + ULONG ChildDeviceCount; + + PDMA_ADAPTER pDmaAdapter; + + ULONG Vector; + KIRQL Irql; + + KINTERRUPT_MODE Mode; + BOOLEAN IrqShared; + PKINTERRUPT EhciInterrupt; + KDPC DpcObject; + KAFFINITY Affinity; + + LIST_ENTRY IrpQueue; + KSPIN_LOCK IrpQueueLock; + PIRP CurrentIrp; + + ULONG MapRegisters; + + ULONG BusNumber; + ULONG BusAddress; + ULONG PCIAddress; + USHORT VendorId; + USHORT DeviceId; + + BUS_INTERFACE_STANDARD BusInterface; + + EHCI_CAPS ECHICaps; + + union + { + PULONG ResourcePort; + PULONG ResourceMemory; + }; + + PULONG PeriodicFramList; + PULONG AsyncListQueueHeadPtr; + PHYSICAL_ADDRESS PeriodicFramListPhysAddr; + PHYSICAL_ADDRESS AsyncListQueueHeadPtrPhysAddr; + + BOOLEAN AsyncComplete; + + PULONG ResourceBase; + ULONG Size; + +} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; + +typedef struct _PDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT ControllerFdo; + +} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + NTSTATUS NTAPI GetBusInterface(PDEVICE_OBJECT pcifido, PBUS_INTERFACE_STANDARD busInterface); @@ -252,13 +400,10 @@ PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); BOOLEAN -GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, USHORT Port); +GetDeviceDescriptor (PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index); BOOLEAN -GetDeviceDescriptor2(PFDO_DEVICE_EXTENSION DeviceExtension, USHORT Port); - -BOOLEAN -GetStringDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, ULONG DecriptorStringNumber); +GetDeviceStringDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index); VOID CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension); @@ -275,4 +420,7 @@ VOID DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); +VOID +RequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); + #endif Modified: trunk/reactos/drivers/usb/usbehci/usbehci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Sat Jan 9 20:28:29 2010 @@ -8,4 +8,6 @@ <file>pdo.c</file> <file>common.c</file> <file>misc.c</file> + <file>irp.c</file> + <file>urbreq.c</file> </module>

1 0

[cgutman] 45016: - Unlock the address file before calling IPSendDatagram - We don't need to be locked anymore at that point and it also causes problems with loopback packets - Use the TTL value stored in the address file for ICMP packets
by cgutman＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: cgutman Date: Sat Jan 9 17:25:11 2010 New Revision: 45016 URL: http://svn.reactos.org/svn/reactos?rev=45016&view=rev Log: - Unlock the address file before calling IPSendDatagram - We don't need to be locked anymore at that point and it also causes problems with loopback packets - Use the TTL value stored in the address file for ICMP packets Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -48,6 +48,7 @@ BOOLEAN PrepareICMPPacket( + PADDRESS_FILE AddrFile, PIP_INTERFACE Interface, PIP_PACKET IPPacket, PIP_ADDRESS Destination, @@ -114,8 +115,11 @@ IPHeader->Id = (USHORT)Random(); /* One fragment at offset 0 */ IPHeader->FlagsFragOfs = 0; - /* Time-to-Live is 128 */ - IPHeader->Ttl = 128; + /* Set TTL */ + if (AddrFile) + IPHeader->Ttl = AddrFile->TTL; + else + IPHeader->Ttl = 128; /* Internet Control Message Protocol */ IPHeader->Protocol = IPPROTO_ICMP; /* Checksum is 0 (for later calculation of this) */ @@ -205,30 +209,27 @@ } } - Status = PrepareICMPPacket( NCE->Interface, + Status = PrepareICMPPacket( AddrFile, + NCE->Interface, &Packet, &RemoteAddress, BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, ICMPSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } @@ -352,7 +353,7 @@ DataSize = IPPacket->TotalSize - IPPacket->HeaderSize; - if( !PrepareICMPPacket(Interface, &NewPacket, &IPPacket->SrcAddr, + if( !PrepareICMPPacket(NULL, Interface, &NewPacket, &IPPacket->SrcAddr, IPPacket->Data, DataSize) ) return; ((PICMP_HEADER)NewPacket.Data)->Type = Type; Modified: branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -249,24 +249,20 @@ BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -224,20 +224,16 @@ BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; }

1 0

[cgutman] 45015: - Store the address file handle in the IOSB - MSAFD relies on this behavior to store the address file handle
by cgutman＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: cgutman Date: Sat Jan 9 16:49:39 2010 New Revision: 45015 URL: http://svn.reactos.org/svn/reactos?rev=45015&view=rev Log: - Store the address file handle in the IOSB - MSAFD relies on this behavior to store the address file handle Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Jan 9 16:49:39 2010 @@ -101,6 +101,7 @@ if (NT_SUCCESS(Status)) FCB->State = SOCKET_STATE_BOUND; - return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + /* MSAFD relies on us returning the address file handle in the IOSB */ + return UnlockAndMaybeComplete( FCB, Status, Irp, (ULONG_PTR)FCB->AddressFile.Handle ); }

1 0

[sir_richard] 45014: Trap handlers in C patch 6 of X: [NTOS]: Implement Trap 7 and 16 in C. These are the last two FPU/NPX traps. Not really good with x86 FPU stuff, so there might be some mistakes to look over later. [NTOS]: Fixed a bug in Trap 19 handler (forgot to write CR0 back).
by sir_richard＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: sir_richard Date: Sat Jan 9 16:07:44 2010 New Revision: 45014 URL: http://svn.reactos.org/svn/reactos?rev=45014&view=rev Log: Trap handlers in C patch 6 of X: [NTOS]: Implement Trap 7 and 16 in C. These are the last two FPU/NPX traps. Not really good with x86 FPU stuff, so there might be some mistakes to look over later. [NTOS]: Fixed a bug in Trap 19 handler (forgot to write CR0 back). Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -27,7 +27,21 @@ { __asm__ __volatile__ ("fnsave %0\n wait\n" : : "m"(SaveArea)); } - +} + +FORCEINLINE +VOID +Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea) +{ + extern ULONG KeI386FxsrPresent; + if (KeI386FxsrPresent) + { + __asm__ __volatile__ ("fxrstor %0\n" : "=m"(SaveArea) : ); + } + else + { + __asm__ __volatile__ (".globl _FrRestore\n _FrRestore: \n frstor %0\n wait\n" : "=m"(SaveArea) : ); + } } FORCEINLINE Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -137,6 +137,13 @@ ((KiUserTrap(TrapFrame)) && (PsGetCurrentProcess()->VdmObjects))); } +PFX_SAVE_AREA +FORCEINLINE +KiGetThreadNpxArea(IN PKTHREAD Thread) +{ + return (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); +} + VOID FORCEINLINE KiTrapFrameFromPushaStack(IN PKTRAP_FRAME TrapFrame) Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -693,317 +693,7 @@ GENERATE_TRAP_HANDLER KiTrap4, 1 GENERATE_TRAP_HANDLER KiTrap5, 1 GENERATE_TRAP_HANDLER KiTrap6, 1 - -.func KiTrap7 -TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios -_KiTrap7: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit7_a, kit7_t - - /* Get the current thread and stack */ -StartTrapHandle: - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ecx, [eax+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - - /* Check if emulation is enabled */ - test byte ptr [ecx+FN_CR0_NPX_STATE], CR0_EM - jnz EmulationEnabled - -CheckState: - /* Check if the NPX state is loaded */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED - mov ebx, cr0 - jz IsLoaded - - /* Remove flags */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - - /* Check the NPX thread */ - mov edx, PCR[KPCR_NPX_THREAD] - or edx, edx - jz NoNpxThread - - /* Get the NPX Stack */ - mov esi, [edx+KTHREAD_INITIAL_STACK] - sub esi, NPX_FRAME_LENGTH - - /* Check if we have FXSR and check which operand to use */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnSave - fxsave [esi] - jmp AfterSave - -FnSave: - fnsave [esi] - -AfterSave: - /* Set the thread's state to dirty */ - mov byte ptr [edx+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - -NoNpxThread: - /* Check if we have FXSR and choose which operand to use */ - test byte ptr _KeI386FxsrPresent, 1 - jz FrRestore - fxrstor [ecx] - jmp AfterRestore - -FrRestore: - frstor [ecx] - -AfterRestore: - /* Set state loaded */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED - mov PCR[KPCR_NPX_THREAD], eax - - /* Enable interrupts to happen now */ - sti - nop - - /* Check if CR0 needs to be reloaded due to a context switch */ - cmp dword ptr [ecx+FN_CR0_NPX_STATE], 0 - jz _Kei386EoiHelper@0 - - /* We have to reload CR0... disable interrupts */ - cli - - /* Get CR0 and update it */ - mov ebx, cr0 - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Restore interrupts and check if TS is back on */ - sti - test bl, CR0_TS - jz _Kei386EoiHelper@0 - - /* Clear TS, and loop handling again */ - clts - cli - jmp StartTrapHandle - -KernelNpx: - - /* Set delayed error */ - or dword ptr [ecx+FN_CR0_NPX_STATE], CR0_TS - - /* Check if this happened during restore */ - cmp dword ptr [ebp+KTRAP_FRAME_EIP], offset FrRestore - jnz UserNpx - - /* Skip instruction and dispatch the exception */ - add dword ptr [ebp+KTRAP_FRAME_EIP], 3 - jmp _Kei386EoiHelper@0 - -IsLoaded: - /* Check if TS is set */ - test bl, CR0_TS - jnz TsSetOnLoadedState - -HandleNpxFault: - /* Check if the trap came from V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86Npx - - /* Check if it came from kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KernelNpx - - /* Check if it came from a VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jne V86Npx - -UserNpx: - /* Get the current thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - - /* Check NPX state */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - - /* Get the NPX save area */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - jz NoSaveRestore - -HandleUserNpx: - - /* Set new CR0 */ - mov ebx, cr0 - and ebx, ~(CR0_MP + CR0_EM + CR0_TS) - mov cr0, ebx - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnSave2 - - /* Save the state */ - fxsave [ecx] - jmp MakeCr0Dirty -FnSave2: - fnsave [ecx] - wait - -MakeCr0Dirty: - /* Make CR0 state not loaded */ - or ebx, NPX_STATE_NOT_LOADED - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Update NPX state */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - mov dword ptr PCR[KPCR_NPX_THREAD], 0 - -NoSaveRestore: - /* Clear the TS bit and re-enable interrupts */ - and dword ptr [ecx+FN_CR0_NPX_STATE], ~CR0_TS - sti - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnError - - /* Get error offset, control and status words */ - mov ebx, [ecx+FX_ERROR_OFFSET] - movzx eax, word ptr [ecx+FX_CONTROL_WORD] - movzx edx, word ptr [ecx+FX_STATUS_WORD] - - /* Get the faulting opcode */ - mov esi, [ecx+FX_DATA_OFFSET] - jmp CheckError - -FnError: - /* Get error offset, control and status words */ - mov ebx, [ecx+FP_ERROR_OFFSET] - movzx eax, word ptr [ecx+FP_CONTROL_WORD] - movzx edx, word ptr [ecx+FP_STATUS_WORD] - - /* Get the faulting opcode */ - mov esi, [ecx+FP_DATA_OFFSET] - -CheckError: - /* Mask exceptions */ - and eax, 0x3F - not eax - and eax, edx - - /* Check if what's left is invalid */ - test al, 1 - jz ValidNpxOpcode - - /* Check if it was a stack fault */ - test al, 64 - jnz InvalidStack - - /* Raise exception */ - mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParamZero - -InvalidStack: - - /* Raise exception */ - mov eax, STATUS_FLOAT_STACK_CHECK - jmp _DispatchTwoParamZero - -ValidNpxOpcode: - - /* Check for divide by 0 */ - test al, 4 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_DIVIDE_BY_ZERO - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 2 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParamZero - -1: - /* Check for overflow */ - test al, 8 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_OVERFLOW - jmp _DispatchOneParamZero - -1: - /* Check for underflow */ - test al, 16 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_UNDERFLOW - jmp _DispatchOneParamZero - -1: - /* Check for precision fault */ - test al, 32 - jz UnexpectedNpx - - /* Raise exception */ - mov eax, STATUS_FLOAT_INEXACT_RESULT - jmp _DispatchOneParamZero - -UnexpectedNpx: - - /* Strange result, bugcheck the OS */ - sti - push ebp - push 0 - push 0 - push eax - push 1 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 - -V86Npx: - /* Check if this is a VDM */ - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jz HandleUserNpx - - /* V86 NPX not handled */ - UNHANDLED_V86_PATH - -EmulationEnabled: - /* Did this come from kernel-mode? */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CheckState - - /* It came from user-mode, so this would only be valid inside a VDM */ - /* Since we don't actually have VDMs in ROS, bugcheck. */ - jmp UnexpectedNpx - -TsSetOnLoadedState: - /* TS shouldn't be set, unless this we don't have a Math Processor */ - test bl, CR0_MP - jnz BogusTrap - - /* Strange that we got a trap at all, but ignore and continue */ - clts - jmp _Kei386EoiHelper@0 - -BogusTrap: - /* Cause a bugcheck */ - push 0 - push 0 - push ebx - push 2 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckEx@20 -.endfunc - +GENERATE_TRAP_HANDLER KiTrap7, 1 GENERATE_TRAP_HANDLER KiTrap8, 0 GENERATE_TRAP_HANDLER KiTrap9, 1 GENERATE_TRAP_HANDLER KiTrap10, 0 @@ -1496,33 +1186,7 @@ GENERATE_TRAP_HANDLER KiTrap14, 0 GENERATE_TRAP_HANDLER KiTrap0F, 1 - -.func KiTrap16 -TRAP_FIXUPS kit10_a, kit10_t, DoFixupV86, DoNotFixupAbios -_KiTrap16: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit10_a, kit10_t - - /* Check if this is the NPX Thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - cmp eax, PCR[KPCR_NPX_THREAD] - - /* Get the initial stack and NPX frame */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* If this is a valid fault, handle it */ - jz HandleNpxFault - - /* Otherwise, re-enable interrupts and set delayed error */ - sti - or dword ptr [ecx+FN_CR0_NPX_STATE], CR0_TS - jmp _Kei386EoiHelper@0 -.endfunc - +GENERATE_TRAP_HANDLER KiTrap16, 1 GENERATE_TRAP_HANDLER KiTrap17, 1 GENERATE_TRAP_HANDLER KiTrap19, 1 Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -249,6 +249,163 @@ Parameter2, Parameter3, TrapFrame); +} + +VOID +FASTCALL +KiNpxHandler(IN PKTRAP_FRAME TrapFrame, + IN PKTHREAD Thread, + IN PFX_SAVE_AREA SaveArea) +{ + ULONG Cr0, Mask, Error, ErrorOffset, DataOffset; + extern VOID FrRestore(VOID); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Check for kernel trap */ + if (!KiUserTrap(TrapFrame)) + { + /* Kernel might've tripped a delayed error */ + SaveArea->Cr0NpxState |= CR0_TS; + + /* Only valid if it happened during a restore */ + if ((PVOID)TrapFrame->Eip == FrRestore) + { + /* It did, so just skip the instruction */ + TrapFrame->Eip += 3; /* sizeof(FRSTOR) */ + KiEoiHelper(TrapFrame); + } + } + + /* User or kernel trap -- get ready to issue an exception */ + if (Thread->NpxState == NPX_STATE_NOT_LOADED) + { + /* Update CR0 */ + Cr0 = __readcr0(); + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Save FPU state */ + Ke386SaveFpuState(SaveArea); + + /* Mark CR0 state dirty */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + KeGetCurrentPrcb()->NpxThread = NULL; + } + + /* Clear the TS bit and re-enable interrupts */ + SaveArea->Cr0NpxState &= ~CR0_TS; + _enable(); + + /* Check if we should get the FN or FX error */ + if (KeI386FxsrPresent) + { + /* Get it from FX */ + Mask = SaveArea->U.FxArea.ControlWord; + Error = SaveArea->U.FxArea.StatusWord; + + /* Get the FPU exception address too */ + ErrorOffset = SaveArea->U.FxArea.ErrorOffset; + DataOffset = SaveArea->U.FxArea.DataOffset; + } + else + { + /* Get it from FN */ + Mask = SaveArea->U.FnArea.ControlWord; + Error = SaveArea->U.FnArea.StatusWord; + + /* Get the FPU exception address too */ + ErrorOffset = SaveArea->U.FnArea.ErrorOffset; + DataOffset = SaveArea->U.FnArea.DataOffset; + } + + /* Get legal exceptions that software should handle */ + Error &= (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION); + Error &= ~Mask; + + if (Error & FSW_STACK_FAULT) + { + /* Issue stack check fault */ + KiDispatchException2Args(STATUS_FLOAT_STACK_CHECK, + ErrorOffset, + 0, + DataOffset, + TrapFrame); + } + + /* Check for invalid operation */ + if (Error & FSW_INVALID_OPERATION) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for divide by zero */ + if (Error & FSW_ZERO_DIVIDE) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_DIVIDE_BY_ZERO, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for denormal */ + if (Error & FSW_DENORMAL) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for overflow */ + if (Error & FSW_OVERFLOW) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_OVERFLOW, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for underflow */ + if (Error & FSW_UNDERFLOW) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_UNDERFLOW, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for precision fault */ + if (Error & FSW_PRECISION) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INEXACT_RESULT, + ErrorOffset, + 0, + TrapFrame); + } + + /* Unknown FPU fault */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 1, Error, 0, 0, TrapFrame); } VOID @@ -385,6 +542,115 @@ TrapFrame->Eip, TrapFrame); +} + +VOID +FASTCALL +KiTrap7Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread, NpxThread; + PFX_SAVE_AREA SaveArea, NpxSaveArea; + ULONG Cr0; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Try to handle NPX delay load */ + while (TRUE) + { + /* Get the current thread */ + Thread = KeGetCurrentThread(); + + /* Get the NPX frame */ + SaveArea = KiGetThreadNpxArea(Thread); + + /* Check if emulation is enabled */ + if (SaveArea->Cr0NpxState & CR0_EM) + { + /* Not implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Save CR0 and check NPX state */ + Cr0 = __readcr0(); + if (Thread->NpxState != NPX_STATE_LOADED) + { + /* Update CR0 */ + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Get the NPX thread */ + NpxThread = KeGetCurrentPrcb()->NpxThread; + if (NpxThread) + { + /* Get the NPX frame */ + NpxSaveArea = KiGetThreadNpxArea(NpxThread); + + /* Save FPU state */ + Ke386SaveFpuState(NpxSaveArea); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + } + + /* Load FPU state */ + Ke386LoadFpuState(SaveArea); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_LOADED; + KeGetCurrentPrcb()->NpxThread = Thread; + + /* Enable interrupts */ + _enable(); + + /* Check if CR0 needs to be reloaded due to context switch */ + if (!SaveArea->Cr0NpxState) KiEoiHelper(TrapFrame); + + /* Otherwise, we need to reload CR0, disable interrupts */ + _disable(); + + /* Reload CR0 */ + Cr0 = __readcr0(); + Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Now restore interrupts and check for TS */ + _enable(); + if (Cr0 & CR0_TS) KiEoiHelper(TrapFrame); + + /* We're still here -- clear TS and try again */ + __writecr0(__readcr0() &~ CR0_TS); + _disable(); + } + else + { + /* This is an actual fault, not a lack of FPU state */ + break; + } + } + + /* TS should not be set */ + if (Cr0 & CR0_TS) + { + /* + * If it's incorrectly set, then maybe the state is actually still valid + * but we could've lock track of that due to a BIOS call. + * Make sure MP is still set, which should verify the theory. + */ + if (Cr0 & CR0_MP) + { + /* Indeed, the state is actually still valid, so clear TS */ + __writecr0(__readcr0() &~ CR0_TS); + KiEoiHelper(TrapFrame); + } + + /* Otherwise, something strange is going on */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 2, Cr0, 0, 0, TrapFrame); + } + + /* It's not a delayed load, so process this trap as an NPX fault */ + KiNpxHandler(TrapFrame, Thread, SaveArea); } VOID @@ -581,6 +847,34 @@ KiSystemFatalException(EXCEPTION_RESERVED_TRAP, TrapFrame); } + +VOID +FASTCALL +KiTrap16Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + PFX_SAVE_AREA SaveArea; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check if this is the NPX thrad */ + Thread = KeGetCurrentThread(); + SaveArea = KiGetThreadNpxArea(Thread); + if (Thread != KeGetCurrentPrcb()->NpxThread) + { + /* It isn't, enable interrupts and set delayed error */ + _enable(); + SaveArea->Cr0NpxState |= CR0_TS; + + /* End trap */ + KiEoiHelper(TrapFrame); + } + + /* Otherwise, proceed with NPX fault handling */ + KiNpxHandler(TrapFrame, Thread, SaveArea); +} + VOID FASTCALL KiTrap17Handler(IN PKTRAP_FRAME TrapFrame) @@ -613,7 +907,7 @@ } /* Get the NPX frame */ - SaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + SaveArea = KiGetThreadNpxArea(Thread); /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); @@ -636,6 +930,7 @@ /* Mark CR0 state dirty */ Cr0 |= NPX_STATE_NOT_LOADED; Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); /* Update NPX state */ Thread->NpxState = NPX_STATE_NOT_LOADED;

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