Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39164: - Add more TODO to .def
by dchapyshev＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: dchapyshev Date: Wed Jan 28 02:22:39 2009 New Revision: 39164 URL: http://svn.reactos.org/svn/reactos?rev=39164&view=rev Log: - Add more TODO to .def Modified: trunk/reactos/dll/win32/user32/user32.def Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Wed Jan 28 02:22:39 2009 @@ -62,7 +62,7 @@ CheckMenuRadioItem@20 CheckRadioButton@16 ChildWindowFromPoint@12 -ChildWindowFromPointEx@16 +ChildWindowFromPointEx@16 ; TODO: Direct call NtUserChildWindowFromPointEx ;CliImmSetHotKey ClientThreadSetup@0 ClientToScreen@8 @@ -121,7 +121,7 @@ DdeFreeStringHandle@8 DdeGetData@16 DdeGetLastError@4 -DdeGetQualityOfService@12 +DdeGetQualityOfService@12 ; TODO: Direct call NtUserDdeGetQualityOfService DdeImpersonateClient@4 DdeInitializeA@16 DdeInitializeW@16 @@ -133,7 +133,7 @@ DdeQueryStringA@20 DdeQueryStringW@20 DdeReconnect@4 -DdeSetQualityOfService@12 +DdeSetQualityOfService@12 ; TODO: Direct call NtUserDdeSetQualityOfService DdeSetUserHandle@12 DdeUnaccessData@4 DdeUninitialize@4 @@ -146,7 +146,7 @@ DefRawInputProc@12 DefWindowProcA@16 DefWindowProcW@16 -DeferWindowPos@32 +DeferWindowPos@32 ; TODO: Direct call NtUserDeferWindowPos DeleteMenu@12=NtUserDeleteMenu@12 DeregisterShellHookWindow@4 DestroyAcceleratorTable@4 @@ -174,7 +174,7 @@ DlgDirSelectComboBoxExW@16 DlgDirSelectExA@16 DlgDirSelectExW@16 -DragDetect@12 +DragDetect@12 ; TODO: Direct call NtUserDragDetect DragObject@20=NtUserDragObject@20 DrawAnimatedRects@16=NtUserDrawAnimatedRects@16 DrawCaption@16 @@ -212,7 +212,7 @@ EnumDesktopsW@12 EnumDisplayDevicesA@16 EnumDisplayDevicesW@16 -EnumDisplayMonitors@16 +EnumDisplayMonitors@16 ; TODO: Direct call NtUserEnumDisplayMonitors EnumDisplaySettingsA@12 EnumDisplaySettingsExA@16 EnumDisplaySettingsExW@16 @@ -243,7 +243,7 @@ GetAltTabInfo=GetAltTabInfoA@20 GetAltTabInfoA@20 GetAltTabInfoW@20 -GetAncestor@8 +GetAncestor@8 ; TODO: Direct call NtUserGetAncestor GetAppCompatFlags@4 GetAppCompatFlags2@4 GetAsyncKeyState@4 @@ -267,7 +267,7 @@ GetClipboardOwner@0=NtUserGetClipboardOwner@0 GetClipboardSequenceNumber@0=NtUserGetClipboardSequenceNumber@0 GetClipboardViewer@0=NtUserGetClipboardViewer@0 -GetComboBoxInfo@8 +GetComboBoxInfo@8 ; TODO: Direct call NtUserGetComboBoxInfo GetCursor@0 ;GetCursorFrameInfo GetCursorInfo@4=NtUserGetCursorInfo@4 @@ -325,7 +325,7 @@ GetMessageW@16 GetMonitorInfoA@8 GetMonitorInfoW@8 -GetMouseMovePointsEx@20 +GetMouseMovePointsEx@20 ; TODO: Direct call NtUserGetMouseMovePointsEx GetNextDlgGroupItem@12 GetNextDlgTabItem@12 GetOpenClipboardWindow@0=NtUserGetOpenClipboardWindow@0 @@ -352,7 +352,7 @@ GetSubMenu@8 GetSysColor@4 GetSysColorBrush@4 -GetSystemMenu@8 +GetSystemMenu@8 ; TODO: Direct call NtUserGetSystemMenu GetSystemMetrics@4 GetTabbedTextExtentA@20 GetTabbedTextExtentW@20 @@ -395,7 +395,7 @@ IMPQueryIMEW@4 IMPSetIMEA@8 IMPSetIMEW@8 -ImpersonateDdeClientWindow@8 +ImpersonateDdeClientWindow@8 ; TODO: Direct call NtUserImpersonateDdeClientWindow InSendMessage@0 InSendMessageEx@4 InflateRect@12 @@ -476,7 +476,7 @@ MapVirtualKeyW@8 MapWindowPoints@16 MB_GetString@4 -MenuItemFromPoint@16 +MenuItemFromPoint@16 ; TODO: Direct call NtUserMenuItemFromPoint MenuWindowProcA@16 MenuWindowProcW@16 MessageBeep@4 @@ -532,8 +532,8 @@ ;PrivateSetRipFlags PtInRect@12 ;QuerySendMessage -;QueryUserCounters -RealChildWindowFromPoint@12 +;QueryUserCounters ; TODO: Direct call NtUserQueryUserCounters +RealChildWindowFromPoint@12 ; TODO: Direct call NtUserRealChildWindowFromPoint RealGetWindowClass=RealGetWindowClassA@12 RealGetWindowClassA@12 RealGetWindowClassW@12 @@ -592,7 +592,7 @@ SetCaretPos@8 SetClassLongA@12 SetClassLongW@12 -SetClassWord@12 +SetClassWord@12 ; TODO: Direct call NtUserSetClassWord SetClipboardData@8 SetClipboardViewer@4=NtUserSetClipboardViewer@4 ;SetConsoleReserveKeys @@ -611,7 +611,7 @@ SetKeyboardState@4=NtUserSetKeyboardState@4 SetLastErrorEx@8 SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16 -SetLogonNotifyWindow@8 +SetLogonNotifyWindow@8 ; TODO: Direct call NtUserSetLogonNotifyWindow SetMenu@8 SetMenuContextHelpId@8=NtUserSetMenuContextHelpId@8 SetMenuDefaultItem@12=NtUserSetMenuDefaultItem@12 @@ -629,7 +629,7 @@ SetPropW@12 SetRect@20 SetRectEmpty@4 -SetScrollInfo@16 +SetScrollInfo@16 ; TODO: Direct call NtUserSetScrollInfo SetScrollPos@16 SetScrollRange@20 SetShellWindow@4 @@ -637,7 +637,7 @@ SetSysColors@12 SetSysColorsTemp@12 SetSystemCursor@8 -SetSystemMenu@8 +SetSystemMenu@8 ; TODO: Direct call NtUserSetSystemMenu SetSystemTimer@16=NtUserSetSystemTimer@16 SetTaskmanWindow@4 SetThreadDesktop@4=NtUserSetThreadDesktop@4 @@ -655,7 +655,7 @@ SetWindowStationUser@16 SetWindowTextA@8 SetWindowTextW@8 -SetWindowWord@12 +SetWindowWord@12 ; TODO: Direct call NtUserSetWindowWord SetWindowsHookA@8 SetWindowsHookExA@16 SetWindowsHookExW@16 @@ -682,9 +682,9 @@ ToAsciiEx@24 ToUnicode@24 ToUnicodeEx@28 -TrackMouseEvent@4 +TrackMouseEvent@4 ; TODO: Direct call NtUserTrackMouseEvent TrackPopupMenu@28 -TrackPopupMenuEx@24 +TrackPopupMenuEx@24 ; TODO: Direct call NtUserTrackPopupMenuEx TranslateAccelerator=TranslateAcceleratorA@12 TranslateAcceleratorA@12 TranslateAcceleratorW@12 @@ -717,7 +717,7 @@ ;UserRegisterWowHandlers ;VRipOutput ;VTagOutput -ValidateRect@8 +ValidateRect@8 ; TODO: Direct call NtUserValidateRect ValidateRgn@8 VkKeyScanA@4 VkKeyScanExA@8

1 0

[dchapyshev] 39163: - More implement User32InitializeImmEntryTable
by dchapyshev＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: dchapyshev Date: Wed Jan 28 02:08:31 2009 New Revision: 39163 URL: http://svn.reactos.org/svn/reactos?rev=39163&view=rev Log: - More implement User32InitializeImmEntryTable Modified: trunk/reactos/dll/win32/user32/misc/imm.c Modified: trunk/reactos/dll/win32/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/imm.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/imm.c [iso-8859-1] Wed Jan 28 02:08:31 2009 @@ -18,7 +18,21 @@ typedef struct { BOOL (WINAPI* pImmIsIME) (HKL); + LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); + LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); + LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); + LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); + BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); + BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); + BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); + HIMC (WINAPI* pImmGetContext) (HWND); + HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); + BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); } Imm32ApiTable; Imm32ApiTable *pImmApiTable = {0}; @@ -34,16 +48,19 @@ * This function should not be implemented, it is used, * if you can not load function from imm32.dll */ -BOOL WINAPI IMM_ImmIsIME(HKL hKL) -{ - return 0; -} - -/* See comment for IMM_ImmIsIME */ -HIMC WINAPI IMM_ImmAssociateContext(HWND hwnd, HIMC himc) -{ - return 0; -} +BOOL WINAPI IMM_ImmIsIME(HKL hKL) { return 0; } +HIMC WINAPI IMM_ImmAssociateContext(HWND hwnd, HIMC himc) { return 0; } +BOOL WINAPI IMM_ImmReleaseContext(HWND hwnd, HIMC himc) { return 0; } +LRESULT WINAPI IMM_ImmEscapeAW(HKL hkl, HIMC himc, UINT uint, LPVOID lpvoid) { return 0; } +LONG WINAPI IMM_ImmGetCompositionStringAW(HIMC himc, DWORD dword1, LPVOID lpvoid, DWORD dword2) { return 0; } +BOOL WINAPI IMM_ImmGetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } +BOOL WINAPI IMM_ImmGetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } +BOOL WINAPI IMM_ImmSetCompositionFontA(HIMC himc, LPLOGFONTA lplf) { return 0; } +BOOL WINAPI IMM_ImmSetCompositionFontW(HIMC himc, LPLOGFONTW lplf) { return 0; } +BOOL WINAPI IMM_ImmSetGetCompositionWindow(HIMC himc, LPCOMPOSITIONFORM lpcf) { return 0; } +HIMC WINAPI IMM_ImmGetContext(HWND hwnd) { return 0; } +HWND WINAPI IMM_ImmGetDefaultIMEWnd(HWND hwnd) { return 0; } +BOOL WINAPI IMM_ImmNotifyIME(HIMC himc, DWORD dword1, DWORD dword2, DWORD dword3) { return 0; } /* * @unimplemented @@ -68,9 +85,65 @@ if (!pImmApiTable->pImmIsIME) pImmApiTable->pImmIsIME = IMM_ImmIsIME; + pImmApiTable->pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeA"); + if (!pImmApiTable->pImmEscapeA) + pImmApiTable->pImmEscapeA = IMM_ImmEscapeAW; + + pImmApiTable->pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeW"); + if (!pImmApiTable->pImmEscapeW) + pImmApiTable->pImmEscapeW = IMM_ImmEscapeAW; + + pImmApiTable->pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringA"); + if (!pImmApiTable->pImmGetCompositionStringA) + pImmApiTable->pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; + + pImmApiTable->pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringW"); + if (!pImmApiTable->pImmGetCompositionStringW) + pImmApiTable->pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; + + pImmApiTable->pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmGetCompositionFontA"); + if (!pImmApiTable->pImmGetCompositionFontA) + pImmApiTable->pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; + + pImmApiTable->pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmGetCompositionFontW"); + if (!pImmApiTable->pImmGetCompositionFontW) + pImmApiTable->pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; + + pImmApiTable->pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmSetCompositionFontA"); + if (!pImmApiTable->pImmSetCompositionFontA) + pImmApiTable->pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; + + pImmApiTable->pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmSetCompositionFontW"); + if (!pImmApiTable->pImmSetCompositionFontW) + pImmApiTable->pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; + + pImmApiTable->pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmGetCompositionWindow"); + if (!pImmApiTable->pImmGetCompositionWindow) + pImmApiTable->pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; + + pImmApiTable->pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmSetCompositionWindow"); + if (!pImmApiTable->pImmSetCompositionWindow) + pImmApiTable->pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; + pImmApiTable->pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmAssociateContext"); if (!pImmApiTable->pImmAssociateContext) pImmApiTable->pImmAssociateContext = IMM_ImmAssociateContext; + + pImmApiTable->pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmReleaseContext"); + if (!pImmApiTable->pImmReleaseContext) + pImmApiTable->pImmReleaseContext = IMM_ImmReleaseContext; + + pImmApiTable->pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetContext"); + if (!pImmApiTable->pImmGetContext) + pImmApiTable->pImmGetContext = IMM_ImmGetContext; + + pImmApiTable->pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetDefaultIMEWnd"); + if (!pImmApiTable->pImmGetDefaultIMEWnd) + pImmApiTable->pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; + + pImmApiTable->pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(hImmInstance, "ImmNotifyIME"); + if (!pImmApiTable->pImmNotifyIME) + pImmApiTable->pImmNotifyIME = IMM_ImmNotifyIME; /* * TODO: Load more functions from imm32.dll

1 0

[tkreuzer] 39162: kd64: Implement KdpRead/WriteMachineSpecificRegister
by tkreuzer＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: tkreuzer Date: Tue Jan 27 22:15:09 2009 New Revision: 39162 URL: http://svn.reactos.org/svn/reactos?rev=39162&view=rev Log: kd64: Implement KdpRead/WriteMachineSpecificRegister Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Jan 27 22:15:09 2009 @@ -568,6 +568,68 @@ &KdpContext); } +VOID +NTAPI +KdpReadMachineSpecificRegister(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_MSR ReadMsr; + LARGE_INTEGER Value; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Get a shortcut */ + ReadMsr = &State->u.ReadWriteMsr; + + /* Read the msr */ + Value.QuadPart = __readmsr(ReadMsr->Msr); + + /* Set fields */ + ReadMsr->DataValueLow = Value.LowPart; + ReadMsr->DataValueHigh = Value.HighPart; + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpWriteMachineSpecificRegister(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PDBGKD_READ_WRITE_MSR WriteMsr; + LARGE_INTEGER Value; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Get a shortcut */ + WriteMsr = &State->u.ReadWriteMsr; + + /* Set fields */ + Value.LowPart = WriteMsr->DataValueLow; + Value.HighPart = WriteMsr->DataValueHigh; + + /* Write the msr */ + __writemsr(WriteMsr->Msr, Value.QuadPart); + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + KCONTINUE_STATUS NTAPI KdpSendWaitContinue(IN ULONG PacketType, @@ -812,16 +874,14 @@ case DbgKdReadMachineSpecificRegister: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadMachineSpecificRegister); - while (TRUE); + /* Read the specified MSR */ + KdpReadMachineSpecificRegister(&ManipulateState, &Data, Context); break; case DbgKdWriteMachineSpecificRegister: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteMachineSpecificRegister); - while (TRUE); + /* Write the specified MSR */ + KdpWriteMachineSpecificRegister(&ManipulateState, &Data, Context); break; case OldVlm1:

1 0

[tkreuzer] 39161: KD64: remove some FrLdrDbgPrints, fix a warning.
by tkreuzer＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: tkreuzer Date: Tue Jan 27 22:14:05 2009 New Revision: 39161 URL: http://svn.reactos.org/svn/reactos?rev=39161&view=rev Log: KD64: remove some FrLdrDbgPrints, fix a warning. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c [iso-8859-1] Tue Jan 27 22:14:05 2009 @@ -21,7 +21,7 @@ /* Copy the version block */ RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); -Version->PsLoadedModuleList = &KeLoaderBlock->LoadOrderListHead; + Version->PsLoadedModuleList = (ULONG_PTR)&KeLoaderBlock->LoadOrderListHead; Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA; Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT; @@ -163,7 +163,9 @@ PreviousMode, SecondChanceException); } -FrLdrDbgPrint("leave KdpTrap\n"); + /* Return TRUE or FALSE to caller */ return Status; } + + Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Jan 27 22:14:05 2009 @@ -579,7 +579,7 @@ DBGKD_MANIPULATE_STATE64 ManipulateState; ULONG Length; KDSTATUS RecvCode; -FrLdrDbgPrint("Enter KdpSendWaitContinue\n"); + /* Setup the Manipulate State structure */ Header.MaximumLength = sizeof(DBGKD_MANIPULATE_STATE64); Header.Buffer = (PCHAR)&ManipulateState; @@ -1107,7 +1107,7 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { BOOLEAN Entered; -FrLdrDbgPrint("KdEnterDebugger!\n"); + /* Check if we have a trap frame */ if (TrapFrame) { @@ -1149,7 +1149,7 @@ /* Make sure we acquired the port */ if (!KdpPortLocked) DbgPrint("Port lock was not acquired!\n"); -FrLdrDbgPrint("KdEnterDebugger returns %d\n", Entered); + /* Return enter state */ return Entered; }

1 0

[sserapion] 39160: The wbinvd instruction is the same on amd64
by sserapion＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: sserapion Date: Tue Jan 27 21:07:51 2009 New Revision: 39160 URL: http://svn.reactos.org/svn/reactos?rev=39160&view=rev Log: The wbinvd instruction is the same on amd64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Jan 27 21:07:51 2009 @@ -1953,7 +1953,7 @@ { PAGED_CODE(); -#if defined(_M_IX86) +#if defined(_M_IX86) || defined(_M_AMD64) __wbinvd(); #elif defined(_M_PPC) __asm__ __volatile__("tlbsync"); @@ -1962,10 +1962,7 @@ for (;;); #elif defined(_M_ARM) __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); -#elif defined(_M_AMD64) - DPRINT1("NtFlushInstructionCache() is not implemented\n"); - for (;;); -#else +s#else #error Unknown architecture #endif return STATUS_SUCCESS;

1 0

[janderwald] 39159: -fix build
by janderwald＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: janderwald Date: Tue Jan 27 20:06:55 2009 New Revision: 39159 URL: http://svn.reactos.org/svn/reactos?rev=39159&view=rev Log: -fix build Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h (with props) Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h (added) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Tue Jan 27 20:06:55 2009 @@ -1,0 +1,27 @@ +#ifndef WDMAUD_H__ +#define WDMAUD_H__ + +#define _NTDDK_ +#include <ntddk.h> +#include <portcls.h> +#define YDEBUG +#include <debug.h> + +typedef struct +{ + KSDEVICE_HEADER DeviceHeader; + PVOID SysAudioNotification; + +}WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; + + + + + + + + + + + +#endif Propchange: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 39158: - Implement initializing routines for wdmaud - Register plug&play notification routines for guid KSCATEGORY_SYSAUDIO
by janderwald＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: janderwald Date: Tue Jan 27 18:04:00 2009 New Revision: 39158 URL: http://svn.reactos.org/svn/reactos?rev=39158&view=rev Log: - Implement initializing routines for wdmaud - Register plug&play notification routines for guid KSCATEGORY_SYSAUDIO Modified: trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild Modified: trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/d… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] Tue Jan 27 18:04:00 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + </directory> </group> Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Tue Jan 27 18:04:00 2009 @@ -1,59 +1,228 @@ /* - This doesn't do much yet... -*/ - -#include <debug.h> - -#define InPassiveIrql() \ - (KeGetCurrentIrql() == IRQL_PASSIVE_LEVEL) - - -NTSTATUS AudioDeviceControl( - IN PDEVICE_OBJECT device, - IN PIRP irp -) -{ - return STATUS_SUCCESS; -} - - -NTSTATUS AudioAddDevice( - IN PDRIVER_OBJECT driver, - IN PDEVICE_OBJECT device -) -{ - DPRINT("AudioAddDevice called\n"); - - if ( ! IsPassiveIrql() ) - { - /* What do we do?! */ - /* RtlAssert("FAIL", __FILE__, __LINE__, "?" */ - } - - return STATUS_SUCCESS; -} - -VOID AudioUnload( - IN PDRIVER_OBJECT driver -) -{ - DPRINT("AudioUnload called\n"); + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/legacy/wdmaud/main.c + * PURPOSE: System Audio graph builder + * PROGRAMMER: Andrew Greenwood + * Johannes Anderwald + */ +#include "wdmaud.h" + +const GUID KSCATEGORY_SYSAUDIO = {0xA7C7A5B1L, 0x5AF3, 0x11D1, {0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07}}; + +NTSTATUS +NTAPI +WdmAudAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT NextDeviceObject; + NTSTATUS Status; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + DPRINT("WdmAudAddDevice called\n"); + + Status = IoCreateDevice(DriverObject, + sizeof(WDMAUD_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_KS, + 0, + FALSE, + &DeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice failed with %x\n", Status); + return Status; + } + + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(WDMAUD_DEVICE_EXTENSION)); + + Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); + IoDeleteDevice(DeviceObject); + return Status; + } + + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (NextDeviceObject) + { + /// FIXME + /// KsSetDevicePnpAndBaseObject((KSDEVICE_HEADER)DeviceObject->DeviceExtension, NextDeviceObject, DeviceObject); + } + + + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +VOID +NTAPI +WdmAudUnload( + IN PDRIVER_OBJECT driver) +{ + DPRINT("WdmAudUnload called\n"); +} + +NTSTATUS +NTAPI +WdmAudPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpStack; + + DPRINT("WdmAudPnp called\n"); + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + + if (IrpStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) + { + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + return KsDefaultDispatchPnp(DeviceObject, Irp); + } + return KsDefaultDispatchPnp(DeviceObject, Irp); +} + +NTSTATUS +NTAPI +DeviceInterfaceChangeCallback( + IN PVOID NotificationStructure, + IN PVOID Context) +{ + DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event = (DEVICE_INTERFACE_CHANGE_NOTIFICATION*)NotificationStructure; + + DPRINT1("DeviceInterfaceChangeCallback called %p\n", Event); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +WdmAudCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("WdmAudCreate\n"); + + + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + +#if 0 + Status = KsReferenceSoftwareBusObject((KSDEVICE_HEADER)DeviceObject->DeviceExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsReferenceSoftwareBusObject failed with %x\n", Status); + return Status; + } +#endif + + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&KSCATEGORY_SYSAUDIO, + DeviceObject->DriverObject, + DeviceInterfaceChangeCallback, + (PVOID)DeviceExtension, + &DeviceExtension->SysAudioNotification); + + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +NTAPI +WdmAudClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("WdmAudClose\n"); + + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + +#if 0 + Status = KsDereferenceSoftwareBusObject(DeviceExtension->DeviceHeader); +#endif + + if (NT_SUCCESS(Status)) + { + Status = IoUnregisterPlugPlayNotification(DeviceExtension->SysAudioNotification); + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +NTAPI +WdmAudDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +WdmAudCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; } NTSTATUS NTAPI DriverEntry( - IN PDRIVER_OBJECT driver, - IN PUNICODE_STRING registry_path + IN PDRIVER_OBJECT Driver, + IN PUNICODE_STRING Registry_path ) { DPRINT("Wdmaud.sys loaded\n"); - driver->DriverExtension->AddDevice = AudioAddDevice; - driver->DriverUnload = AudioUnload; - - driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AudioDeviceControl; - - return STATUS_SUCCESS; -} + Driver->DriverExtension->AddDevice = WdmAudAddDevice; + Driver->DriverUnload = WdmAudUnload; + + + Driver->MajorFunction[IRP_MJ_CREATE] = WdmAudCreate; + Driver->MajorFunction[IRP_MJ_CLOSE] = WdmAudClose; + Driver->MajorFunction[IRP_MJ_PNP] = WdmAudPnp; + Driver->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; + Driver->MajorFunction[IRP_MJ_CLEANUP] = WdmAudCleanup; + Driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = WdmAudDeviceControl; + Driver->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; + + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] Tue Jan 27 18:04:00 2009 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> <module name="wdmaud_kernel" type="kernelmodedriver" installbase="system32/drivers" installname="wdmaud.sys"> - <include base="wdmaud">.</include> - <include base="wdmaud">..</include> + <include base="wdmaud_kernel">.</include> <library>ntoskrnl</library> + <library>ks</library> <file>entry.c</file> </module>

1 0

[arty] 39157: Finish fixing round trip of gmutex's various lock bits. Patch by alex ionescu.
by arty＠svn.reactos.org 27 Jan '09

27 Jan '09

Author: arty Date: Tue Jan 27 17:11:50 2009 New Revision: 39157 URL: http://svn.reactos.org/svn/reactos?rev=39157&view=rev Log: Finish fixing round trip of gmutex's various lock bits. Patch by alex ionescu. Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Tue Jan 27 17:11:50 2009 @@ -119,11 +119,11 @@ if ((OldValue) && !(OldValue & GM_LOCK_WAITER_WOKEN)) { /* Update the Oldvalue to what it should be now */ - OldValue |= GM_LOCK_BIT; - + OldValue += GM_LOCK_BIT; + /* The mutex will be woken, minus one waiter */ - NewValue = (OldValue | GM_LOCK_WAITER_WOKEN); - NewValue -= GM_LOCK_WAITER_INC; + NewValue = OldValue + GM_LOCK_WAITER_WOKEN - + GM_LOCK_WAITER_INC; /* Remove the Woken bit */ if (InterlockedCompareExchange(&GuardedMutex->Count,

1 0

[arty] 39156: Remove extra args.
by arty＠svn.reactos.org 27 Jan '09

27 Jan '09

Author: arty Date: Tue Jan 27 17:04:10 2009 New Revision: 39156 URL: http://svn.reactos.org/svn/reactos?rev=39156&view=rev Log: Remove extra args. Modified: trunk/reactos/tools/wmc/write.c Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3915… ============================================================================== --- trunk/reactos/tools/wmc/write.c [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/write.c [iso-8859-1] Tue Jan 27 17:04:10 2009 @@ -174,7 +174,7 @@ } cptr = ctime(&now); killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline/*, cptr*/); fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); fprintf(fp, "\n"); @@ -499,7 +499,7 @@ } cptr = ctime(&now); killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline/*, cptr*/); if(rcinline) write_rcinline(fp);

1 0

[tkreuzer] 39155: Ke: Remove unused KiInitializeMachineType and Ki486CompatibilityLock. Remove a bunch of FrLdrDbgPrints. Resort KiSystemStartupReal, initialize the LoaderBlocks Process and Prcb field for Cpu0, get the Pcr from the LoaderBlock.
by tkreuzer＠svn.reactos.org 27 Jan '09

27 Jan '09

Author: tkreuzer Date: Tue Jan 27 16:14:06 2009 New Revision: 39155 URL: http://svn.reactos.org/svn/reactos?rev=39155&view=rev Log: Ke: Remove unused KiInitializeMachineType and Ki486CompatibilityLock. Remove a bunch of FrLdrDbgPrints. Resort KiSystemStartupReal, initialize the LoaderBlocks Process and Prcb field for Cpu0, get the Pcr from the LoaderBlock. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Tue Jan 27 16:14:06 2009 @@ -506,15 +506,6 @@ ProcessorState->SpecialRegisters.MsrSyscallMask = __readmsr(X86_MSR_SFMASK); } - -VOID -NTAPI -KiInitializeMachineType(VOID) -{ - /* Set the Machine Type we got from NTLDR */ - KeI386MachineType = KeLoaderBlock->u.I386.MachineType & 0x000FF; -} - VOID NTAPI KeFlushEntireTb(IN BOOLEAN Invalid, Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Tue Jan 27 16:14:06 2009 @@ -20,7 +20,6 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; -KSPIN_LOCK Ki486CompatibilityLock; /* BIOS Memory Map. Not NTLDR-compliant yet */ extern ULONG KeMemoryMapRangeCount; @@ -337,6 +336,8 @@ IN PKTHREAD IdleThread, IN PVOID DpcStack) { + RtlZeroMemory(Pcr, PAGE_SIZE); + /* Set the Current Thread */ Pcr->Prcb.CurrentThread = IdleThread; @@ -491,7 +492,6 @@ /* Initialize some spinlocks */ KeInitializeSpinLock(&KiFreezeExecutionLock); - KeInitializeSpinLock(&Ki486CompatibilityLock); /* Initialize portable parts of the OS */ KiInitSystem(); @@ -512,7 +512,6 @@ /* FIXME */ DPRINT1("SMP Boot support not yet present\n"); } -FrLdrDbgPrint("before KeInitializeThread\n"); /* Setup the Idle Thread */ KeInitializeThread(InitProcess, @@ -523,7 +522,7 @@ NULL, NULL, IdleStack); -FrLdrDbgPrint("after KeInitializeThread\n"); + InitThread->NextProcessor = Number; InitThread->Priority = HIGH_PRIORITY; InitThread->State = Running; @@ -557,7 +556,7 @@ ExpInitializeExecutive(Number, LoaderBlock); /* Only do this on the boot CPU */ - if (!Number) + if (Number == 0) { /* Calculate the time reciprocal */ KiTimeIncrementReciprocal = @@ -650,8 +649,6 @@ NTAPI KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - FrLdrDbgPrint("Enter KiSystemStartupReal()\n"); - ULONG Cpu; PKTHREAD InitialThread; ULONG64 InitialStack; @@ -664,85 +661,98 @@ /* Save the loader block and get the current CPU */ KeLoaderBlock = LoaderBlock; - /* Get Pcr from loader block */ -// Pcr = CONTAINING_RECORD(LoaderBlock->Prcb, KIPCR, Prcb); - Pcr = &KiInitialPcr; - + /* Get the current CPU number */ Cpu = KeNumberProcessors; + + /* Set active processors */ + KeActiveProcessors |= 1 << Cpu; + KeNumberProcessors++; + + /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) { - /* If this is the boot CPU, set GS base and the CPU Number*/ - __writemsr(X86_MSR_GSBASE, (ULONG64)Pcr); - __writemsr(X86_MSR_KERNEL_GSBASE, (ULONG64)Pcr); - Pcr->Prcb.Number = Cpu; - - /* Set the initial stack and idle thread as well */ + /* Set the initial stack, idle thread and process */ LoaderBlock->KernelStack = (ULONG_PTR)P0BootStack; LoaderBlock->Thread = (ULONG_PTR)&KiInitialThread; - } + LoaderBlock->Process = (ULONG_PTR)&KiInitialProcess.Pcb; + LoaderBlock->Prcb = (ULONG_PTR)&KiInitialPcr.Prcb; + } + + /* Get Pcr from loader block */ + Pcr = CONTAINING_RECORD(LoaderBlock->Prcb, KIPCR, Prcb); + + /* Set GS base */ + __writemsr(X86_MSR_GSBASE, (ULONG64)Pcr); + __writemsr(X86_MSR_KERNEL_GSBASE, (ULONG64)Pcr); + + /* Load Ring 3 selectors for DS/ES/FS */ + Ke386SetDs(KGDT_64_DATA | RPL_MASK); + Ke386SetEs(KGDT_64_DATA | RPL_MASK); + Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); + + /* LDT is unused */ + __sldt(0); + + /* Align stack to 16 bytes */ + LoaderBlock->KernelStack &= ~(16 - 1); /* Save the initial thread and stack */ - InitialStack = LoaderBlock->KernelStack; // Chekme + InitialStack = LoaderBlock->KernelStack; // Checkme InitialThread = (PKTHREAD)LoaderBlock->Thread; - - /* Align stack to 16 bytes */ - InitialStack &= ~(16 - 1); /* Clean the APC List Head */ InitializeListHead(&InitialThread->ApcState.ApcListHead[KernelMode]); - /* Initialize the machine type */ - KiInitializeMachineType(); + /* Set us as the current process */ + InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process; + + /* Get GDT, IDT, PCR and TSS pointers */ + KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); + + /* Initialize the PCR */ + KiInitializePcr(Cpu, + Pcr, + Idt, + Gdt, + Tss, + InitialThread, + KiDoubleFaultStack); /* Skip initial setup if this isn't the Boot CPU */ if (Cpu == 0) { - /* Get GDT, IDT, PCR and TSS pointers */ - KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); - -FrLdrDbgPrint("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); - /* Setup the TSS descriptors and entries */ Ki386InitializeTss(Tss, Idt, Gdt, InitialStack); - /* Initialize the PCR */ - RtlZeroMemory(Pcr, PAGE_SIZE); - KiInitializePcr(Cpu, - Pcr, - Idt, - Gdt, - Tss, - InitialThread, - KiDoubleFaultStack); - - /* Set us as the current process */ - InitialThread->ApcState.Process = &KiInitialProcess.Pcb; - /* Setup the IDT */ KeInitExceptions(); - /* Load Ring 3 selectors for DS/ES/FS */ - Ke386SetDs(KGDT_64_DATA | RPL_MASK); - Ke386SetEs(KGDT_64_DATA | RPL_MASK); - Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); - - /* LDT is unused */ - __sldt(0); - - /* Save NMI and double fault traps */ -// RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); -// RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ -// RtlCopyMemory(Idt, -// (PVOID)KiIdtDescriptor.Base, -// KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ -// RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); -// RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); - } - + /* Initialize debugging system */ + KdInitSystem(0, KeLoaderBlock); + + /* Check for break-in */ +// if (KdPollBreakIn()) DbgBreakPointWithStatus(1); + + /* HACK: misuse this function to pass a function pointer to kdcom */ + KdDebuggerInitialize1((PVOID)FrLdrDbgPrint); + + /* Hack! Wait for the debugger! */ + while (!KdPollBreakIn()); + + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + DPRINT1("Command Line: %s\n", LoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", LoaderBlock->ArcBootDeviceName, + LoaderBlock->NtHalPathName, + LoaderBlock->ArcHalDeviceName, + LoaderBlock->NtBootPathName); + } + + DPRINT1("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); + + /* Initialize the Processor with HAL */ + HalInitializeProcessor(Cpu, KeLoaderBlock); /* Loop until we can release the freeze lock */ do @@ -750,44 +760,6 @@ /* Loop until execution can continue */ while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); - - /* Setup CPU-related fields */ - Pcr->Prcb.Number = Cpu; - Pcr->Prcb.SetMember = 1 << Cpu; - - /* Initialize the Processor with HAL */ - HalInitializeProcessor(Cpu, KeLoaderBlock); - - /* Set active processors */ - KeActiveProcessors |= 1 << Cpu; - KeNumberProcessors++; - - /* Check if this is the boot CPU */ - if (Cpu == 0) - { - /* Initialize debugging system */ - KdInitSystem(0, KeLoaderBlock); - - /* Check for break-in */ -// if (KdPollBreakIn()) DbgBreakPointWithStatus(1); - } - - /* HACK: misuse this function to pass a function pointer to kdcom */ - KdDebuggerInitialize1((PVOID)FrLdrDbgPrint); - - /* Hack! Wait for the debugger! */ - while (!KdPollBreakIn()); - - DbgBreakPointWithStatus(0); - - /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); - DPRINT1("Command Line: %s\n", LoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", LoaderBlock->ArcBootDeviceName, - LoaderBlock->NtHalPathName, - LoaderBlock->ArcHalDeviceName, - LoaderBlock->NtBootPathName); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); @@ -811,6 +783,8 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { +// DbgBreakPointWithStatus(0); + /* Initialize kernel */ KiInitializeKernel(InitProcess, InitThread,

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