Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[gdalsnes] 16829: merge from trunk 16686-16827

by gdalsnes＠svn.reactos.com

merge from trunk 16686-16827 misc stuff still crash often due to referencing problems/freed message queue Added: branches/win32k rewrite attempt/win32k/docs/ Added: branches/win32k rewrite attempt/win32k/docs/refs.txt Modified: branches/win32k rewrite attempt/win32k/eng/event.c Modified: branches/win32k rewrite attempt/win32k/include/focus.h Modified: branches/win32k rewrite attempt/win32k/include/mmcopy.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/misc/copy.c Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/objects/brush.c Modified: branches/win32k rewrite attempt/win32k/objects/cliprgn.c Modified: branches/win32k rewrite attempt/win32k/objects/color.c Modified: branches/win32k rewrite attempt/win32k/objects/coord.c Modified: branches/win32k rewrite attempt/win32k/objects/dc.c Modified: branches/win32k rewrite attempt/win32k/objects/dib.c Modified: branches/win32k rewrite attempt/win32k/objects/fillshap.c Modified: branches/win32k rewrite attempt/win32k/objects/line.c Modified: branches/win32k rewrite attempt/win32k/objects/pen.c Modified: branches/win32k rewrite attempt/win32k/objects/print.c Modified: branches/win32k rewrite attempt/win32k/objects/rect.c Modified: branches/win32k rewrite attempt/win32k/objects/region.c Modified: branches/win32k rewrite attempt/win32k/objects/text.c Modified: branches/win32k rewrite attempt/win32k/tests/win32k.xml Modified: branches/win32k rewrite attempt/win32k/win32k.xml _____ Added: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-07-28 13:40:52 UTC (rev 16829) @@ -0,0 +1,26 @@ +References: +----------- + +window -> desktop +window -> class + +window -> queue/thread_input ????????? +thread -> queue/thread_input ????????? + +thread -> process +process -> winsta +thread -> desktop +desktop -> winsta +winsta -> session + + +Above references create following dependencies: +----------------------------------------------- + +window -> desktop -> winsta -> session +window -> class + +thread -> process -> winsta -> session +thread -> desktop -> winsta -> session + +process -> winsta -> session _____ Modified: branches/win32k rewrite attempt/win32k/eng/event.c --- branches/win32k rewrite attempt/win32k/eng/event.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/eng/event.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -36,7 +36,7 @@ STDCALL EngCreateEvent ( OUT PEVENT *Event ) { - (*Event) = ExAllocatePool(NonPagedPool, sizeof(TAG_DRIVER)); + (*Event) = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); if ((*Event) == NULL) { return FALSE; _____ Modified: branches/win32k rewrite attempt/win32k/include/focus.h --- branches/win32k rewrite attempt/win32k/include/focus.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/focus.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -9,9 +9,8 @@ PWINDOW_OBJECT FASTCALL UserGetFocusWindow(); -PWINDOW_OBJECT FASTCALL -IntGetForegroundWindow(VOID); + /* * These functions take the window handles from current thread queue. */ _____ Modified: branches/win32k rewrite attempt/win32k/include/mmcopy.h --- branches/win32k rewrite attempt/win32k/include/mmcopy.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/mmcopy.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -4,8 +4,9 @@ #include <pseh/pseh.h> NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ); +NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ); #define MmCopyFromCaller(x,y,z) _MmCopyFromCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) -#define MmCopyToCaller(x,y,z) MmCopyFromCaller(x,y,z) +#define MmCopyToCaller(x,y,z) _MmCopyToCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) #endif/*NDK_MMCOPY_H*/ _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-07-28 13:40:52 UTC (rev 16829) @@ -38,8 +38,12 @@ NTSTATUS FASTCALL UserAcquireOrReleaseInputOwnership(BOOLEAN Release); -/* focus.c */ +/******************** FOCUS.C ********************************/ + PWINDOW_OBJECT FASTCALL +UserGetForegroundWindow(VOID); + +PWINDOW_OBJECT FASTCALL UserSetFocus(PWINDOW_OBJECT Wnd OPTIONAL); @@ -96,7 +100,8 @@ UserCreateMenuObject(HANDLE* h); -/* caret.c */ +/************************* CARET.C ****************************/ + BOOL FASTCALL UserShowCaret(PWINDOW_OBJECT Wnd); @@ -106,12 +111,14 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd); -/* winpos.c */ +/************************* WINPOS.C ****************************/ + BOOL FASTCALL UserGetClientOrigin(PWINDOW_OBJECT hWnd, LPPOINT Point); -/* scrollbar.c */ +/************************* SCROLLBAR.C ****************************/ + DWORD FASTCALL UserShowScrollBar(PWINDOW_OBJECT Wnd, int wBar, DWORD bShow); @@ -144,7 +151,7 @@ ClassReferenceClass(PWNDCLASS_OBJECT Class); VOID FASTCALL -ClassDereferenceClass(PWNDCLASS_OBJECT Class); +UserDereferenceClass(PWNDCLASS_OBJECT Class); PWNDCLASS_OBJECT FASTCALL ClassCreateClass(DWORD bytes); _____ Modified: branches/win32k rewrite attempt/win32k/misc/copy.c --- branches/win32k rewrite attempt/win32k/misc/copy.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/misc/copy.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -2,9 +2,23 @@ NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) { NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY { + ProbeForRead(Source,Bytes,1); + RtlCopyMemory(Target,Source,Bytes); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + return Status; +} + +NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ) { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY { - RtlCopyMemory(Target,Source,Bytes); + ProbeForWrite(Target,Bytes,1); + RtlCopyMemory(Target,Source,Bytes); } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); } _SEH_END; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c --- branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -54,7 +54,7 @@ } VOID FASTCALL -ClassDereferenceClass(PWNDCLASS_OBJECT Class) +UserDereferenceClass(PWNDCLASS_OBJECT Class) { //if (--Class->RefCount == 0) //{ @@ -319,7 +319,7 @@ if (ClassObject->hInstance == lpwcx->hInstance) { SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); return(NULL); } } @@ -739,7 +739,7 @@ if (Class->hInstance && Class->hInstance != hInstance) { - ClassDereferenceClass(Class); + UserDereferenceClass(Class); SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); RETURN(FALSE); } @@ -747,20 +747,20 @@ if (!IsListEmpty(&Class->ClassWindowsListHead)) { /* Dereference the ClassReferenceClassByNameOrAtom() call */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); SetLastWin32Error(ERROR_CLASS_HAS_WINDOWS); RETURN(FALSE); } /* Dereference the ClassReferenceClassByNameOrAtom() call */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); RemoveEntryList(&Class->ListEntry); RtlDeleteAtomFromAtomTable(WinStaObject->AtomTable, Class->Atom); /* Free the object */ - ClassDereferenceClass(Class); + UserDereferenceClass(Class); RETURN(TRUE); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c --- branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -91,7 +91,7 @@ /* FIXME: IntIsWindow */ - IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(Window == IntGetForegroundWindow()), 0); + IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(Window == UserGetForegroundWindow()), 0); /* FIXME: WA_CLICKACTIVE */ IntPostOrSendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, @@ -340,8 +340,9 @@ DPRINT("Enter NtUserGetForegroundWindow\n"); UserEnterExclusive(); - PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - RETURN(ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : 0); + //PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); + //RETURN(ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : 0); + RETURN(GetHwnd(UserGetForegroundWindow())); CLEANUP: DPRINT("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); @@ -352,7 +353,7 @@ PWINDOW_OBJECT FASTCALL -IntGetForegroundWindow(VOID) +UserGetForegroundWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c --- branches/win32k rewrite attempt/win32k/ntuser/input.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/input.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -379,13 +379,11 @@ MSG Mesg; NTSTATUS Status; -// Status = ObmReferenceObjectByHandle(InputWindowStation->HandleTable, -// InputWindowStation->ShellWindow, -// otWindow, -// (PVOID *)&Window); - - Window = IntGetWindowObject( InputWindowStation->ShellWindow); - + Window = UserGetObject( + &InputWindowStation->HandleTable, + InputWindowStation->ShellWindow, + USER_WINDOW); + if (!NT_SUCCESS(Status)) { DPRINT1("Couldn't find window to send Windows key message!\n"); @@ -399,8 +397,6 @@ /* The QS_HOTKEY is just a guess */ MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); - -// ObmDereferenceObject(Window); } STATIC VOID STDCALL @@ -930,7 +926,6 @@ SwapButtons = CurInfo->SwapButtons; DoMove = FALSE; -// ExAcquireFastMutex(&CurInfo->CursorMutex); UserGetCursorLocation(WinSta, &MousePos); OrgPos.x = MousePos.x; OrgPos.y = MousePos.y; @@ -948,17 +943,18 @@ MousePos.y += mi->dy; } -// Status = ObmReferenceObjectByHandle(WinSta->HandleTable, -// WinSta->ActiveDesktop->DesktopWindow, otWindow, (PVOID*)&DesktopWindow); - - DesktopWindow = UserGetDesktopWindow(); + //FIXME: make typename like HACCEL, HWND -> USER_WND, USER_ACCEL + DesktopWindow = UserGetObject( + &WinSta->HandleTable, + WinSta->ActiveDesktop->DesktopWindow, + USER_WINDOW); + if (DesktopWindow) { if(MousePos.x >= DesktopWindow->ClientRect.right) MousePos.x = DesktopWindow->ClientRect.right - 1; if(MousePos.y >= DesktopWindow->ClientRect.bottom) MousePos.y = DesktopWindow->ClientRect.bottom - 1; -// ObmDereferenceObject(DesktopWindow); } if(MousePos.x < 0) @@ -983,7 +979,6 @@ DoMove = (MousePos.x != OrgPos.x || MousePos.y != OrgPos.y); } -// ExReleaseFastMutex(&CurInfo->CursorMutex); if (DoMove) { @@ -1000,9 +995,9 @@ IntEngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); /* Only now, update the info in the GDIDEVICE, so EngMovePointer can - * use the old values to move the pointer image */ - GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; - GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; + * use the old values to move the pointer image */ + GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; + GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; BITMAPOBJ_UnlockBitmap(BitmapObj); } @@ -1019,7 +1014,7 @@ if(DoMove) { Msg.message = WM_MOUSEMOVE; - //FIXME: uhm... Msg is built on stack... + /* Msg is built on stack but MsqInsertSystemMessage copies it, so its ok */ MsqInsertSystemMessage(&Msg); } _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c --- branches/win32k rewrite attempt/win32k/ntuser/monitor.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/monitor.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -111,7 +111,6 @@ HANDLE Handle; PMONITOR_OBJECT Monitor; -// Monitor = ObmCreateObject(PsGetWin32Thread()->Desktop->WindowStation->HandleTable, &Handle, otMonitor, sizeof (MONITOR_OBJECT)); Monitor = UserCreateMonitorObject(&Handle); if (Monitor == NULL) { @@ -174,10 +173,7 @@ IntGetMonitorObject(IN HMONITOR hMonitor) { PMONITOR_OBJECT Monitor; -// NTSTATUS Status; -// Status = ObmReferenceObjectByHandle(PsGetWin32Thread()->Desktop->WindowStation->H andleTable, hMonitor, otMonitor, (PVOID *)&Monitor); - Monitor = UserGetMonitorObject(hMonitor); if (!Monitor) { _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c --- branches/win32k rewrite attempt/win32k/ntuser/window.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/window.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -428,7 +428,7 @@ RemoveEntryList(&Window->ClassListEntry); /* dereference the class */ - ClassDereferenceClass(Window->Class); + UserDereferenceClass(Window->Class); Window->Class = NULL; if(Window->WindowRegion) @@ -495,7 +495,7 @@ pwi->rcClient = WindowObject->ClientRect; pwi->dwStyle = WindowObject->Style; pwi->dwExStyle = WindowObject->ExStyle; - pwi->dwWindowStatus = (IntGetForegroundWindow() == WindowObject); /* WS_ACTIVECAPTION */ + pwi->dwWindowStatus = (UserGetForegroundWindow() == WindowObject); /* WS_ACTIVECAPTION */ IntGetWindowBorderMeasures(WindowObject, &pwi->cxWindowBorders, &pwi->cyWindowBorders); pwi->atomWindowType = (WindowObject->Class ? WindowObject->Class->Atom : 0); pwi->wCreatorVersion = 0x400; /* FIXME - return a real version number */ @@ -510,13 +510,19 @@ { PMENU_OBJECT OldMenuObject, NewMenuObject = NULL; + if ((WindowObject->Style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + *Changed = (WindowObject->IDMenu != (UINT) Menu); if (! *Changed) { return TRUE; } - if (0 != WindowObject->IDMenu) + if (WindowObject->IDMenu) { OldMenuObject = UserGetMenuObject((HMENU) WindowObject->IDMenu); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self); @@ -574,12 +580,24 @@ DestroyThreadWindows(struct _ETHREAD *Thread) { PLIST_ENTRY Current; - PW32PROCESS Win32Process; +// PW32PROCESS Win32Process; PW32THREAD Win32Thread; - PWINDOW_OBJECT *List, *pWnd; - ULONG Cnt = 0; +// PWINDOW_OBJECT *List, *pWnd, Wnd; + PWINDOW_OBJECT Wnd; +// ULONG Cnt = 0; Win32Thread = Thread->Tcb.Win32Thread; + + while (!IsListEmpty(&Win32Thread->WindowListHead)) + { + Current = RemoveHeadList(&Win32Thread->WindowListHead); + Wnd = CONTAINING_RECORD(Current, WINDOW_OBJECT, ThreadListEntry); + /* window removes itself from the list */ + UserDestroyWindow(Wnd); + } + +#if 0 + Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process; Current = Win32Thread->WindowListHead.Flink; @@ -615,7 +633,7 @@ ExFreePool(List); return; } - +#endif } @@ -1494,10 +1512,12 @@ /* Check the window station. */ if (PsGetWin32Thread()->Desktop == NULL) { - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT("Thread is not attached to a desktop! Cannot create window!\n"); return (HWND)0; } + + //FIXME: DO NOT REFERENCE WINSTA! Reference desktop instead!! WinStaObject = UserGetCurrentWinSta(); ObReferenceObjectByPointer(WinStaObject, KernelMode, ExWindowStationObjectType, 0); @@ -1513,7 +1533,7 @@ if (!WindowObject) { ObDereferenceObject(WinStaObject); - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return (HWND)0; } @@ -1529,6 +1549,8 @@ * Fill out the structure describing it. */ WindowObject->Class = ClassObject; + + //er dette n°dvendig? InsertTailList(&ClassObject->ClassWindowsListHead, &WindowObject->ClassListEntry); WindowObject->ExStyle = dwExStyle; @@ -1551,8 +1573,11 @@ WindowObject->MessageQueue = UserGetCurrentQueue(); + ASSERT(WindowObject->MessageQueue); + DPRINT1("Set 0x%x's parent to 0x%x\n",WindowObject, ParentWindow); WindowObject->ParentWnd = ParentWindow; + if((OwnerWindow = IntGetWindowObject(OwnerWindowHandle))) { WindowObject->Owner = OwnerWindowHandle; @@ -1604,7 +1629,7 @@ TAG_STRING); if (NULL == WindowObject->WindowName.Buffer) { - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT1("Failed to allocate mem for window name\n"); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; @@ -1691,7 +1716,7 @@ /* FIXME - Delete window object and remove it from the thread windows list */ /* FIXME - delete allocated DCE */ - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT1("CBT-hook returned !0\n"); return (HWND) NULL; } @@ -1894,7 +1919,7 @@ if (Result == (LRESULT)-1) { /* FIXME: Cleanup. */ - ClassDereferenceClass(ClassObject); + UserDereferenceClass(ClassObject); DPRINT("IntCreateWindowEx(): send CREATE message failed.\n"); return((HWND)0); } @@ -2149,7 +2174,7 @@ WinPosActivateOtherWindow(Wnd); } } - +// IntDereferenceMessageQueue(Window->MessageQueue); if (Wnd->MessageQueue->ActiveWindow == Wnd->Self) Wnd->MessageQueue->ActiveWindow = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c --- branches/win32k rewrite attempt/win32k/ntuser/winpos.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/ntuser/winpos.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -114,56 +114,71 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window) { PWINDOW_OBJECT Wnd, Old; - int TryTopmost; + HWND Fg; if (!Window || IntIsDesktopWindow(Window)) { IntSetFocusMessageQueue(NULL); return; } + + /* If this is popup window, try to activate the owner first. */ + if ((Window->Style & WS_POPUP) && (Wnd = IntGetOwner(Window))) + { + for(;;) + { + Old = Wnd; + Wnd = Wnd->ParentWnd;//IntGetParentObject(Wnd); + if(IntIsDesktopWindow(Wnd)) + { + Wnd = Old; + break; + } + } + + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + goto done; + + } + + /* Pick a next top-level window. */ + /* FIXME: Search for non-tooltip windows first. */ Wnd = Window; - for(;;) + while (Wnd != NULL) { - HWND *List, *phWnd; - Old = Wnd; - Wnd = Wnd->ParentWnd; - if(!Wnd) + if (Old->NextSibling == NULL) { - IntSetFocusMessageQueue(NULL); - return; + Wnd = NULL; +//(( if (Old != Window) +//(( IntReleaseWindowObject(Old); + break; } + Wnd = IntGetWindowObject(Old->NextSibling->Self); +// IntUnLockRelatives(Old); +// if (Old != Window) +// IntReleaseWindowObject(Old); + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + break; + } - if((List = IntWinListChildren(Wnd))) +done: +// Fg = NtUserGetForegroundWindow(); + Fg = GetHwnd(UserGetForegroundWindow()); + if (Wnd && (!Fg || Window->Self == Fg)) + { + if (IntSetForegroundWindow(Wnd)) { - for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++) - { - for(phWnd = List; *phWnd; phWnd++) - { - PWINDOW_OBJECT Child; - - if((*phWnd) == Window->Self) - { - continue; - } - - if((Child = IntGetWindowObject(*phWnd))) -// Child = *phWnd; - { - if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST))) - || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST)))) - && IntSetForegroundWindow(Child)) - { - ExFreePool(List); - return; - } - } - } - } - ExFreePool(List); +// IntReleaseWindowObject(Wnd); + return; } } - + if (!IntSetActiveWindow(Wnd)) + IntSetActiveWindow(0); +// if (Wnd) +// IntReleaseWindowObject(Wnd); } @@ -733,7 +748,7 @@ //FIXME - tmp = IntGetForegroundWindow(); + tmp = UserGetForegroundWindow(); if (WinPos->hwnd == (tmp ? tmp->Self : 0)) { WinPos->flags |= SWP_NOACTIVATE; /* Already active */ _____ Modified: branches/win32k rewrite attempt/win32k/objects/brush.c --- branches/win32k rewrite attempt/win32k/objects/brush.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/brush.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -563,7 +563,7 @@ CONST VOID *PackedDIB) { BITMAPINFO *SafeBitmapInfoAndData; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; HBRUSH hBrush; SafeBitmapInfoAndData = EngAllocMem(0, BitmapInfoSize, 0); @@ -573,10 +573,24 @@ return NULL; } - Status = MmCopyFromCaller(SafeBitmapInfoAndData, BitmapInfoAndData, - BitmapInfoSize); + _SEH_TRY + { + ProbeForRead(BitmapInfoAndData, + BitmapInfoSize, + 1); + RtlCopyMemory(SafeBitmapInfoAndData, + BitmapInfoAndData, + BitmapInfoSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { + EngFreeMem(SafeBitmapInfoAndData); SetLastNtError(Status); return 0; } @@ -632,11 +646,23 @@ if (Point != NULL) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; SafePoint.x = dc->w.brushOrgX; SafePoint.y = dc->w.brushOrgY; - Status = MmCopyToCaller(Point, &SafePoint, sizeof(POINT)); + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + *Point = SafePoint; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -661,7 +687,7 @@ ULONG Reserved) { PPATRECT rb = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; if (cRects > 0) @@ -672,7 +698,21 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Status = MmCopyFromCaller(rb, pRects, sizeof(PATRECT) * cRects); + _SEH_TRY + { + ProbeForRead(pRects, + cRects * sizeof(PATRECT), + 1); + RtlCopyMemory(rb, + pRects, + cRects * sizeof(PATRECT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) { ExFreePool(rb); _____ Modified: branches/win32k rewrite attempt/win32k/objects/cliprgn.c --- branches/win32k rewrite attempt/win32k/objects/cliprgn.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/cliprgn.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -192,7 +192,19 @@ Ret = IntGdiGetClipBox(hDC, &Saferect); - Status = MmCopyToCaller(rc, &Saferect, sizeof(RECT)); + _SEH_TRY + { + ProbeForWrite(rc, + sizeof(RECT), + 1); + *rc = Saferect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { @@ -341,7 +353,7 @@ BOOL STDCALL NtGdiRectVisible(HDC hDC, CONST PRECT UnsafeRect) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PROSRGNDATA Rgn; PDC dc = DC_LockDc(hDC); BOOL Result = FALSE; @@ -353,10 +365,23 @@ return FALSE; } - Status = MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)); + _SEH_TRY + { + ProbeForRead(UnsafeRect, + sizeof(RECT), + 1); + Rect = *UnsafeRect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); + SetLastNtError(Status); return FALSE; } _____ Modified: branches/win32k rewrite attempt/win32k/objects/color.c --- branches/win32k rewrite attempt/win32k/objects/color.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/color.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -588,6 +588,13 @@ return old; } +/* + Win 2k Graphics API, Black Book. by coriolis.com + Page 62, Note that Steps 3, 5, and 6 are not required for Windows NT(tm) + and Windows 2000(tm). + + Step 5. UnrealizeObject(hTrackBrush); + */ BOOL STDCALL NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { @@ -595,7 +602,6 @@ GDIOBJHDR * ptr; DWORD objectType; BOOL Ret = FALSE; - UNIMPLEMENTED; ptr = GDIOBJ_LockObj(hgdiobj, GDI_OBJECT_TYPE_DONTCARE); if (ptr == 0) @@ -606,12 +612,6 @@ objectType = GDIOBJ_GetObjectType(hgdiobj); switch(objectType) { - case GDI_OBJECT_TYPE_PALETTE: - { - /* Make sure this is a Palette object!*/ - DPRINT1("GDI_OBJECT_TYPE_PALETTE\n"); - break; - } /* msdn.microsoft.com, "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, @@ -620,7 +620,7 @@ */ case GDI_OBJECT_TYPE_BRUSH: { - DPRINT1("GDI_OBJECT_TYPE_BRUSH\n"); + DPRINT("GDI_OBJECT_TYPE_BRUSH\n"); Ret = TRUE; break; } _____ Modified: branches/win32k rewrite attempt/win32k/objects/coord.c --- branches/win32k rewrite attempt/win32k/objects/coord.c 2005-07-28 11:48:58 UTC (rev 16828) +++ branches/win32k rewrite attempt/win32k/objects/coord.c 2005-07-28 13:40:52 UTC (rev 16829) @@ -63,17 +63,29 @@ { XFORM xformTemp; XFORM xform1, xform2; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; - - Status = MmCopyFromCaller( &xform1, Unsafexform1, sizeof(XFORM) ); - if(!NT_SUCCESS(Status)) + _SEH_TRY { - SetLastNtError(Status); - return FALSE; + ProbeForWrite(UnsafeXFormResult, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform1, + sizeof(XFORM), + 1); + ProbeForRead(Unsafexform2, + sizeof(XFORM), + 1); + xform1 = *Unsafexform1; + xform2 = *Unsafexform2; } - Status = MmCopyFromCaller( &xform2, Unsafexform2, sizeof(XFORM) ); + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -83,7 +95,17 @@ Ret = IntGdiCombineTransform(&xformTemp, &xform1, &xform2); /* Copy the result to xformResult */ - Status = MmCopyToCaller( UnsafeXFormResult, &xformTemp, sizeof(XFORM) ); + _SEH_TRY + { + /* pointer was already probed! */ + *UnsafeXFormResult = xformTemp; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -131,7 +153,7 @@ int Count) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -159,7 +181,21 @@ return FALSE; } - Status = MmCopyFromCaller(Points, UnsafePoints, Size); + _SEH_TRY + { + ProbeForWrite(UnsafePoints, + Size, + 1); + RtlCopyMemory(Points, + UnsafePoints, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -170,7 +206,19 @@ IntDPtoLP(dc, Points, Count); - Status = MmCopyToCaller(UnsafePoints, Points, Size); + _SEH_TRY + { + /* pointer was already probed! */ + RtlCopyMemory(UnsafePoints, + Points, + Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); @@ -218,7 +266,7 @@ LPXFORM XForm) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc ( hDC ); if (!dc) @@ -233,7 +281,18 @@ return FALSE; } - Status = MmCopyToCaller(XForm, &dc->w.xformWorld2Wnd, sizeof(XFORM)); + _SEH_TRY + { + ProbeForWrite(XForm, + sizeof(XFORM), + 1); + *XForm = dc->w.xformWorld2Wnd; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; DC_UnlockDc(dc); return NT_SUCCESS(Status); @@ -280,7 +339,7 @@ NtGdiLPtoDP ( HDC hDC, LPPOINT UnsafePoints, INT Count ) { PDC dc; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; LPPOINT Points; ULONG Size; @@ -308,7 +367,21 @@ [truncated at 1000 lines; 2213 more skipped]

19 years, 6 months

[ea] 16828: Fix compilation (as hinted by Alex).

by ea＠svn.reactos.com

Fix compilation (as hinted by Alex). Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 10:45:21 UTC (rev 16827) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 11:48:58 UTC (rev 16828) @@ -248,7 +248,7 @@ Request->Status = STATUS_SUCCESS; /* If we don't need a console, then get out of here */ - if (!Request->Data.AllocConsoleRequest.ConsoleNotNeeded) + if (!Request->Data.AllocConsoleRequest.ConsoleNeeded) { DPRINT1("No console needed\n"); return STATUS_SUCCESS;

19 years, 6 months

[chorns] 16827: Don't clean alias modules

by chorns＠svn.reactos.com

Don't clean alias modules Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-28 04:12:43 UTC (rev 16826) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-28 10:45:21 UTC (rev 16827) @@ -489,6 +489,9 @@ void MingwModuleHandler::GenerateCleanTarget () const { + if ( module.type == Alias ) + return; + fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() );

19 years, 6 months

[ion] 16826: - Start of fixing CreateProcess's problems. Implemented the console creation as it should be done (not quite, but much closer to design then before). There are still some problems (input/output handle inconsitencies), I am currently working on these issues;

by ion＠svn.reactos.com

- Start of fixing CreateProcess's problems. Implemented the console creation as it should be done (not quite, but much closer to design then before). There are still some problems (input/output handle inconsitencies), I am currently working on these issues; - Some debug header cleanup. - Use the proper debug macros in some of the network code, shuts up a lot of spam when debugging for those modules wasn't enabled. Modified: trunk/reactos/drivers/net/afd/afd/select.c Modified: trunk/reactos/drivers/net/dd/ne2000/ne2000/8390.c Deleted: trunk/reactos/drivers/net/wshtcpip/debug.h Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.c Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/system/dhcp/include/debug.h Modified: trunk/reactos/subsys/system/dhcp/util.c _____ Modified: trunk/reactos/drivers/net/afd/afd/select.c --- trunk/reactos/drivers/net/afd/afd/select.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/drivers/net/afd/afd/select.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -13,6 +13,7 @@ #include "debug.h" VOID PrintEvents( ULONG Events ) { +#if DBG char *events_list[] = { "AFD_EVENT_RECEIVE", "AFD_EVENT_OOB_RECEIVE", "AFD_EVENT_SEND", @@ -28,7 +29,8 @@ int i; for( i = 0; events_list[i]; i++ ) - if( Events & (1 << i) ) DbgPrint("%s ", events_list[i] ); + if( Events & (1 << i) ) AFD_DbgPrint(MID_TRACE,("%s ", events_list[i] )); +#endif } VOID CopyBackStatus( PAFD_HANDLE HandleArray, @@ -224,11 +226,9 @@ PollReq->Handles[i].Status = AFD_EVENT_CLOSE; Signalled++; } else { -#ifdef DBG - DbgPrint("AFD: Select Events: "); + AFD_DbgPrint(MID_TRACE, ("AFD: Select Events: ")); PrintEvents( PollReq->Handles[i].Events ); - DbgPrint("\n"); -#endif + AFD_DbgPrint(MID_TRACE,("\n")); PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; _____ Modified: trunk/reactos/drivers/net/dd/ne2000/ne2000/8390.c --- trunk/reactos/drivers/net/dd/ne2000/ne2000/8390.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/drivers/net/dd/ne2000/ne2000/8390.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -68,7 +68,7 @@ /* first try the supplied value */ if(ProbeAddressForNIC(Adapter->IoBaseAddress)) { - NDIS_DbgPrint(MIN_TRACE, ("Found adapter at 0x%x\n", Adapter->IoBaseAddress)); + NDIS_DbgPrint(MID_TRACE, ("Found adapter at 0x%x\n", Adapter->IoBaseAddress)); return TRUE; } @@ -77,7 +77,7 @@ { if(ProbeAddressForNIC(ProbeAddressList[i])) { - NDIS_DbgPrint(MIN_TRACE, ("Found adapter at address 0x%x\n", ProbeAddressList[i])); + NDIS_DbgPrint(MID_TRACE, ("Found adapter at address 0x%x\n", ProbeAddressList[i])); Adapter->IoBaseAddress = ProbeAddressList[i]; return TRUE; } @@ -905,7 +905,7 @@ IndicateLength + DRIVER_HEADER_SIZE); NDIS_DbgPrint(MID_TRACE, ("Indicating (%d) bytes.\n", IndicateLength)); - DbgPrint("ne2000!NICIndicatePacket: Indicating (%d) bytes.\n", IndicateLength); + NDIS_DbgPrint(MID_TRACE, ("ne2000!NICIndicatePacket: Indicating (%d) bytes.\n", IndicateLength)); #if 0 NDIS_DbgPrint(MAX_TRACE, ("FRAME:\n")); _____ Deleted: trunk/reactos/drivers/net/wshtcpip/debug.h --- trunk/reactos/drivers/net/wshtcpip/debug.h 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/drivers/net/wshtcpip/debug.h 2005-07-28 04:12:43 UTC (rev 16826) @@ -1,69 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock Helper DLL for TCP/IP - * FILE: include/debug.h - * PURPOSE: Debugging support macros - * DEFINES: DBG - Enable debug output - * NASSERT - Disable assertions - */ -#ifndef __DEBUG_H -#define __DEBUG_H - -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 - -#define DEBUG_ULTRA 0xFFFFFFFF - -#ifdef DBG - -extern DWORD DebugTraceLevel; - -#define WSH_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_; \ - } - -/* this belongs in ndis.h */ -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { WSH_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); ExitProcess(0); } -#endif /* NASSERT */ -#endif - -#else /* DBG */ - -#define WSH_DbgPrint(_t_, _x_) - -/*#define ASSERT(x)*/ - -#endif /* DBG */ - - -#undef assert -#define assert(x) ASSERT(x) -#define assert_irql(x) ASSERT_IRQL(x) - - -#define UNIMPLEMENTED \ - WSH_DbgPrint(MIN_TRACE, ("(%s:%d)(%s) is unimplemented, \ - please try again later.\n", __FILE__, __LINE__, __FUNCTION__)); - -#define CHECKPOINT \ - WSH_DbgPrint(MIN_TRACE, ("\n")); - -#define CP CHECKPOINT - -#endif /* __DEBUG_H */ - -/* EOF */ _____ Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.c --- trunk/reactos/drivers/net/wshtcpip/wshtcpip.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/drivers/net/wshtcpip/wshtcpip.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -8,25 +8,16 @@ * CSH 01/09-2000 Created */ #include <wshtcpip.h> +#define NDEBUG +#include <debug.h> -#ifdef DBG - -/* See debug.h for debug/trace constants */ -DWORD DebugTraceLevel = MAX_TRACE; - -#endif /* DBG */ - -/* To make the linker happy */ -VOID STDCALL KeBugCheck (ULONG BugCheckCode) {} - - BOOL EXPORT DllMain(HANDLE hInstDll, ULONG dwReason, PVOID Reserved) { - WSH_DbgPrint(MIN_TRACE, ("DllMain of wshtcpip.dll\n")); + DPRINT("DllMain of wshtcpip.dll\n"); switch (dwReason) { case DLL_PROCESS_ATTACH: @@ -291,7 +282,7 @@ UNICODE_STRING RawDeviceName = RTL_CONSTANT_STRING(DD_RAW_IP_DEVICE_NAME); NTSTATUS Status; - WSH_DbgPrint(MAX_TRACE, ("\n")); + DPRINT(""); switch (*SocketType) { case SOCK_STREAM: _____ Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h --- trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2005-07-28 04:12:43 UTC (rev 16826) @@ -9,8 +9,6 @@ #include <ddk/ntddk.h> #include <wsahelp.h> -#include <windows.h> -#include <debug.h> #define EXPORT STDCALL _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-07-28 04:12:43 UTC (rev 16826) @@ -33,10 +33,6 @@ { HANDLE NewProcessId; ULONG Flags; - PCONTROLDISPATCHER CtrlDispatcher; - HANDLE Console; - HANDLE InputHandle; - HANDLE OutputHandle; } CSRSS_CREATE_PROCESS, *PCSRSS_CREATE_PROCESS; typedef struct @@ -75,6 +71,7 @@ typedef struct { PCONTROLDISPATCHER CtrlDispatcher; + BOOL ConsoleNeeded; HANDLE Console; HANDLE InputHandle; HANDLE OutputHandle; _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -1341,6 +1341,7 @@ } Request.Data.AllocConsoleRequest.CtrlDispatcher = ConsoleControlDispatcher; + Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; CsrRequest = MAKE_CSR_API(ALLOC_CONSOLE, CSR_CONSOLE); Status = CsrClientCallServer( &Request, NULL, CsrRequest, sizeof( CSR_API_MESSAGE ) ); _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -37,10 +37,18 @@ RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); +extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern BOOL FASTCALL NlsInit(); extern VOID FASTCALL NlsUninit(); +HANDLE +STDCALL +DuplicateConsoleHandle(HANDLE hConsole, + DWORD dwDesiredAccess, + BOOL bInheritHandle, + DWORD dwOptions); + /* FUNCTIONS *****************************************************************/ static NTSTATUS @@ -75,7 +83,106 @@ return STATUS_SUCCESS; } +BOOL +STDCALL +BasepInitConsole(VOID) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; + WCHAR lpTest[MAX_PATH]; + GetModuleFileNameW(NULL, lpTest, MAX_PATH); + DPRINT1("BasepInitConsole for : %S\n", lpTest); + DPRINT1("Our current console handles are: %lx, %lx, %lx\n", + Parameters->ConsoleHandle, Parameters->StandardInput, + Parameters->StandardOutput); + + /* We have nothing to do if this isn't a console app... */ + if (RtlImageNtHeader(GetModuleHandle(NULL))->OptionalHeader.Subsystem != + IMAGE_SUBSYSTEM_WINDOWS_CUI) + { + DPRINT1("Image is not a console application\n"); + Parameters->ConsoleHandle = NULL; + return TRUE; + } + + /* Assume one is needed */ + Request.Data.AllocConsoleRequest.ConsoleNeeded = TRUE; + + /* Handle the special flags given to us by BasepInitializeEnvironment */ + if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) + { + /* No console to create */ + DPRINT1("No console to create\n"); + Parameters->ConsoleHandle = NULL; + Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; + } + else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) + { + /* We'll get the real one soon */ + DPRINT1("Creating new console\n"); + Parameters->ConsoleHandle = NULL; + } + else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW) + { + /* We'll get the real one soon */ + DPRINT1("NOT SUPPORTED: HANDLE_CREATE_NO_WINDOW\n"); + Parameters->ConsoleHandle = NULL; + } + else + { + DPRINT1("Using existing console: %x\n", Parameters->ConsoleHandle); + } + + /* Initialize Console Ctrl Handler */ + RtlInitializeCriticalSection(&ConsoleLock); + SetConsoleCtrlHandler(DefaultConsoleCtrlHandler, TRUE); + + /* Now use the proper console handle */ + Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle; + + /* + * Normally, we should be connecting to the Console CSR Server... + * but we don't have one yet, so we will instead simply send a create + * console message to the Base Server. When we finally have a Console + * Server, this code should be changed to send connection data instead. + * + * Also note that this connection should be made for any console app, even + * in the case above where -we- return. + */ + CsrRequest = MAKE_CSR_API(ALLOC_CONSOLE, CSR_CONSOLE); + Request.Data.AllocConsoleRequest.CtrlDispatcher = ConsoleControlDispatcher; + Status = CsrClientCallServer(&Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + DPRINT1("CSR Failed to give us a console\n"); + /* We're lying here, so at least the process can load... */ + return TRUE; + } + + /* We got the handles, let's set them */ + Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console; + SetStdHandle(STD_INPUT_HANDLE, Request.Data.AllocConsoleRequest.InputHandle); + SetStdHandle(STD_OUTPUT_HANDLE, Request.Data.AllocConsoleRequest.OutputHandle); + SetStdHandle(STD_ERROR_HANDLE, + DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, + 0, + TRUE, + DUPLICATE_SAME_ACCESS)); + + DPRINT1("Console setup: %lx, %lx, %lx\n", + Request.Data.AllocConsoleRequest.Console, + Request.Data.AllocConsoleRequest.InputHandle, + Request.Data.AllocConsoleRequest.OutputHandle); + return TRUE; +} + + BOOL STDCALL DllMain(HANDLE hDll, DWORD dwReason, @@ -148,11 +255,13 @@ return FALSE; } - /* Initialize console ctrl handler */ - RtlInitializeCriticalSection(&ConsoleLock); - SetConsoleCtrlHandler(DefaultConsoleCtrlHandler, TRUE); + /* Initialize Console Support */ + if (!BasepInitConsole()) + { + DPRINT1("Failure to set up console\n"); + return FALSE; + } - /* Insert more dll attach stuff here! */ DllInitialized = TRUE; _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -80,36 +80,18 @@ NTSTATUS STDCALL BasepNotifyCsrOfCreation(ULONG dwCreationFlags, - IN HANDLE ProcessId, - IN ULONG SubsystemType, - OUT PHANDLE ConsoleHandle, - OUT PHANDLE InputHandle, - OUT PHANDLE OutputHandle) + IN HANDLE ProcessId) { ULONG Request = CREATE_PROCESS; CSR_API_MESSAGE CsrRequest; NTSTATUS Status; - DPRINT("BasepNotifyCsrOfCreation\n"); - - /* Some hacks (heck, this whole API is a hack) */ - if (SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_GUI) - { - dwCreationFlags = (dwCreationFlags &~ CREATE_NEW_CONSOLE) | - DETACHED_PROCESS; - } - else if (SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) - { - dwCreationFlags |= CREATE_NEW_CONSOLE; - } - + DPRINT1("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n", + ProcessId, dwCreationFlags); + /* Fill out the request */ CsrRequest.Data.CreateProcessRequest.NewProcessId = ProcessId; CsrRequest.Data.CreateProcessRequest.Flags = dwCreationFlags; - CsrRequest.Data.CreateProcessRequest.CtrlDispatcher = ConsoleControlDispatcher; - CsrRequest.Data.CreateProcessRequest.InputHandle = 0; - CsrRequest.Data.CreateProcessRequest.OutputHandle = 0; - CsrRequest.Data.CreateProcessRequest.Console = 0; /* Call CSR */ Status = CsrClientCallServer(&CsrRequest, @@ -121,11 +103,6 @@ DPRINT1("Failed to tell csrss about new process\n"); return CsrRequest.Status; } - /* Return Handles */ - *ConsoleHandle = CsrRequest.Data.CreateProcessRequest.Console; - *InputHandle = CsrRequest.Data.CreateProcessRequest.InputHandle; - *OutputHandle = CsrRequest.Data.CreateProcessRequest.OutputHandle; - DPRINT("CSR Created: %lx %lx\n", *InputHandle, *OutputHandle); /* REturn Success */ return STATUS_SUCCESS; @@ -356,9 +333,7 @@ LPVOID Environment, LPSTARTUPINFOW StartupInfo, DWORD CreationFlags, - BOOL InheritHandles, - HANDLE hInput, - HANDLE hOutput) + BOOL InheritHandles) { WCHAR FullPath[MAX_PATH]; LPWSTR Remaining; @@ -570,14 +545,6 @@ PPF_PROFILE_SERVER : 0; ProcessParameters->Flags |= (NtCurrentPeb()->ProcessParameters->Flags & PPF_DISABLE_HEAP_CHECKS); - - /* - * FIXME: Our console init stuff is messy. See my comment in kernel32's - * DllMain. - */ - if (!ProcessParameters->StandardInput) ProcessParameters->StandardInput = hInput; - if (!ProcessParameters->StandardOutput) ProcessParameters->StandardOutput = hOutput; - if (!ProcessParameters->StandardError) ProcessParameters->StandardError = hOutput; /* Write the Parameter Block */ Status = NtWriteVirtualMemory(ProcessHandle, @@ -780,7 +747,6 @@ ULONG RetVal; UINT Error; BOOLEAN SearchDone = FALSE; - HANDLE hConsole, hInput, hOutput; CLIENT_ID ClientId; PPEB OurPeb = NtCurrentPeb(); PPEB RemotePeb; @@ -1316,21 +1282,6 @@ &ProcessBasicInfo, sizeof(ProcessBasicInfo), NULL); - - /* Notify CSRSS */ - Status = BasepNotifyCsrOfCreation(dwCreationFlags, - (HANDLE)ProcessBasicInfo.UniqueProcessId, - SectionImageInfo.SubsystemType, - &hConsole, - &hInput, - &hOutput); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR Notification Failed"); - SetLastErrorByStatus(Status); - return FALSE; - } /* Create Process Environment */ RemotePeb = ProcessBasicInfo.PebBaseAddress; @@ -1343,9 +1294,7 @@ lpEnvironment, lpStartupInfo, dwCreationFlags, - bInheritHandles, - hInput, - hOutput); + bInheritHandles); if (!NT_SUCCESS(Status)) { DPRINT1("Could not initialize Process Environment\n"); @@ -1400,7 +1349,19 @@ DPRINT1("Could not create Initial Thread\n"); return FALSE; } + + /* Notify CSRSS */ + Status = BasepNotifyCsrOfCreation(dwCreationFlags, + (HANDLE)ProcessBasicInfo.UniqueProcessId); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR Notification Failed"); + SetLastErrorByStatus(Status); + return FALSE; + } + if (!(dwCreationFlags & CREATE_SUSPENDED)) { NtResumeThread(hThread, &Dummy); _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -192,8 +192,6 @@ CSR_API(CsrCreateProcess) { PCSRSS_PROCESS_DATA NewProcessData; - NTSTATUS Status; - CSR_API_MESSAGE ApiRequest; Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); @@ -209,57 +207,6 @@ NewProcessData->ShutdownLevel = 0x280; NewProcessData->ShutdownFlags = 0; - if (Request->Data.CreateProcessRequest.Flags & DETACHED_PROCESS) - { - NewProcessData->Console = NULL; - } - else if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_CONSOLE) - { - ApiRequest.Type = ALLOC_CONSOLE; - ApiRequest.Header.DataSize = sizeof(CSRSS_ALLOC_CONSOLE); - ApiRequest.Header.MessageSize = LPC_MESSAGE_BASE_SIZE + sizeof(CSRSS_ALLOC_CONSOLE); - ApiRequest.Data.AllocConsoleRequest.CtrlDispatcher = Request->Data.CreateProcessRequest.CtrlDispatcher; - - CsrApiCallHandler(NewProcessData, &ApiRequest); - - Request->Status = ApiRequest.Status; - if (! NT_SUCCESS(Request->Status)) - { - CsrFreeProcessData(Request->Data.CreateProcessRequest.NewProcessId); - return Request->Status; - } - Request->Data.CreateProcessRequest.InputHandle = ApiRequest.Data.AllocConsoleRequest.InputHandle; - Request->Data.CreateProcessRequest.OutputHandle = ApiRequest.Data.AllocConsoleRequest.OutputHandle; - } - else - { - NewProcessData->Console = ProcessData->Console; - InterlockedIncrement( &(ProcessData->Console->Header.ReferenceCount) ); - CsrInsertObject(NewProcessData, - &Request->Data.CreateProcessRequest.InputHandle, - (Object_t *)NewProcessData->Console); - RtlEnterCriticalSection(&ProcessDataLock ); - CsrInsertObject( NewProcessData, - &Request->Data.CreateProcessRequest.OutputHandle, - &(NewProcessData->Console->ActiveBuffer->Header) ); - - RtlLeaveCriticalSection(&ProcessDataLock); - Status = NtDuplicateObject( NtCurrentProcess(), NewProcessData->Console->ActiveEvent, NewProcessData->Process, &NewProcessData->ConsoleEvent, SYNCHRONIZE, FALSE, 0 ); - if( !NT_SUCCESS( Status ) ) - { - DbgPrint( "CSR: NtDuplicateObject() failed: %x\n", Status ); - CsrFreeProcessData( NewProcessData->ProcessId ); - Request->Status = Status; - return Status; - } - NewProcessData->CtrlDispatcher = Request->Data.CreateProcessRequest.CtrlDispatcher; - RtlEnterCriticalSection(&ProcessDataLock ); - InsertHeadList(&NewProcessData->Console->ProcessList, &NewProcessData->ProcessEntry); - RtlLeaveCriticalSection(&ProcessDataLock); - } - - Request->Data.CreateProcessRequest.Console = NewProcessData->Console; - Request->Status = STATUS_SUCCESS; return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -223,75 +223,124 @@ CSR_API(CsrAllocConsole) { - PCSRSS_CONSOLE Console; - NTSTATUS Status; + PCSRSS_CONSOLE Console; + NTSTATUS Status; - DPRINT("CsrAllocConsole\n"); + DPRINT1("CsrAllocConsole\n"); - Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); - Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; + Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); + Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; - if (ProcessData == NULL) + if (ProcessData == NULL) { - return Request->Status = STATUS_INVALID_PARAMETER; + DPRINT1("No process data\n"); + return Request->Status = STATUS_INVALID_PARAMETER; } - if (ProcessData->Console) + if (ProcessData->Console) { - Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + DPRINT1("Process already has a console\n"); + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } - Request->Status = STATUS_SUCCESS; - Console = HeapAlloc(Win32CsrApiHeap, 0, sizeof(CSRSS_CONSOLE)); - if (NULL == Console) + /* Assume success */ + Request->Status = STATUS_SUCCESS; + + /* If we don't need a console, then get out of here */ + if (!Request->Data.AllocConsoleRequest.ConsoleNotNeeded) { - Request->Status = STATUS_NO_MEMORY; - return STATUS_NO_MEMORY; + DPRINT1("No console needed\n"); + return STATUS_SUCCESS; } - Request->Status = CsrInitConsole(Console); - if (! NT_SUCCESS(Request->Status)) + + /* If we already have one, then don't create a new one... */ + if (!Request->Data.AllocConsoleRequest.Console) { - HeapFree(Win32CsrApiHeap, 0, Console); - return Request->Status; + /* Allocate a console structure */ + Console = HeapAlloc(Win32CsrApiHeap, 0, sizeof(CSRSS_CONSOLE)); + if (NULL == Console) + { + DPRINT1("Not enough memory for console\n"); + Request->Status = STATUS_NO_MEMORY; + return STATUS_NO_MEMORY; + } + + /* Initialize the Console */ + Request->Status = CsrInitConsole(Console); + if (!NT_SUCCESS(Request->Status)) + { + DPRINT1("Console init failed\n"); + HeapFree(Win32CsrApiHeap, 0, Console); + return Request->Status; + } } - ProcessData->Console = Console; - Request->Data.AllocConsoleRequest.Console = Console; + else + { + /* Reuse our current console */ + Console = Request->Data.AllocConsoleRequest.Console; + } - /* add a reference count because the process is tied to the console */ - Console->Header.ReferenceCount++; - Status = Win32CsrInsertObject(ProcessData, &Request->Data.AllocConsoleRequest.InputHandle, &Console->Header); - if (! NT_SUCCESS(Status)) + /* Set the Process Console */ + ProcessData->Console = Console; + + /* Return it to the caller */ + Request->Data.AllocConsoleRequest.Console = Console; + + /* Add a reference count because the process is tied to the console */ + Console->Header.ReferenceCount++; + + /* Insert the Objects */ + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, + &Console->Header); + if (! NT_SUCCESS(Status)) { - ConioDeleteConsole((Object_t *) Console); - ProcessData->Console = 0; - return Request->Status = Status; + DPRINT1("Failed to insert object\n"); + ConioDeleteConsole((Object_t *) Console); + ProcessData->Console = 0; + return Request->Status = Status; } - Status = Win32CsrInsertObject(ProcessData, &Request->Data.AllocConsoleRequest.OutputHandle, &Console->ActiveBuffer->Header); - if (!NT_SUCCESS(Status)) + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, + &Console->ActiveBuffer->Header); + if (!NT_SUCCESS(Status)) { - Console->Header.ReferenceCount--; - Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); - ProcessData->Console = 0; - return Request->Status = Status; + DPRINT1("Failed to insert object\n"); + Console->Header.ReferenceCount--; + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.InputHandle); + ProcessData->Console = 0; + return Request->Status = Status; } - if (! DuplicateHandle(GetCurrentProcess(), ProcessData->Console->ActiveEvent, - ProcessData->Process, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, FALSE, 0)) + /* Duplicate the Event */ + if (!DuplicateHandle(GetCurrentProcess(), + ProcessData->Console->ActiveEvent, + ProcessData->Process, + &ProcessData->ConsoleEvent, + EVENT_ALL_ACCESS, + FALSE, + 0)) { - DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); - Console->Header.ReferenceCount--; - Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.OutputHandle); - Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); - ProcessData->Console = 0; - Request->Status = Status; - return Status; + DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); + Console->Header.ReferenceCount--; + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.OutputHandle); + Win32CsrReleaseObject(ProcessData, + Request->Data.AllocConsoleRequest.InputHandle); + ProcessData->Console = 0; + Request->Status = Status; + return Status; } - ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; - DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); - return STATUS_SUCCESS; + /* Set the Ctrl Dispatcher */ + ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; + DPRINT1("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); + + /* Insert into the list */ + InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); + return STATUS_SUCCESS; } CSR_API(CsrFreeConsole) _____ Modified: trunk/reactos/subsys/system/dhcp/include/debug.h --- trunk/reactos/subsys/system/dhcp/include/debug.h 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/subsys/system/dhcp/include/debug.h 2005-07-28 04:12:43 UTC (rev 16826) @@ -42,43 +42,12 @@ #endif /* _MSC_VER */ -#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) - #else /* DBG */ #define DH_DbgPrint(_t_, _x_) #endif /* DBG */ - -#define assert(x) ASSERT(x) -#define assert_irql(x) ASSERT_IRQL(x) - - -#ifdef _MSC_VER - -#define UNIMPLEMENTED \ - TI_DbgPrint(MIN_TRACE, ("The function at %s:%d is unimplemented, \ - but come back another day.\n", __FILE__, __LINE__)); - -#else /* _MSC_VER */ - -#define UNIMPLEMENTED \ - TI_DbgPrint(MIN_TRACE, ("(%s:%d)(%s) is unimplemented, \ - but come back another day.\n", __FILE__, __LINE__, __FUNCTION__)); - -#endif /* _MSC_VER */ - - -#define CHECKPOINT \ - do { TI_DbgPrint(DEBUG_CHECK, ("(%s:%d)\n", __FILE__, __LINE__)); } while(0); - -#define CP CHECKPOINT - -#define ASSERT_KM_POINTER(_x) \ - ASSERT(((PVOID)_x) != (PVOID)0xcccccccc); \ - ASSERT(((PVOID)_x) >= (PVOID)0x80000000); - #endif /* __DEBUG_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/system/dhcp/util.c --- trunk/reactos/subsys/system/dhcp/util.c 2005-07-28 03:10:35 UTC (rev 16825) +++ trunk/reactos/subsys/system/dhcp/util.c 2005-07-28 04:12:43 UTC (rev 16826) @@ -1,4 +1,5 @@ #include <stdarg.h> +#include <reactos/debug.h> #include "rosdhcp.h" char *piaddr( struct iaddr addr ) { @@ -15,7 +16,7 @@ ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); - DbgPrint("NOTE: %s\n", buf); + DPRINT("NOTE: %s\n", buf); return ret; } @@ -28,7 +29,7 @@ ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); - DbgPrint("DEBUG: %s\n", buf); + DPRINT("DEBUG: %s\n", buf); return ret; } @@ -41,7 +42,7 @@ ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); - DbgPrint("WARN: %s\n", buf); + DPRINT("WARN: %s\n", buf); return ret; } @@ -54,7 +55,7 @@ ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); - DbgPrint("WARNING: %s\n", buf); + DPRINT("WARNING: %s\n", buf); return ret; } @@ -66,7 +67,7 @@ vsnprintf( buf, sizeof(buf), format, arg_begin ); - DbgPrint("ERROR: %s\n", buf); + DPRINT1("ERROR: %s\n", buf); } int16_t getShort( unsigned char *data ) {

19 years, 6 months

[sedwards] 16825: fixed building dosfsck

by sedwards＠svn.reactos.com

fixed building dosfsck Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c Deleted: trunk/rosapps/sysutils/dosfsck/generic.h Deleted: trunk/rosapps/sysutils/dosfsck/little_endian.h Deleted: trunk/rosapps/sysutils/dosfsck/types.h.bak _____ Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c --- trunk/rosapps/sysutils/dosfsck/dosfsck.c 2005-07-28 02:37:42 UTC (rev 16824) +++ trunk/rosapps/sysutils/dosfsck/dosfsck.c 2005-07-28 03:10:35 UTC (rev 16825) @@ -6,7 +6,7 @@ * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include "../version.h" +#include "version.h" #include <stdio.h> #include <stdlib.h> _____ Deleted: trunk/rosapps/sysutils/dosfsck/generic.h --- trunk/rosapps/sysutils/dosfsck/generic.h 2005-07-28 02:37:42 UTC (rev 16824) +++ trunk/rosapps/sysutils/dosfsck/generic.h 2005-07-28 03:10:35 UTC (rev 16825) @@ -1,172 +0,0 @@ -#ifndef _LINUX_BYTEORDER_GENERIC_H -#define _LINUX_BYTEORDER_GENERIC_H - -/* - * linux/byteorder_generic.h - * Generic Byte-reordering support - * - * Francois-Rene Rideau <fare(a)tunes.org> 19970707 - * gathered all the good ideas from all asm-foo/byteorder.h into one file, - * cleaned them up. - * I hope it is compliant with non-GCC compilers. - * I decided to put __BYTEORDER_HAS_U64__ in byteorder.h, - * because I wasn't sure it would be ok to put it in types.h - * Upgraded it to 2.1.43 - * Francois-Rene Rideau <fare(a)tunes.org> 19971012 - * Upgraded it to 2.1.57 - * to please Linus T., replaced huge #ifdef's between little/big endian - * by nestedly #include'd files. - * Francois-Rene Rideau <fare(a)tunes.org> 19971205 - * Made it to 2.1.71; now a facelift: - * Put files under include/linux/byteorder/ - * Split swab from generic support. - * - * TODO: - * = Regular kernel maintainers could also replace all these manual - * byteswap macros that remain, disseminated among drivers, - * after some grep or the sources... - * = Linus might want to rename all these macros and files to fit his taste, - * to fit his personal naming scheme. - * = it seems that a few drivers would also appreciate - * nybble swapping support... - * = every architecture could add their byteswap macro in asm/byteorder.h - * see how some architectures already do (i386, alpha, ppc, etc) - * = cpu_to_beXX and beXX_to_cpu might some day need to be well - * distinguished throughout the kernel. This is not the case currently, - * since little endian, big endian, and pdp endian machines needn't it. - * But this might be the case for, say, a port of Linux to 20/21 bit - * architectures (and F21 Linux addict around?). - */ - -/* - * The following macros are to be defined by <asm/byteorder.h>: - * - * Conversion of long and short int between network and host format - * ntohl(__u32 x) - * ntohs(__u16 x) - * htonl(__u32 x) - * htons(__u16 x) - * It seems that some programs (which? where? or perhaps a standard? POSIX?) - * might like the above to be functions, not macros (why?). - * if that's true, then detect them, and take measures. - * Anyway, the measure is: define only ___ntohl as a macro instead, - * and in a separate file, have - * unsigned long inline ntohl(x){return ___ntohl(x);} - * - * The same for constant arguments - * __constant_ntohl(__u32 x) - * __constant_ntohs(__u16 x) - * __constant_htonl(__u32 x) - * __constant_htons(__u16 x) - * - * Conversion of XX-bit integers (16- 32- or 64-) - * between native CPU format and little/big endian format - * 64-bit stuff only defined for proper architectures - * cpu_to_[bl]eXX(__uXX x) - * [bl]eXX_to_cpu(__uXX x) - * - * The same, but takes a pointer to the value to convert - * cpu_to_[bl]eXXp(__uXX x) - * [bl]eXX_to_cpup(__uXX x) - * - * The same, but change in situ - * cpu_to_[bl]eXXs(__uXX x) - * [bl]eXX_to_cpus(__uXX x) - * - * See asm-foo/byteorder.h for examples of how to provide - * architecture-optimized versions - * - */ - - -#if defined(__KERNEL__) -/* - * inside the kernel, we can use nicknames; - * outside of it, we must avoid POSIX namespace pollution... - */ -#define cpu_to_le64 __cpu_to_le64 -#define le64_to_cpu __le64_to_cpu -#define cpu_to_le32 __cpu_to_le32 -#define le32_to_cpu __le32_to_cpu -#define cpu_to_le16 __cpu_to_le16 -#define le16_to_cpu __le16_to_cpu -#define cpu_to_be64 __cpu_to_be64 -#define be64_to_cpu __be64_to_cpu -#define cpu_to_be32 __cpu_to_be32 -#define be32_to_cpu __be32_to_cpu -#define cpu_to_be16 __cpu_to_be16 -#define be16_to_cpu __be16_to_cpu -#define cpu_to_le64p __cpu_to_le64p -#define le64_to_cpup __le64_to_cpup -#define cpu_to_le32p __cpu_to_le32p -#define le32_to_cpup __le32_to_cpup -#define cpu_to_le16p __cpu_to_le16p -#define le16_to_cpup __le16_to_cpup -#define cpu_to_be64p __cpu_to_be64p -#define be64_to_cpup __be64_to_cpup -#define cpu_to_be32p __cpu_to_be32p -#define be32_to_cpup __be32_to_cpup -#define cpu_to_be16p __cpu_to_be16p -#define be16_to_cpup __be16_to_cpup -#define cpu_to_le64s __cpu_to_le64s -#define le64_to_cpus __le64_to_cpus -#define cpu_to_le32s __cpu_to_le32s -#define le32_to_cpus __le32_to_cpus -#define cpu_to_le16s __cpu_to_le16s -#define le16_to_cpus __le16_to_cpus -#define cpu_to_be64s __cpu_to_be64s -#define be64_to_cpus __be64_to_cpus -#define cpu_to_be32s __cpu_to_be32s -#define be32_to_cpus __be32_to_cpus -#define cpu_to_be16s __cpu_to_be16s -#define be16_to_cpus __be16_to_cpus -#endif - - -#if defined(__KERNEL__) -/* - * Handle ntohl and suches. These have various compatibility - * issues - like we want to give the prototype even though we - * also have a macro for them in case some strange program - * wants to take the address of the thing or something.. - * - * Note that these used to return a "long" in libc5, even though - * long is often 64-bit these days.. Thus the casts. - * - * They have to be macros in order to do the constant folding - * correctly - if the argument passed into a inline function - * it is no longer constant according to gcc.. - */ - -#undef ntohl -#undef ntohs -#undef htonl -#undef htons - -/* - * Do the prototypes. Somebody might want to take the - * address or some such sick thing.. - */ -extern __u32 ntohl(__be32); -extern __be32 htonl(__u32); -extern __u16 ntohs(__be16); -extern __be16 htons(__u16); - -#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) - -#define ___htonl(x) __cpu_to_be32(x) -#define ___htons(x) __cpu_to_be16(x) -#define ___ntohl(x) __be32_to_cpu(x) -#define ___ntohs(x) __be16_to_cpu(x) - -#define htonl(x) ___htonl(x) -#define ntohl(x) ___ntohl(x) -#define htons(x) ___htons(x) -#define ntohs(x) ___ntohs(x) - -#endif /* OPTIMIZE */ - -#endif /* KERNEL */ - - -#endif /* _LINUX_BYTEORDER_GENERIC_H */ _____ Deleted: trunk/rosapps/sysutils/dosfsck/little_endian.h --- trunk/rosapps/sysutils/dosfsck/little_endian.h 2005-07-28 02:37:42 UTC (rev 16824) +++ trunk/rosapps/sysutils/dosfsck/little_endian.h 2005-07-28 03:10:35 UTC (rev 16825) @@ -1,106 +0,0 @@ -#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H -#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H - -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN 1234 -#endif -#ifndef __LITTLE_ENDIAN_BITFIELD -#define __LITTLE_ENDIAN_BITFIELD -#endif - -#include "types.h" -#include "swab.h" - -#define __constant_htonl(x) ((__force __be32)___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x)) -#define __constant_htons(x) ((__force __be16)___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x)) -#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x)) -#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x)) -#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x)) -#define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __cpu_to_be64(x) ((__force __be64)__swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x)) -#define __cpu_to_be32(x) ((__force __be32)__swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x)) -#define __cpu_to_be16(x) ((__force __be16)__swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x)) - -static inline __le64 __cpu_to_le64p(const __u64 *p) -{ - return (__force __le64)*p; -} -static inline __u64 __le64_to_cpup(const __le64 *p) -{ - return (__force __u64)*p; -} -static inline __le32 __cpu_to_le32p(const __u32 *p) -{ - return (__force __le32)*p; -} -static inline __u32 __le32_to_cpup(const __le32 *p) -{ - return (__force __u32)*p; -} -static inline __le16 __cpu_to_le16p(const __u16 *p) -{ - return (__force __le16)*p; -} -static inline __u16 __le16_to_cpup(const __le16 *p) -{ - return (__force __u16)*p; -} -static inline __be64 __cpu_to_be64p(const __u64 *p) -{ - return (__force __be64)__swab64p(p); -} -static inline __u64 __be64_to_cpup(const __be64 *p) -{ - return __swab64p((__u64 *)p); -} -static inline __be32 __cpu_to_be32p(const __u32 *p) -{ - return (__force __be32)__swab32p(p); -} -static inline __u32 __be32_to_cpup(const __be32 *p) -{ - return __swab32p((__u32 *)p); -} -static inline __be16 __cpu_to_be16p(const __u16 *p) -{ - return (__force __be16)__swab16p(p); -} -static inline __u16 __be16_to_cpup(const __be16 *p) -{ - return __swab16p((__u16 *)p); -} -#define __cpu_to_le64s(x) do {} while (0) -#define __le64_to_cpus(x) do {} while (0) -#define __cpu_to_le32s(x) do {} while (0) -#define __le32_to_cpus(x) do {} while (0) -#define __cpu_to_le16s(x) do {} while (0) -#define __le16_to_cpus(x) do {} while (0) -#define __cpu_to_be64s(x) __swab64s((x)) -#define __be64_to_cpus(x) __swab64s((x)) -#define __cpu_to_be32s(x) __swab32s((x)) -#define __be32_to_cpus(x) __swab32s((x)) -#define __cpu_to_be16s(x) __swab16s((x)) -#define __be16_to_cpus(x) __swab16s((x)) - -#include "generic.h" - -#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ _____ Deleted: trunk/rosapps/sysutils/dosfsck/types.h.bak --- trunk/rosapps/sysutils/dosfsck/types.h.bak 2005-07-28 02:37:42 UTC (rev 16824) +++ trunk/rosapps/sysutils/dosfsck/types.h.bak 2005-07-28 03:10:35 UTC (rev 16825) @@ -1,72 +0,0 @@ -#ifndef _I386_TYPES_H -#define _I386_TYPES_H - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -/* - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the - * header files exported to user space - */ - -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif - -#endif /* __ASSEMBLY__ */ - -/* - * These aren't exported outside the kernel to avoid name space clashes - */ -#ifdef __KERNEL__ - -#define BITS_PER_LONG 32 - -#ifndef __ASSEMBLY__ - -#include <linux/config.h> - -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long long s64; -typedef unsigned long long u64; - -/* DMA addresses come in generic and 64-bit flavours. */ - -#ifdef CONFIG_HIGHMEM64G -typedef u64 dma_addr_t; -#else -typedef u32 dma_addr_t; -#endif -typedef u64 dma64_addr_t; - -#ifdef CONFIG_LBD -typedef u64 sector_t; -#define HAVE_SECTOR_T -#endif - -typedef unsigned short kmem_bufctl_t; - -#endif /* __ASSEMBLY__ */ - -#endif /* __KERNEL__ */ - -#endif

19 years, 6 months

[sedwards] 16824: added port of dosfsck. Does not work yet as I cannot figure how to open the device. Win32 file access code is included ported from mkdosfs.c

by sedwards＠svn.reactos.com

added port of dosfsck. Does not work yet as I cannot figure how to open the device. Win32 file access code is included ported from mkdosfs.c Added: trunk/rosapps/sysutils/dosfsck/ Added: trunk/rosapps/sysutils/dosfsck/.cvsignore Added: trunk/rosapps/sysutils/dosfsck/CHANGES Added: trunk/rosapps/sysutils/dosfsck/COPYING Added: trunk/rosapps/sysutils/dosfsck/Makefile Added: trunk/rosapps/sysutils/dosfsck/README Added: trunk/rosapps/sysutils/dosfsck/boot.c Added: trunk/rosapps/sysutils/dosfsck/boot.h Added: trunk/rosapps/sysutils/dosfsck/byteorder.h Added: trunk/rosapps/sysutils/dosfsck/byteswap.h Added: trunk/rosapps/sysutils/dosfsck/byteswap1.h Added: trunk/rosapps/sysutils/dosfsck/check.c Added: trunk/rosapps/sysutils/dosfsck/check.h Added: trunk/rosapps/sysutils/dosfsck/common.c Added: trunk/rosapps/sysutils/dosfsck/common.h Added: trunk/rosapps/sysutils/dosfsck/compiler.h Added: trunk/rosapps/sysutils/dosfsck/dosfsck.8 Added: trunk/rosapps/sysutils/dosfsck/dosfsck.c Added: trunk/rosapps/sysutils/dosfsck/dosfsck.h Added: trunk/rosapps/sysutils/dosfsck/fat.c Added: trunk/rosapps/sysutils/dosfsck/fat.h Added: trunk/rosapps/sysutils/dosfsck/file.c Added: trunk/rosapps/sysutils/dosfsck/file.h Added: trunk/rosapps/sysutils/dosfsck/generic.h Added: trunk/rosapps/sysutils/dosfsck/io.c Added: trunk/rosapps/sysutils/dosfsck/io.h Added: trunk/rosapps/sysutils/dosfsck/lfn.c Added: trunk/rosapps/sysutils/dosfsck/lfn.h Added: trunk/rosapps/sysutils/dosfsck/little_endian.h Added: trunk/rosapps/sysutils/dosfsck/mkdosfs.c Added: trunk/rosapps/sysutils/dosfsck/msdos_fs.h Added: trunk/rosapps/sysutils/dosfsck/swab.h Added: trunk/rosapps/sysutils/dosfsck/types.h.bak Added: trunk/rosapps/sysutils/dosfsck/version.h Added: trunk/rosapps/sysutils/dosfsck/vfat.h _____ Added: trunk/rosapps/sysutils/dosfsck/.cvsignore --- trunk/rosapps/sysutils/dosfsck/.cvsignore 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/.cvsignore 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1 @@ +dosfsck _____ Added: trunk/rosapps/sysutils/dosfsck/CHANGES --- trunk/rosapps/sysutils/dosfsck/CHANGES 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/CHANGES 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,10 @@ +Changes from version 0 to 1 +=========================== + + - fixed an off-by-two error in check.c:check_file + - fixed marking clusters bad in fat.c:set_fat + - fat.c:reclaim_free was also reclaiming bad clusters. + - fixed many incorrect byte sex conversions in check.c and fat.c + - -t and -w now require -a or -r + - added option -d to drop files. + - added option -u to try to "undelete" non-directory files. _____ Added: trunk/rosapps/sysutils/dosfsck/COPYING --- trunk/rosapps/sysutils/dosfsck/COPYING 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/COPYING 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,345 @@ +The license below applies to dosfsck, which is copyrighted by +Werner Almesberger <almesber(a)lrc.di.epfl.ch> and Roman Hodek +<Roman.Hodek(a)informatik.uni-erlangen.de>. + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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 in 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. _____ Added: trunk/rosapps/sysutils/dosfsck/Makefile --- trunk/rosapps/sysutils/dosfsck/Makefile 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/Makefile 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,44 @@ +CC=mingw32-gcc +OBJECTS = boot.o check.o common.o dosfsck.o fat.o file.o io.o lfn.o + +all: dosfsck.exe + +dosfsck.exe: $(OBJECTS) + $(CC) -o $@ $(LDFLAGS) $^ + +.c.o: + $(CC) -c $(CFLAGS) $*.c + +install: dosfsck + mkdir -p $(SBINDIR) $(MANDIR) + install -m 755 dosfsck $(SBINDIR) + install -m 644 dosfsck.8 $(MANDIR) + rm -f $(SBINDIR)/fsck.msdos + rm -f $(SBINDIR)/fsck.vfat + ln -s dosfsck $(SBINDIR)/fsck.msdos + ln -s dosfsck $(SBINDIR)/fsck.vfat + rm -f $(MANDIR)/fsck.msdos.8 + ln -s dosfsck.8 $(MANDIR)/fsck.msdos.8 + ln -s dosfsck.8 $(MANDIR)/fsck.vfat.8 + +clean: + rm -f *.o *.s *.i *~ \#*# tmp_make .#* .new* + +distclean: clean + rm -f *.a dosfsck + +dep: + sed '/\#\#\# Dependencies/q' <Makefile >tmp_make + $(CPP) $(CFLAGS) -MM *.c >>tmp_make + mv tmp_make Makefile + +### Dependencies +boot.o: boot.c common.h dosfsck.h io.h boot.h +check.o: check.c common.h dosfsck.h io.h fat.h file.h lfn.h check.h +common.o: common.c common.h +dosfsck.o: dosfsck.c common.h dosfsck.h io.h boot.h fat.h file.h \ + check.h +fat.o: fat.c common.h dosfsck.h io.h check.h fat.h +file.o: file.c common.h file.h +io.o: io.c dosfsck.h common.h io.h +lfn.o: lfn.c common.h io.h dosfsck.h lfn.h file.h _____ Added: trunk/rosapps/sysutils/dosfsck/README --- trunk/rosapps/sysutils/dosfsck/README 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/README 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,60 @@ +dosfsck, version 1 +================== + +WARNING: This is ALPHA test software. Use at your own risk. + +dosfsck is the Linux equivalent of PC/MS-DOS' CHKDSK. It checks the +consistency of PC/MS-DOS file systems and optionally tries to repair +them. The tests dosfsck performs are described in the man page. + +dosfsck needs header files from dosfs.9 (or later) to compile. + +Before using dosfsck to repair a file system that contains data of any +value, you should verify that dosfsck is able to correct all reported +errors. (Except fatal errors and those reported as unfixable, of +course.) In order to do this, run it with the -V option, e.g. + + dosfsck -V /dev/sda1 (automatic check) +or dosfsck -V -r /dev/sda1 (interactive check and repair) + +dosfsck will perform two passes: in the first pass, inconsistencies are +detected and a list of changes to correct the problems is generated. In +the second pass, those changes are applied whenever dosfsck reads data +from disk. Hence no fixable errors should be reported in the second +pass if the first pass was successful. + +Please notify the author if fixable errors are reported in the second +pass. + +After verifying that dosfsck appears to be able to perform the desired +operations, either confirm that you want the changes to be performed +(if dosfsck was started with -r) or re-run dosfsck with the -a option +(if it was started without -r). + +Please send bug reports, comments, flames, etc. to +almesber(a)nessie.cs.id.ethz.ch or almesber(a)bernina.ethz.ch + +- Werner + +FAT32 and LFN support +===================== + +I've finally implemented some of the new features of MS-DOS +filesystems: FAT32 and long filenames. + +FAT32 is automatically detected and of course the different FAT +structure is handled. (Internally many changes were needed, so 32 bit +variables for all cluster numbers and 64 bit vars for offsets inside +the filesystem.) New checks for FAT32 are most notably on the backup +boot sector and the new info sector. Also the possibility that the +root directory resides in a cluster chain (instead of in a static +area) on FAT32 is handled. + +dosfscheck also knows about VFAT long filenames now. It parses those +names and uses them in listings etc. when available. There are also +some checks on the (cruel) structure of how LFNs are stored and some +attempts to fix problems. + +- Roman <roman(a)hodek.net> + +BTW, version 2 isn't ALPHA anymore :-) _____ Added: trunk/rosapps/sysutils/dosfsck/boot.c --- trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/boot.c 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,370 @@ +/* boot.c - Read and analyze ia PC/MS-DOS boot sector */ + +/* Written 1993 by Werner Almesberger */ + +/* FAT32, VFAT, Atari format support, and various fixes additions May 1998 + * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ + +#include <stdio.h> +#include <string.h> +#include <sys/types.h> + +#include "common.h" +#include "dosfsck.h" +#include "io.h" +#include "boot.h" + + +#define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) + /* don't divide by zero */ + +static struct { + __u8 media; + char *descr; +} mediabytes[] = { + { 0xf0, "5.25\" or 3.5\" HD floppy" }, + { 0xf8, "hard disk" }, + { 0xf9, "3,5\" 720k floppy 2s/80tr/9sec or " + "5.25\" 1.2M floppy 2s/80tr/15sec" }, + { 0xfa, "5.25\" 320k floppy 1s/80tr/8sec" }, + { 0xfb, "3.5\" 640k floppy 2s/80tr/8sec" }, + { 0xfc, "5.25\" 180k floppy 1s/40tr/9sec" }, + { 0xfd, "5.25\" 360k floppy 2s/40tr/9sec" }, + { 0xfe, "5.25\" 160k floppy 1s/40tr/8sec" }, + { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, +}; + +#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ +/* Unaligned fields must first be copied byte-wise */ +#define GET_UNALIGNED_W(f) \ + ({ \ + unsigned short __v; \ + memcpy( &__v, &f, sizeof(__v) ); \ + CF_LE_W( *(unsigned short *)&f ); \ + }) +#else +#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) +#endif + + +static char *get_media_descr( unsigned char media ) +{ + int i; + + for( i = 0; i < sizeof(mediabytes)/sizeof(*mediabytes); ++i ) { + if (mediabytes[i].media == media) + return( mediabytes[i].descr ); + } + return( "undefined" ); +} + +static void dump_boot(DOS_FS *fs,struct boot_sector *b,unsigned lss) +{ + unsigned short sectors; + + printf("Boot sector contents:\n"); + if (!atari_format) { + char id[9]; + strncpy(id,b->system_id,8); + id[8] = 0; + printf("System ID \"%s\"\n",id); + } + else { + /* On Atari, a 24 bit serial number is stored at offset 8 of the boot + * sector */ + printf("Serial number 0x%x\n", + b->system_id[5] | (b->system_id[6]<<8) | (b->system_id[7]<<16)); + } + printf("Media byte 0x%02x (%s)\n",b->media,get_media_descr(b->media)); + printf("%10d bytes per logical sector\n",GET_UNALIGNED_W(b->sector_size)); + printf("%10d bytes per cluster\n",fs->cluster_size); + printf("%10d reserved sector%s\n",CF_LE_W(b->reserved), + CF_LE_W(b->reserved) == 1 ? "" : "s"); + printf("First FAT starts at byte %llu (sector %llu)\n", + (unsigned long long)fs->fat_start, + (unsigned long long)fs->fat_start/lss); + printf("%10d FATs, %d bit entries\n",b->fats,fs->fat_bits); + printf("%10d bytes per FAT (= %u sectors)\n",fs->fat_size, + fs->fat_size/lss); + if (!fs->root_cluster) { + printf("Root directory starts at byte %llu (sector %llu)\n", + (unsigned long long)fs->root_start, + (unsigned long long)fs->root_start/lss); + printf("%10d root directory entries\n",fs->root_entries); + } + else { + printf( "Root directory start at cluster %lu (arbitrary size)\n", + fs->root_cluster); + } + printf("Data area starts at byte %llu (sector %llu)\n", + (unsigned long long)fs->data_start, + (unsigned long long)fs->data_start/lss); + printf("%10lu data clusters (%llu bytes)\n",fs->clusters, + (unsigned long long)fs->clusters*fs->cluster_size); + printf("%u sectors/track, %u heads\n",CF_LE_W(b->secs_track), + CF_LE_W(b->heads)); + printf("%10u hidden sectors\n", + atari_format ? + /* On Atari, the hidden field is only 16 bit wide and unused */ + (((unsigned char *)&b->hidden)[0] | + ((unsigned char *)&b->hidden)[1] << 8) : + CF_LE_L(b->hidden)); + sectors = GET_UNALIGNED_W( b->sectors ); + printf("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect)); +} + +static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss) +{ + struct boot_sector b2; + + if (!fs->backupboot_start) { + printf( "There is no backup boot sector.\n" ); + if (CF_LE_W(b->reserved) < 3) { + printf( "And there is no space for creating one!\n" ); + return; + } + if (interactive) + printf( "1) Create one\n2) Do without a backup\n" ); + else printf( " Auto-creating backup boot block.\n" ); + if (!interactive || get_key("12","?") == '1') { + int bbs; + /* The usual place for the backup boot sector is sector 6. Choose + * that or the last reserved sector. */ + if (CF_LE_W(b->reserved) >= 7 && CF_LE_W(b->info_sector) != 6) + bbs = 6; + else { + bbs = CF_LE_W(b->reserved) - 1; + if (bbs == CF_LE_W(b->info_sector)) + --bbs; /* this is never 0, as we checked reserved >= 3! */ + } + fs->backupboot_start = bbs*lss; + b->backup_boot = CT_LE_W(bbs); + fs_write(fs->backupboot_start,sizeof(*b),b); + fs_write((off_t)offsetof(struct boot_sector,backup_boot), + sizeof(b->backup_boot),&b->backup_boot); + printf( "Created backup of boot sector in sector %d\n", bbs ); + return; + } + else return; + } + + fs_read(fs->backupboot_start,sizeof(b2),&b2); + if (memcmp(b,&b2,sizeof(b2)) != 0) { + /* there are any differences */ + __u8 *p, *q; + int i, pos, first = 1; + char buf[20]; + + printf( "There are differences between boot sector and its backup.\n" ); + printf( "Differences: (offset:original/backup)\n " ); + pos = 2; + for( p = (__u8 *)b, q = (__u8 *)&b2, i = 0; i < sizeof(b2); + ++p, ++q, ++i ) { + if (*p != *q) { + sprintf( buf, "%s%u:%02x/%02x", first ? "" : ", ", + (unsigned)(p-(__u8 *)b), *p, *q ); + if (pos + strlen(buf) > 78) printf( "\n " ), pos = 2; + printf( "%s", buf ); + pos += strlen(buf); + first = 0; + } + } + printf( "\n" ); + + if (interactive) + printf( "1) Copy original to backup\n" + "2) Copy backup to original\n" + "3) No action\n" ); + else printf( " Not automatically fixing this.\n" ); + switch (interactive ? get_key("123","?") : '3') { + case '1': + fs_write(fs->backupboot_start,sizeof(*b),b); + break; + case '2': + fs_write(0,sizeof(b2),&b2); + break; + default: + break; + } + } +} + +static void init_fsinfo(struct info_sector *i) +{ + i->magic = CT_LE_L(0x41615252); + i->signature = CT_LE_L(0x61417272); + i->free_clusters = CT_LE_L(-1); + i->next_cluster = CT_LE_L(2); + i->boot_sign = CT_LE_W(0xaa55); +} + +static void read_fsinfo(DOS_FS *fs, struct boot_sector *b,int lss) +{ + struct info_sector i; + + if (!b->info_sector) { + printf( "No FSINFO sector\n" ); + if (interactive) + printf( "1) Create one\n2) Do without FSINFO\n" ); + else printf( " Not automatically creating it.\n" ); + if (interactive && get_key("12","?") == '1') { + /* search for a free reserved sector (not boot sector and not + * backup boot sector) */ + __u32 s; + for( s = 1; s < CF_LE_W(b->reserved); ++s ) + if (s != CF_LE_W(b->backup_boot)) break; + if (s > 0 && s < CF_LE_W(b->reserved)) { + init_fsinfo(&i); + fs_write((off_t)s*lss,sizeof(i),&i); + b->info_sector = CT_LE_W(s); + fs_write((off_t)offsetof(struct boot_sector,info_sector), + sizeof(b->info_sector),&b->info_sector); + if (fs->backupboot_start) + fs_write(fs->backupboot_start+ + offsetof(struct boot_sector,info_sector), + sizeof(b->info_sector),&b->info_sector); + } + else { + printf( "No free reserved sector found -- " + "no space for FSINFO sector!\n" ); + return; + } + } + else return; + } + + fs->fsinfo_start = CF_LE_W(b->info_sector)*lss; + fs_read(fs->fsinfo_start,sizeof(i),&i); + + if (i.magic != CT_LE_L(0x41615252) || + i.signature != CT_LE_L(0x61417272) || + i.boot_sign != CT_LE_W(0xaa55)) { + printf( "FSINFO sector has bad magic number(s):\n" ); + if (i.magic != CT_LE_L(0x41615252)) + printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + (unsigned long long)offsetof(struct info_sector,magic), + CF_LE_L(i.magic),0x41615252); + if (i.signature != CT_LE_L(0x61417272)) + printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + (unsigned long long)offsetof(struct info_sector,signature), + CF_LE_L(i.signature),0x61417272); + if (i.boot_sign != CT_LE_W(0xaa55)) + printf( " Offset %llu: 0x%04x != expected 0x%04x\n", + (unsigned long long)offsetof(struct info_sector,boot_sign), + CF_LE_W(i.boot_sign),0xaa55); + if (interactive) + printf( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); + else printf( " Auto-correcting it.\n" ); + if (!interactive || get_key("12","?") == '1') { + init_fsinfo(&i); + fs_write(fs->fsinfo_start,sizeof(i),&i); + } + else fs->fsinfo_start = 0; + } + + if (fs->fsinfo_start) + fs->free_clusters = CF_LE_L(i.free_clusters); +} + +void read_boot(DOS_FS *fs) +{ + struct boot_sector b; + unsigned total_sectors; + unsigned short logical_sector_size, sectors; + unsigned fat_length; + off_t data_size; + + fs_read(0,sizeof(b),&b); + logical_sector_size = GET_UNALIGNED_W(b.sector_size); + if (!logical_sector_size) die("Logical sector size is zero."); + fs->cluster_size = b.cluster_size*logical_sector_size; + if (!fs->cluster_size) die("Cluster size is zero."); + if (b.fats != 2 && b.fats != 1) + die("Currently, only 1 or 2 FATs are supported, not %d.\n",b.fats); + fs->nfats = b.fats; + sectors = GET_UNALIGNED_W(b.sectors); + total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); + if (verbose) printf("Checking we can access the last sector of the filesystem\n"); + /* Can't access last odd sector anyway, so round down */ + fs_test((off_t)((total_sectors & ~1)-1)*(off_t)logical_sector_size, + logical_sector_size); + fat_length = CF_LE_W(b.fat_length) ? + CF_LE_W(b.fat_length) : CF_LE_L(b.fat32_length); + fs->fat_start = (off_t)CF_LE_W(b.reserved)*logical_sector_size; + fs->root_start = ((off_t)CF_LE_W(b.reserved)+b.fats*fat_length)* + logical_sector_size; + fs->root_entries = GET_UNALIGNED_W(b.dir_entries); + fs->data_start = fs->root_start+ROUND_TO_MULTIPLE(fs->root_entries << + MSDOS_DIR_BITS,logical_sector_size); + data_size = (off_t)total_sectors*logical_sector_size-fs->data_start; + fs->clusters = data_size/fs->cluster_size; + fs->root_cluster = 0; /* indicates standard, pre-FAT32 root dir */ + fs->fsinfo_start = 0; /* no FSINFO structure */ + fs->free_clusters = -1; /* unknown */ + if (!b.fat_length && b.fat32_length) { + fs->fat_bits = 32; + fs->root_cluster = CF_LE_L(b.root_cluster); + if (!fs->root_cluster && fs->root_entries) + /* M$ hasn't specified this, but it looks reasonable: If + * root_cluster is 0 but there is a separate root dir + * (root_entries != 0), we handle the root dir the old way. Give a + * warning, but convertig to a root dir in a cluster chain seems + * to complex for now... */ + printf( "Warning: FAT32 root dir not in cluster chain! " + "Compability mode...\n" ); + else if (!fs->root_cluster && !fs->root_entries) + die("No root directory!"); + else if (fs->root_cluster && fs->root_entries) + printf( "Warning: FAT32 root dir is in a cluster chain, but " + "a separate root dir\n" + " area is defined. Cannot fix this easily.\n" ); + + fs->backupboot_start = CF_LE_W(b.backup_boot)*logical_sector_size; + check_backup_boot(fs,&b,logical_sector_size); + + read_fsinfo(fs,&b,logical_sector_size); + } + else if (!atari_format) { + /* On real MS-DOS, a 16 bit FAT is used whenever there would be too + * much clusers otherwise. */ + fs->fat_bits = (fs->clusters > MSDOS_FAT12) ? 16 : 12; + } + else { + /* On Atari, things are more difficult: GEMDOS always uses 12bit FATs + * on floppies, and always 16 bit on harddisks. */ + fs->fat_bits = 16; /* assume 16 bit FAT for now */ + /* If more clusters than fat entries in 16-bit fat, we assume + * it's a real MSDOS FS with 12-bit fat. */ + if (fs->clusters+2 > fat_length*logical_sector_size*8/16 || + /* if it's a floppy disk --> 12bit fat */ + device_no == 2 || + /* if it's a ramdisk or loopback device and has one of the usual + * floppy sizes -> 12bit FAT */ + ((device_no == 1 || device_no == 7) && + (total_sectors == 720 || total_sectors == 1440 || + total_sectors == 2880))) + fs->fat_bits = 12; + } + /* On FAT32, the high 4 bits of a FAT entry are reserved */ + fs->eff_fat_bits = (fs->fat_bits == 32) ? 28 : fs->fat_bits; + fs->fat_size = fat_length*logical_sector_size; + if (fs->clusters > ((unsigned long long)fs->fat_size*8/fs->fat_bits)-2) + die("File system has %d clusters but only space for %d FAT entries.", + fs->clusters,((unsigned long long)fs->fat_size*8/fs->fat_bits)-2); + if (!fs->root_entries && !fs->root_cluster) + die("Root directory has zero size."); + if (fs->root_entries & (MSDOS_DPS-1)) + die("Root directory (%d entries) doesn't span an integral number of " + "sectors.",fs->root_entries); + if (logical_sector_size & (SECTOR_SIZE-1)) + die("Logical sector size (%d bytes) is not a multiple of the physical " + "sector size.",logical_sector_size); + /* ++roman: On Atari, these two fields are often left uninitialized */ + if (!atari_format && (!b.secs_track || !b.heads)) + die("Invalid disk format in boot sector."); + if (verbose) dump_boot(fs,&b,logical_sector_size); +} + +/* Local Variables: */ +/* tab-width: 8 */ +/* End: */ _____ Added: trunk/rosapps/sysutils/dosfsck/boot.h --- trunk/rosapps/sysutils/dosfsck/boot.h 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/boot.h 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,13 @@ +/* boot.h - Read and analyze ia PC/MS-DOS boot sector */ + +/* Written 1993 by Werner Almesberger */ + + +#ifndef _BOOT_H +#define _BOOT_H + +void read_boot(DOS_FS *fs); + +/* Reads the boot sector from the currently open device and initializes *FS */ + +#endif _____ Added: trunk/rosapps/sysutils/dosfsck/byteorder.h --- trunk/rosapps/sysutils/dosfsck/byteorder.h 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/byteorder.h 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,59 @@ +#ifndef _I386_BYTEORDER_H +#define _I386_BYTEORDER_H + +//#include "types.h" +#include "compiler.h" + +#ifdef __GNUC__ + +/* For avoiding bswap on i386 */ +//#ifdef __KERNEL__ +//#include <linux/config.h> +//#endif + +static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) +{ +#ifdef CONFIG_X86_BSWAP + __asm__("bswap %0" : "=r" (x) : "0" (x)); +#else + __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ + "rorl $16,%0\n\t" /* swap words */ + "xchgb %b0,%h0" /* swap higher bytes */ + :"=q" (x) + : "0" (x)); +#endif + return x; +} + +static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) +{ + union { + struct { __u32 a,b; } s; + __u64 u; + } v; + v.u = val; +#ifdef CONFIG_X86_BSWAP + asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + : "=r" (v.s.a), "=r" (v.s.b) + : "0" (v.s.a), "1" (v.s.b)); +#else + v.s.a = ___arch__swab32(v.s.a); + v.s.b = ___arch__swab32(v.s.b); + asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); +#endif + return v.u; +} + +/* Do not define swab16. Gcc is smart enough to recognize "C" version and + convert it into rotation or exhange. */ + +#define __arch__swab64(x) ___arch__swab64(x) +#define __arch__swab32(x) ___arch__swab32(x) + +#define __BYTEORDER_HAS_U64__ + +#endif /* __GNUC__ */ + +//#include "little_endian.h" + +#endif /* _I386_BYTEORDER_H */ _____ Added: trunk/rosapps/sysutils/dosfsck/byteswap.h --- trunk/rosapps/sysutils/dosfsck/byteswap.h 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/byteswap.h 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,40 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _BYTESWAP_H +#define _BYTESWAP_H 1 + +/* Get the machine specific, optimized definitions. */ +#include "byteswap1.h" + + +/* The following definitions must all be macros since otherwise some + of the possible optimizations are not possible. */ + +/* Return a value with all bytes in the 16 bit argument swapped. */ +#define bswap_16(x) __bswap_16 (x) + +/* Return a value with all bytes in the 32 bit argument swapped. */ +#define bswap_32(x) __bswap_32 (x) + +#if defined __GNUC__ && __GNUC__ >= 2 +/* Return a value with all bytes in the 64 bit argument swapped. */ +# define bswap_64(x) __bswap_64 (x) +#endif + +#endif /* byteswap.h */ _____ Added: trunk/rosapps/sysutils/dosfsck/byteswap1.h --- trunk/rosapps/sysutils/dosfsck/byteswap1.h 2005-07-27 23:11:38 UTC (rev 16823) +++ trunk/rosapps/sysutils/dosfsck/byteswap1.h 2005-07-28 02:37:42 UTC (rev 16824) @@ -0,0 +1,133 @@ +/* Macros to swap the order of bytes in integer values. + Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. [truncated at 1000 lines; 7350 more skipped]

19 years, 6 months

[weiden] 16823: implemented TreeResetNamedSecurityInfo and forward it to the MARTA provider

by weiden＠svn.reactos.com

implemented TreeResetNamedSecurityInfo and forward it to the MARTA provider Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.def Modified: trunk/reactos/lib/ntmarta/ntmarta.h Modified: trunk/reactos/w32api/include/accctrl.h _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 23:11:38 UTC (rev 16823) @@ -632,8 +632,8 @@ ;TraceEventInstance ;TraceMessage ;TraceMessageVa -;TreeResetNamedSecurityInfoA -;TreeResetNamedSecurityInfoW +TreeResetNamedSecurityInfoA@44 +TreeResetNamedSecurityInfoW@44 ;TrusteeAccessToObjectA ;TrusteeAccessToObjectW ;UninstallApplication _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-07-27 23:11:38 UTC (rev 16823) @@ -18,6 +18,13 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +#ifndef HAS_FN_PROGRESSW +#define FN_PROGRESSW FN_PROGRESS +#endif +#ifndef HAS_FN_PROGRESSA +#define FN_PROGRESSA FN_PROGRESS +#endif + /* Interface to ntmarta.dll **************************************************/ typedef struct _NTMARTA @@ -71,7 +78,17 @@ PULONG pcCountOfExplicitEntries, PEXPLICIT_ACCESS_W* pListOfExplicitEntries); - PVOID TreeResetNamedSecurityInfo; + DWORD (STDCALL *TreeResetNamedSecurityInfo)(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID pOwner, + PSID pGroup, + PACL pDacl, + PACL pSacl, + BOOL KeepExplicit, + FN_PROGRESSW fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, + PVOID Args); DWORD (STDCALL *GetInheritanceSource)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 23:11:38 UTC (rev 16823) @@ -609,7 +609,7 @@ ErrorCode = GetLastError(); - while (i != 0) + do { if (ListOfExplicitEntriesW[i].Trustee.TrusteeForm == TRUSTEE_IS_NAME && ListOfExplicitEntriesW[i].Trustee.ptstrName != NULL) @@ -618,10 +618,8 @@ 0, ListOfExplicitEntriesW[i].Trustee.ptstrName); } + } while (i-- != 0); - i--; - } - /* free the allocated array */ HeapFree(GetProcessHeap(), 0, _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 23:11:38 UTC (rev 16823) @@ -60,9 +60,7 @@ FindNtMartaProc(RewriteSetHandleRights); FindNtMartaProc(RewriteSetEntriesInAcl); FindNtMartaProc(RewriteGetExplicitEntriesFromAcl); -#if 0 FindNtMartaProc(TreeResetNamedSecurityInfo); -#endif FindNtMartaProc(GetInheritanceSource); FindNtMartaProc(FreeIndexArray); @@ -1840,4 +1838,99 @@ return TRUE; } + +/* + * @implemented + */ +DWORD STDCALL +TreeResetNamedSecurityInfoW(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID pOwner, + PSID pGroup, + PACL pDacl, + PACL pSacl, + BOOL KeepExplicit, + FN_PROGRESSW fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, + PVOID Args) +{ + DWORD ErrorCode; + + if (pObjectName != NULL) + { + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + switch (ObjectType) + { + case SE_FILE_OBJECT: + case SE_REGISTRY_KEY: + { + /* check the SecurityInfo flags for sanity (both, the protected + and unprotected dacl/sacl flag must not be passed together */ + if (((SecurityInfo & DACL_SECURITY_INFORMATION) && + (SecurityInfo & (PROTECTED_DACL_SECURITY_INFORMATION | UNPROTECTED_DACL_SECURITY_INFORMATION)) == + (PROTECTED_DACL_SECURITY_INFORMATION | UNPROTECTED_DACL_SECURITY_INFORMATION)) + + || + + ((SecurityInfo & SACL_SECURITY_INFORMATION) && + (SecurityInfo & (PROTECTED_SACL_SECURITY_INFORMATION | UNPROTECTED_SACL_SECURITY_INFORMATION)) == + (PROTECTED_SACL_SECURITY_INFORMATION | UNPROTECTED_SACL_SECURITY_INFORMATION))) + { + ErrorCode = ERROR_INVALID_PARAMETER; + break; + } + + /* call the MARTA provider */ + ErrorCode = AccTreeResetNamedSecurityInfo(pObjectName, + ObjectType, + SecurityInfo, + pOwner, + pGroup, + pDacl, + pSacl, + KeepExplicit, + fnProgress, + ProgressInvokeSetting, + Args); + break; + } + + default: + /* object type not supported */ + ErrorCode = ERROR_INVALID_PARAMETER; + break; + } + } + } + else + ErrorCode = ERROR_INVALID_PARAMETER; + + return ErrorCode; +} + + +/* + * @unimplemented + */ +DWORD STDCALL +TreeResetNamedSecurityInfoA(LPSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID pOwner, + PSID pGroup, + PACL pDacl, + PACL pSacl, + BOOL KeepExplicit, + FN_PROGRESSA fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, + PVOID Args) +{ + /* That's all this function does, at least up to w2k3... Even MS was too + lazy to implement it... */ + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-27 23:11:38 UTC (rev 16823) @@ -173,6 +173,29 @@ } +/********************************************************************** + * AccTreeResetNamedSecurityInfo EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccTreeResetNamedSecurityInfo(LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID pOwner, + PSID pGroup, + PACL pDacl, + PACL pSacl, + BOOL KeepExplicit, + FN_PROGRESSW fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, + PVOID Args) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + BOOL STDCALL DllMain(IN HINSTANCE hinstDLL, IN DWORD dwReason, _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.def --- trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-27 23:11:38 UTC (rev 16823) @@ -3,14 +3,14 @@ EXPORTS AccFreeIndexArray@12 AccGetInheritanceSource@40 -;AccProvHandleGrantAccessRights; +;AccProvHandleGrantAccessRights AccRewriteGetExplicitEntriesFromAcl@12 AccRewriteGetHandleRights@32 AccRewriteGetNamedRights@32 AccRewriteSetEntriesInAcl@16 AccRewriteSetHandleRights@16 AccRewriteSetNamedRights@16 -;AccTreeResetNamedSecurityInfo +AccTreeResetNamedSecurityInfo@44 ;AccConvertAccessMaskToActrlAccess ;AccConvertAccessToSD ;AccConvertAccessToSecurityDescriptor _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-27 23:11:38 UTC (rev 16823) @@ -1,6 +1,13 @@ #include <windows.h> #include <accctrl.h> +#ifndef HAS_FN_PROGRESSW +#define FN_PROGRESSW FN_PROGRESS +#endif +#ifndef HAS_FN_PROGRESSA +#define FN_PROGRESSA FN_PROGRESS +#endif + ULONG DbgPrint(PCH Format,...); extern HINSTANCE hDllInstance; _____ Modified: trunk/reactos/w32api/include/accctrl.h --- trunk/reactos/w32api/include/accctrl.h 2005-07-27 21:48:47 UTC (rev 16822) +++ trunk/reactos/w32api/include/accctrl.h 2005-07-27 23:11:38 UTC (rev 16823) @@ -352,6 +352,26 @@ ULONG Placeholder; } FN_OBJECT_MGR_FUNCTS, *PFN_OBJECT_MGR_FUNCTS; +typedef enum _PROG_INVOKE_SETTING +{ + ProgressInvokeNever = 1, + ProgressInvokeEveryObject, + ProgressInvokeOnError, + ProgressCancelOperation, + ProgressRetryOperation +} PROG_INVOKE_SETTING, *PPROG_INVOKE_SETTING; + +typedef VOID (STDCALL *FN_PROGRESSW)(LPWSTR pObjectName, + DWORD Status, + PPROG_INVOKE_SETTING pInvokeSetting, + PVOID Args, + BOOL SecuritySet); +typedef VOID (STDCALL *FN_PROGRESSA)(LPSTR pObjectName, + DWORD Status, + PPROG_INVOKE_SETTING pInvokeSetting, + PVOID Args, + BOOL SecuritySet); + #ifdef UNICODE #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW typedef TRUSTEE_W TRUSTEE_, *PTRUSTEE_; @@ -368,6 +388,8 @@ typedef OBJECTS_AND_NAME_W OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_; #if (_WIN32_WINNT >= 0x0501) typedef INHERITED_FROMW INHERITED_FROM, *PINHERITED_FROM; +typedef FN_PROGRESSW FN_PROGRESS; +#define HAS_FN_PROGRESSW #endif #else #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERA @@ -385,6 +407,8 @@ typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_; #if (_WIN32_WINNT >= 0x0501) typedef INHERITED_FROMA INHERITED_FROM, *PINHERITED_FROM; +typedef FN_PROGRESSA FN_PROGRESS; +#define HAS_FN_PROGRESSA #endif #endif /* UNICODE */

19 years, 6 months

[ion] 16822: - Fix incorrect definitions

by ion＠svn.reactos.com

- Fix incorrect definitions Modified: trunk/reactos/w32api/include/ddrawgdi.h Modified: trunk/reactos/w32api/include/wingdi.h _____ Modified: trunk/reactos/w32api/include/ddrawgdi.h --- trunk/reactos/w32api/include/ddrawgdi.h 2005-07-27 21:31:15 UTC (rev 16821) +++ trunk/reactos/w32api/include/ddrawgdi.h 2005-07-27 21:48:47 UTC (rev 16822) @@ -89,7 +89,7 @@ HWND hWnd ); -BOOL +HDC STDCALL DdGetDC( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, _____ Modified: trunk/reactos/w32api/include/wingdi.h --- trunk/reactos/w32api/include/wingdi.h 2005-07-27 21:31:15 UTC (rev 16821) +++ trunk/reactos/w32api/include/wingdi.h 2005-07-27 21:48:47 UTC (rev 16822) @@ -2682,7 +2682,7 @@ int WINAPI GetClipBox(HDC,LPRECT); int WINAPI GetClipRgn(HDC,HRGN); BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT); -HANDLE WINAPI GetColorSpace(HDC); +HCOLORSPACE WINAPI GetColorSpace(HDC); HGDIOBJ WINAPI GetCurrentObject(HDC,UINT); BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); HCURSOR WINAPI GetCursor(void); @@ -2823,7 +2823,7 @@ UINT WINAPI SetBoundsRect(HDC,LPCRECT,UINT); BOOL WINAPI SetBrushOrgEx(HDC,int,int,LPPOINT); BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*); -BOOL WINAPI SetColorSpace(HDC,HCOLORSPACE); +HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); #if (_WIN32_WINNT >= 0x0500) COLORREF WINAPI SetDCBrushColor(HDC,COLORREF); COLORREF WINAPI SetDCPenColor(HDC,COLORREF);

19 years, 6 months

[gdalsnes] 16821: delete stuff (will this ever end?)

by gdalsnes＠svn.reactos.com

delete stuff (will this ever end?) Deleted: branches/win32k rewrite attempt/hardons1stbranch/

19 years, 6 months

[gdalsnes] 16820: move stuff, again

by gdalsnes＠svn.reactos.com

move stuff, again Deleted: branches/win32k rewrite attempt/hardons1stbranch/inc_w32k/ Added: branches/win32k rewrite attempt/inc_w32k/ _____ Copied: branches/win32k rewrite attempt/inc_w32k (from rev 16819, branches/win32k rewrite attempt/hardons1stbranch/inc_w32k)

19 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005