Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 43281: - DragFullWindow property changable via desktop settings / effects - TODO: adapt desk.cpl to new sysparams implementation
by mkupfer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mkupfer Date: Sun Oct 4 12:50:18 2009 New Revision: 43281 URL: http://svn.reactos.org/svn/reactos?rev=43281&view=rev Log: - DragFullWindow property changable via desktop settings / effects - TODO: adapt desk.cpl to new sysparams implementation Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/effappdlg.c trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Sun Oct 4 12:50:18 2009 @@ -138,8 +138,12 @@ g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; + /* show content of windows during dragging */ + //SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &g->Theme.Effects.bDragFullWindows, 0); + /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ - SystemParametersInfo(SPI_GETKEYBOARDCUES, sizeof(BOOL), &g->Theme.Effects.bKeyboardCues, 0); + //SystemParametersInfo(SPI_GETKEYBOARDCUES, sizeof(BOOL), &g->Theme.Effects.bKeyboardCues, 0); } @@ -359,7 +363,8 @@ */ g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; - UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues); + SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, (PVOID)&g->Theme.Effects.bDragFullWindows, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + //UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues); //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &g->Theme.Effects.bActiveWindowTracking); UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation); //UPDATE_USERPREF(COMBOBOXANIMATION, &g->Theme.Effects.bComboBoxAnimation); @@ -536,6 +541,7 @@ i = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); g->Theme.Id = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)i, 0); LoadThemeFromReg(g); + //SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, WM_PAINT, 0, 0); } break; Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Sun Oct 4 12:50:18 2009 @@ -49,6 +49,7 @@ BOOL bCursorShadow; BOOL bUiEffects; BOOL bFontSmoothing; + BOOL bDragFullWindows; UINT uiFontSmoothingType; } EFFECTS; Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Sun Oct 4 12:50:18 2009 @@ -25,7 +25,10 @@ SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->ThemeAdv.Effects.bMenuFade, 0); state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); - g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? FALSE : TRUE; + g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE; + state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0); + g->ThemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE; + } @@ -62,8 +65,11 @@ state = g->ThemeAdv.Effects.bMenuAnimation ? BST_CHECKED : BST_UNCHECKED; SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_SETCHECK, state, 0); - state = g->ThemeAdv.Effects.bKeyboardCues ? BST_UNCHECKED : BST_CHECKED; + state = g->ThemeAdv.Effects.bKeyboardCues ? BST_CHECKED : BST_UNCHECKED; SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_SETCHECK, state, 0); + + state = g->ThemeAdv.Effects.bDragFullWindows ? BST_CHECKED : BST_UNCHECKED; + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_SETCHECK, state, 0); /* Update the controls */ UpdateControls(hwndDlg, g); @@ -109,6 +115,7 @@ case IDC_EFFAPPEARANCE_ANIMATION: case IDC_EFFAPPEARANCE_KEYBOARDCUES: + case IDC_EFFAPPEARANCE_DRAGFULLWINDOWS: if (HIWORD(wParam) == BN_CLICKED) { UpdateControls(hwndDlg, g); Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun Oct 4 12:50:18 2009 @@ -110,9 +110,9 @@ CONTROL "Ve&rwende große Icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 CONTROL "Zeige Menüsch&atten",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 CONTROL "Zeige &Fensterinhalt beim Verschieben",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 250, 19 PUSHBUTTON "Abbrechen", IDCANCEL, 226, 165, 50, 14 Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Oct 4 12:50:18 2009 @@ -114,7 +114,7 @@ CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14

1 0

[mjmartin] 43280: edit.c: Remove TPM_RETURNCMD flag from TrackPopupMenu missed during a recent WINE sync. Most apps that use edit control context menus are back to working. VB apps still crashes as the context menu implementation for edit controls is slightly wrong.
by mjmartin＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mjmartin Date: Sun Oct 4 09:26:23 2009 New Revision: 43280 URL: http://svn.reactos.org/svn/reactos?rev=43280&view=rev Log: edit.c: Remove TPM_RETURNCMD flag from TrackPopupMenu missed during a recent WINE sync. Most apps that use edit control context menus are back to working. VB apps still crashes as the context menu implementation for edit controls is slightly wrong. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Oct 4 09:26:23 2009 @@ -3469,7 +3469,7 @@ y = rc.top + (rc.bottom - rc.top) / 2; } - TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); + TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); DestroyMenu(menu); }

1 0

[cgutman] 43279: - Put some code back which was removed in r43270
by cgutman＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: cgutman Date: Sun Oct 4 05:55:34 2009 New Revision: 43279 URL: http://svn.reactos.org/svn/reactos?rev=43279&view=rev Log: - Put some code back which was removed in r43270 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Oct 4 05:55:34 2009 @@ -1740,6 +1740,7 @@ *lpErrno = WSAEFAULT; return SOCKET_ERROR; } + Socket->SharedData.NonBlocking = *((PULONG)lpvInBuffer) ? 1 : 0; return SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL); case FIONREAD: if( cbOutBuffer < sizeof(INT) || IS_INTRESOURCE(lpvOutBuffer) )

1 0

[tkreuzer] 43278: use __debugbreak() insetad of EngDebugBreak() dedicated to Alex
by tkreuzer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: tkreuzer Date: Sun Oct 4 02:04:38 2009 New Revision: 43278 URL: http://svn.reactos.org/svn/reactos?rev=43278&view=rev Log: use __debugbreak() insetad of EngDebugBreak() dedicated to Alex Modified: trunk/reactos/drivers/video/font/bmfd/font.c trunk/reactos/drivers/video/font/bmfd/glyph.c trunk/reactos/drivers/video/font/ftfd/enable.c trunk/reactos/drivers/video/font/ftfd/font.c Modified: trunk/reactos/drivers/video/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] Sun Oct 4 02:04:38 2009 @@ -247,7 +247,7 @@ ULONG cjView; DbgPrint("BmfdLoadFontFile()\n"); - EngDebugBreak(); + __debugbreak(); /* Check parameters */ if (cFiles != 1) @@ -323,7 +323,7 @@ PBMFD_FILE pfile = (PBMFD_FILE)iFile; DbgPrint("BmfdQueryFontFile()\n"); -// EngDebugBreak(); +// __debugbreak(); switch (ulMode) { @@ -397,7 +397,7 @@ HGLYPH * phglyphs; DbgPrint("DrvQueryFontTree(iMode=%ld)\n", iMode); -// EngDebugBreak(); +// __debugbreak(); /* Check parameters, we only support QFT_GLYPHSET */ if (!iFace || iFace > pfile->cNumFaces || iMode != QFT_GLYPHSET) @@ -522,7 +522,7 @@ PANOSE panose = {0}; DbgPrint("BmfdQueryFont()\n"); -// EngDebugBreak(); +// __debugbreak(); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) Modified: trunk/reactos/drivers/video/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/gl… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] Sun Oct 4 02:04:38 2009 @@ -331,7 +331,7 @@ DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", pfo, iMode, hg, pgd, pv, cjSize); -// EngDebugBreak(); +// __debugbreak(); switch (iMode) { Modified: trunk/reactos/drivers/video/font/ftfd/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/en… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] Sun Oct 4 02:04:38 2009 @@ -77,7 +77,7 @@ IN HANDLE hDriver) { DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); - EngDebugBreak(); + __debugbreak(); /* Return a dummy DHPDEV */ Modified: trunk/reactos/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Sun Oct 4 02:04:38 2009 @@ -145,7 +145,7 @@ PFTFD_FILE pfile = (PFTFD_FILE)iFile; DbgPrint("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); -// EngDebugBreak(); +// __debugbreak(); switch (ulMode) { @@ -322,7 +322,7 @@ FT_Done_Face(ftface); DbgPrint("Finished with the ifi: %p\n", pifiX); - EngDebugBreak(); + __debugbreak(); return pifi; } @@ -469,7 +469,7 @@ *pid = (ULONG_PTR)pGlyphSet; DbgPrint("pGlyphSet=%p\n", pGlyphSet); -EngDebugBreak(); +__debugbreak(); return pGlyphSet; }

1 0

[jimtabor] 43277: - Dont need this then.
by jimtabor＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: jimtabor Date: Sun Oct 4 01:42:06 2009 New Revision: 43277 URL: http://svn.reactos.org/svn/reactos?rev=43277&view=rev Log: - Dont need this then. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Oct 4 01:42:06 2009 @@ -117,7 +117,6 @@ /* ReactOS */ LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - BOOLEAN IsExiting; // Use TIF_INCLEANUP SINGLE_LIST_ENTRY ReferencesList; } THREADINFO;

1 0

[jimtabor] 43276: - Use TIF in cleanup flag.
by jimtabor＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: jimtabor Date: Sun Oct 4 01:39:30 2009 New Revision: 43276 URL: http://svn.reactos.org/svn/reactos?rev=43276&view=rev Log: - Use TIF in cleanup flag. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -264,7 +264,7 @@ } } } - Win32Thread->IsExiting = FALSE; + Win32Thread->TIF_flags &= ~TIF_INCLEANUP; co_IntDestroyCaret(Win32Thread); Win32Thread->ppi = PsGetCurrentProcessWin32Process(); pTeb = NtCurrentTeb(); @@ -283,7 +283,6 @@ DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); - Win32Thread->IsExiting = TRUE; Win32Thread->TIF_flags |= TIF_INCLEANUP; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -1008,7 +1008,7 @@ PTHREADINFO OldBlock; ASSERT(W32Thread); - if(!W32Thread->Desktop || (W32Thread->IsExiting && BlockIt)) + if(!W32Thread->Desktop || ((W32Thread->TIF_flags & TIF_INCLEANUP) && BlockIt)) { /* * fail blocking if exiting the thread Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Oct 4 01:39:30 2009 @@ -1513,7 +1513,7 @@ if (NULL != Win32Thread && Window->MessageQueue == Win32Thread->MessageQueue) { - if (Win32Thread->IsExiting) + if (Win32Thread->TIF_flags & TIF_INCLEANUP) { /* Never send messages to exiting threads */ RETURN( FALSE);

1 0

[cgutman] 43275: - Add cancellation support for IOCTL_AFD_SELECT - Fix release build
by cgutman＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: cgutman Date: Sat Oct 3 23:34:34 2009 New Revision: 43275 URL: http://svn.reactos.org/svn/reactos?rev=43275&view=rev Log: - Add cancellation support for IOCTL_AFD_SELECT - Fix release build Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 3 23:34:34 2009 @@ -517,6 +517,10 @@ PAFD_SEND_INFO SendReq; PLIST_ENTRY CurrentEntry; PIRP CurrentIrp; + PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; + KIRQL OldIrql; + PAFD_ACTIVE_POLL Poll; + PAFD_POLL_INFO PollReq; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -553,9 +557,38 @@ Function = FUNCTION_PREACCEPT; break; + case IOCTL_AFD_SELECT: + KeAcquireSpinLock(&DeviceExt->Lock, &OldIrql); + + CurrentEntry = DeviceExt->Polls.Flink; + while (CurrentEntry != &DeviceExt->Polls) + { + Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); + CurrentIrp = Poll->Irp; + PollReq = CurrentIrp->AssociatedIrp.SystemBuffer; + + if (CurrentIrp == Irp) + { + ZeroEvents(PollReq->Handles, PollReq->HandleCount); + SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + break; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + + /* IRP already completed by SignalSocket */ + SocketStateUnlock(FCB); + return; + default: ASSERT(FALSE); - break; + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + return; } CurrentEntry = FCB->PendingIrpList[Function].Flink; Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Oct 3 23:34:34 2009 @@ -43,7 +43,7 @@ } } -static VOID ZeroEvents( PAFD_HANDLE HandleArray, +VOID ZeroEvents( PAFD_HANDLE HandleArray, UINT HandleCount ) { UINT i; @@ -55,7 +55,7 @@ /* you must pass either Poll OR Irp */ -static VOID SignalSocket( +VOID SignalSocket( PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, PAFD_POLL_INFO PollReq, @@ -89,6 +89,7 @@ UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -244,6 +245,7 @@ Status = STATUS_PENDING; IoMarkIrpPending( Irp ); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); } else { AFD_DbgPrint(MAX_TRACE, ("FIXME: do something with the IRP!\n")); Status = STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 3 23:34:34 2009 @@ -315,6 +315,11 @@ VOID PollReeval( PAFD_DEVICE_EXTENSION DeviceObject, PFILE_OBJECT FileObject ); VOID KillSelectsForFCB( PAFD_DEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, BOOLEAN ExclusiveOnly ); +VOID ZeroEvents( PAFD_HANDLE HandleArray, + UINT HandleCount ); +VOID SignalSocket( + PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, + PAFD_POLL_INFO PollReq, NTSTATUS Status); /* tdi.c */

1 0

[cgutman] 43274: - Implement IRP cancellation for AFD - Fixes "Broken driver did not complete!" showing up in the debug log (especially during winetests)
by cgutman＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: cgutman Date: Sat Oct 3 22:52:54 2009 New Revision: 43274 URL: http://svn.reactos.org/svn/reactos?rev=43274&view=rev Log: - Implement IRP cancellation for AFD - Fixes "Broken driver did not complete!" showing up in the debug log (especially during winetests) Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -99,6 +99,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -120,6 +121,7 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -60,6 +60,7 @@ if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_NO_MEMORY; } @@ -79,6 +80,7 @@ Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS; + (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_SUCCESS; } @@ -106,6 +108,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -302,6 +302,7 @@ SocketStateUnlock( FCB ); } else { if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + (void)IoSetCancelRoutine(Irp, NULL); SocketStateUnlock( FCB ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } @@ -322,7 +323,7 @@ NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { InsertTailList( &FCB->PendingIrpList[Function], &Irp->Tail.Overlay.ListEntry ); - IoMarkIrpPending(Irp); - Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0 ); } Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -505,6 +505,78 @@ return (Status); } +VOID NTAPI +AfdCancelHandler(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + UINT Function; + PAFD_RECV_INFO RecvReq; + PAFD_SEND_INFO SendReq; + PLIST_ENTRY CurrentEntry; + PIRP CurrentIrp; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + if (!SocketAcquireStateLock(FCB)) + return; + + ASSERT(IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL); + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_AFD_RECV: + RecvReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); + /* Fall through */ + + case IOCTL_AFD_RECV_DATAGRAM: + Function = FUNCTION_RECV; + break; + + case IOCTL_AFD_SEND: + SendReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + /* Fall through */ + + case IOCTL_AFD_SEND_DATAGRAM: + Function = FUNCTION_SEND; + break; + + case IOCTL_AFD_CONNECT: + Function = FUNCTION_CONNECT; + break; + + case IOCTL_AFD_WAIT_FOR_LISTEN: + Function = FUNCTION_PREACCEPT; + break; + + default: + ASSERT(FALSE); + break; + } + + CurrentEntry = FCB->PendingIrpList[Function].Flink; + while (CurrentEntry != &FCB->PendingIrpList[Function]) + { + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + if (CurrentIrp == Irp) + { + RemoveEntryList(CurrentEntry); + break; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); +} + static VOID NTAPI AfdUnload(PDRIVER_OBJECT DriverObject) { Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -154,6 +154,7 @@ RetBytesCopied = TotalBytesCopied; } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } @@ -210,6 +211,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -292,6 +294,7 @@ } else if( Status == STATUS_PENDING ) { AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); IoMarkIrpPending( Irp ); + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); } else { AFD_DbgPrint(MID_TRACE,("Completed with status %x\n", Status)); } @@ -427,6 +430,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -489,6 +493,7 @@ NextIrp->IoStatus.Information = DatagramRecv->Len; UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } else { AFD_DbgPrint(MID_TRACE,("Satisfying\n")); @@ -499,6 +504,7 @@ UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -57,6 +57,7 @@ NextIrp->IoStatus.Information = 0; UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); @@ -82,7 +83,7 @@ NextIrp->IoStatus.Information = 0; if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -197,6 +198,7 @@ NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 3 22:52:54 2009 @@ -279,6 +279,8 @@ VOID OskitDumpBuffer( PCHAR Buffer, UINT Len ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); VOID DestroySocket( PAFD_FCB FCB ); +VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, + PIRP Irp); /* read.c */

1 0

[hpoussin] 43273: WINLDR: Finally, set Windows boot style as default Many thanks to Fireball and Alex for your hard work on Windows boot style
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 22:09:57 2009 New Revision: 43273 URL: http://svn.reactos.org/svn/reactos?rev=43273&view=rev Log: WINLDR: Finally, set Windows boot style as default Many thanks to Fireball and Alex for your hard work on Windows boot style Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/bootcd.ini trunk/reactos/boot/bootdata/livecd.ini Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -415,13 +415,13 @@ /* ReactOS */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS", L"\"ReactOS\"", - L"ReactOS", ArcPath, + L"Windows2003", ArcPath, L""); /* ReactOS_Debug */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Debug", L"\"ReactOS (Debug)\"", - L"ReactOS", ArcPath, + L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG @@ -431,18 +431,24 @@ L"ReactOS", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); - /* ReactOS_WinLdr */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - /* ReactOS_Ram */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", L"ReactOS", L"ramdisk(0)\\ReactOS", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif + + /* ReactOS_old */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_old", L"\"ReactOS (old boot method)\"", + L"ReactOS", ArcPath, + L""); + + /* ReactOS_Debug_old */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot method)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=Setup -Timeout=0 +Timeout=1 [Display] TitleText=ReactOS Setup @@ -21,6 +21,10 @@ [Operating Systems] Setup="Setup" +Setup_old="Setup (old boot method)" [Setup] -BootType=ReactOSSetup +BootType=ReactOSSetup2 + +[Setup_old] +BootType=ReactOSSetup Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Sat Oct 3 22:09:57 2009 @@ -1,6 +1,6 @@ [FREELOADER] DefaultOS=ReactOS -Timeout=0 +Timeout=1 [Display] TitleText=ReactOS Boot Manager @@ -21,8 +21,14 @@ [Operating Systems] ReactOS="ReactOS" +Reactos_old="ReactOS (old boot method)" [ReactOS] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/DEBUGPORT=COM1 /SOS /MININT + +[Reactos_old] BootType=ReactOS SystemPath=LiveCD\reactos Options=/DEBUGPORT=COM1 /SOS

1 0

[hpoussin] 43272: [usetup] Simplify creation of entries in freeldr.ini
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 21:43:29 2009 New Revision: 43272 URL: http://svn.reactos.org/svn/reactos?rev=43272&view=rev Log: [usetup] Simplify creation of entries in freeldr.ini Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Oct 3 21:43:29 2009 @@ -352,6 +352,52 @@ NTSTATUS +CreateFreeLoaderEntry( + PINICACHE IniCache, + PINICACHESECTION OSSection, + PWCHAR Section, + PWCHAR Description, + PWCHAR BootType, + PWCHAR ArcPath, + PWCHAR Options) +{ + PINICACHESECTION IniSection; + + /* Insert entry into "Operating Systems" section */ + IniCacheInsertKey(OSSection, + NULL, + INSERT_LAST, + Section, + Description); + + /* Create new section */ + IniSection = IniCacheAppendSection(IniCache, Section); + + /* BootType= */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + BootType); + + /* SystemPath= */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"SystemPath", + ArcPath); + + /* Options=*/ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"Options", + Options); + + return STATUS_SUCCESS; +} + +NTSTATUS CreateFreeLoaderIniForReactos(PWCHAR IniPath, PWCHAR ArcPath) { @@ -366,172 +412,36 @@ IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); - /* ReactOS="ReactOS" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS", - L"\"ReactOS\""); - - /* ReactOS_Debug="ReactOS (Debug)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Debug", - L"\"ReactOS (Debug)\""); + /* ReactOS */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS", L"\"ReactOS\"", + L"ReactOS", ArcPath, + L""); + + /* ReactOS_Debug */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Debug", L"\"ReactOS (Debug)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG - /* ReactOS_KdSerial="ReactOS (RosDbg)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_KdSerial", - L"\"ReactOS (RosDbg)\""); - - /* ReactOS_WinLdr="ReactOS (WinLdr)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_WinLdr", - L"\"ReactOS (WinLdr)\""); - - /* ReactOS_Ram="ReactOS (RAM Disk)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Ram", - L"\"ReactOS (RAM Disk)\""); -#endif - - /* Create "ReactOS" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L""); - - /* Create "ReactOS_Debug" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_Debug"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - -#if DBG - - /* Create "ReactOS_KdSerial" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_KdSerial"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); - -/* ------------------------------------------------------------------------------ */ - - /* Create "ReactOS_WinLdr" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_WinLdr"); - - /* BootType=Windows2003 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"Windows2003"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - - /* Create "ReactOS_Ram" section */ - IniSection = IniCacheAppendSection(IniCache, - L"ReactOS_Ram"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=ramdisk(0)\\ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - L"ramdisk(0)\\ReactOS"); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256*/ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); - + /* ReactOS_KdSerial */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", + L"ReactOS", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); + + /* ReactOS_WinLdr */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); + + /* ReactOS_Ram */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", + L"ReactOS", L"ramdisk(0)\\ReactOS", + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif /* Save the ini file */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs