Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[ros-arm-bringup] 33937: - We now implement a super-basic (and probably broken) context switching mechanism. - We completely ignore setting the thread to the right scheduler state, and don't do any APC delivery checking, or any other work. - We now implement a basic KiThreadStartup, which behaves properly (we believe). Doesn't handle user-mode threads yet, though. - This gets us through PspSystemThreadStartup, and.. - We now reach Phase1InitializationDiscard! A major step has been reached, now i

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 11 19:40:53 2008 New Revision: 33937 URL: http://svn.reactos.org/svn/reactos?rev=33937&view=rev Log: - We now implement a super-basic (and probably broken) context switching mechanism. - We completely ignore setting the thread to the right scheduler state, and don't do any APC delivery checking, or any other work. - We now implement a basic KiThreadStartup, which behaves properly (we believe). Doesn't handle user-mode threads yet, though. - This gets us through PspSystemThreadStartup, and.. - We now reach Phase1InitializationDiscard! A major step has been reached, now it's time to cleanup what has been done until now and verify it to be correct. - Then we move on... the next two things will be 1) Hal Initialization (setting up the timer) and 2) Displaying the boot logo. - Graphics will require using the PL-110 LCD Controller. Modified: trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Wed Jun 11 19:40:53 2008 @@ -101,11 +101,11 @@ ULONG R9; ULONG R10; ULONG R11; - ULONG R12; +// ULONG R12; // ULONG Sp; -// ULONG Psr; + ULONG Psr; ULONG Lr; - ULONG SwapReturn; +// ULONG SwapReturn; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; // Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=339… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 11 19:40:53 2008 @@ -1265,6 +1265,12 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle, OptionHandle; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; +#ifdef _ARM_ + DPRINT1("*** Phase 1 Initialization Thread\n"); + DPRINT1("Beginning consistency checks...\n"); + // CHECK STACKS, IRQLS, DISPATCHER AND MAKE SURE WE ARE GOOD TO GO! + while (TRUE); +#endif /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Wed Jun 11 19:40:53 2008 @@ -21,6 +21,11 @@ // // Save volatile registers for the OLD thread // + sub sp, sp, #(4*8) + mrs ip, spsr_all + stmia sp, {ip, lr} + sub sp, sp, #(4*2) + stmia sp, {r4-r11} // // Switch stacks @@ -32,19 +37,46 @@ // Call the C context switch code // bl KiSwapContextInternal - + // // Restore volatile registers for the NEW thread // + ldmia sp, {r4-r11} + add sp, sp, #(4*8) + ldmia sp, {ip, lr} + msr spsr_all, ip + add sp, sp, #(4*2) // // Jump to saved restore address // + mov pc, lr + + ENTRY_END KiSwapContext + + NESTED_ENTRY KiThreadStartup + PROLOG_END KiThreadStartup // - // FIXME: TODO + // FIXME: Make space on stack and clean it up? + // + + // + // Lower to APC_LEVEL + // + mov a1, #1 + bl KeLowerIrql + + // + // Set the start address and startup context + // + mov a1, r6 + mov a2, r5 + blx r7 + + // + // Oh noes, we are back! // b . - ENTRY_END KiSwapContext - + ENTRY_END KiThreadStartup Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Wed Jun 11 19:40:53 2008 @@ -30,15 +30,7 @@ VOID NTAPI -KiThreadStartup(IN PKSYSTEM_ROUTINE SystemRoutine, - IN PKSTART_ROUTINE StartRoutine, - IN PVOID StartContext, - IN BOOLEAN UserThread, - IN KTRAP_FRAME TrapFrame) -{ - UNIMPLEMENTED; - return; -} +KiThreadStartup(VOID); VOID NTAPI @@ -112,7 +104,7 @@ // // Set the previous mode as kernel // - //Thread->PreviousMode = KernelMode; + Thread->PreviousMode = KernelMode; // // Context switch frame to setup below @@ -123,7 +115,7 @@ // // Now setup the context switch frame // - CtxSwitchFrame->SwapReturn = (ULONG)KiThreadStartup; + CtxSwitchFrame->Lr = (ULONG)KiThreadStartup; CtxSwitchFrame->R11 = (ULONG)(ExceptionFrame ? ExceptionFrame : CtxSwitchFrame); // @@ -138,4 +130,5 @@ // Save back the new value of the kernel stack // Thread->KernelStack = (PVOID)CtxSwitchFrame; + DPRINT1("NEW THREAD %p WITH EX FRAME AT: %p\n", Thread, Thread->KernelStack); } Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Jun 11 19:40:53 2008 @@ -37,12 +37,34 @@ KiSwapContextInternal(IN PKTHREAD OldThread, IN PKTHREAD NewThread) { - // - // FIXME: TODO - // + PKEXCEPTION_FRAME ExFrame = NewThread->KernelStack; DPRINT1("Switching from: %p to %p\n", OldThread, NewThread); DPRINT1("Stacks: %p %p\n", OldThread->KernelStack, NewThread->KernelStack); - while (TRUE); + DPRINT1("Thread Registers:\n" + "R4: %lx\n" + "R5: %lx\n" + "R6: %lx\n" + "R7: %lx\n" + "R8: %lx\n" + "R9: %lx\n" + "R10: %lx\n" + "R11: %lx\n" + "Psr: %lx\n" + "Lr: %lx\n", + ExFrame->R4, + ExFrame->R5, + ExFrame->R6, + ExFrame->R7, + ExFrame->R8, + ExFrame->R9, + ExFrame->R10, + ExFrame->R11, + ExFrame->Psr, + ExFrame->Lr); + + // + // FIXME: Todo + // } VOID

16 years, 3 months

[cfinck] 33936: - Fix/unhack/simplify/rewrite the RosCMS authentication module for phpBB. This should finally fix all Login/Logout problems people were experiencing. - Don't do any RosCMS-related stuff in login_box(), this is all done in the Authentication module now. - Disable the phpBB autologin, it interferes with the RosCMS Login.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 11 15:02:19 2008 New Revision: 33936 URL: http://svn.reactos.org/svn/reactos?rev=33936&view=rev Log: - Fix/unhack/simplify/rewrite the RosCMS authentication module for phpBB. This should finally fix all Login/Logout problems people were experiencing. - Don't do any RosCMS-related stuff in login_box(), this is all done in the Authentication module now. - Disable the phpBB autologin, it interferes with the RosCMS Login. Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php trunk/web/reactos.org/htdocs/forum/includes/functions.php Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] Wed Jun 11 15:02:19 2008 @@ -12,52 +12,23 @@ exit; } +require_once("$phpbb_root_path/../roscms/inc/subsys_login.php"); + /** * Login function */ define(ROSCMS_DB_NAME, "roscms"); -function login_roscms(&$userid, &$password) +function login_roscms(&$username, &$password) { global $db, $config; - // We only check the User ID here. - if (!$userid) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - // Get the phpBB ID of the user belonging to the "roscmsusrkey" cookie - $sql = "SELECT m.map_subsys_userid " . - "FROM " . ROSCMS_DB_NAME . ".user_sessions s, " . ROSCMS_DB_NAME . ".users u, " . ROSCMS_DB_NAME . ".subsys_mappings m " . - "WHERE s.usersession_id = '" . $db->sql_escape($_COOKIE["roscmsusrkey"]) . "' AND (s.usersession_expires IS NULL OR NOW() <= s.usersession_expires) " . - "AND u.user_id = s.usersession_user_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress = '" . $db->sql_escape($_SERVER["REMOTE_ADDR"]) . "') " . - "AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = '" . $db->sql_escape($_SERVER["HTTP_USER_AGENT"]) . "') " . - "AND m.map_roscms_userid = s.usersession_user_id " . - "AND m.map_subsys_name = 'phpbb'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + // We ignore both username and password here and retrieve the login data on our own using roscms_subsys_login + // This will either retrieve the phpbb user ID of the user currently logged in or redirect us to the RosCMS login page. + $userid = (int)roscms_subsys_login("phpbb", ROSCMS_LOGIN_REQUIRED, "/forum"); - // Verify this ID against $userid - if(!$row || $row["map_subsys_userid"] != $userid) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - // Now get the user information based on this ID - $sql = "SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts " . - "FROM " . USERS_TABLE . " " . - "WHERE user_id = " . (int)$userid; - + // Now get the user row based on this ID + $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id = $userid"; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -89,29 +60,38 @@ ); } +/* This function is called, when a session cookie already exists and we try to verify if it's valid. */ function validate_session_roscms(&$user) +{ + // Check if our current RosCMS login is (still) valid, check the session expiration time and perform session cleanups. + $valid_login = (roscms_subsys_login("phpbb", ROSCMS_LOGIN_OPTIONAL, "") != 0); + + // If we have a valid login, but the phpBB user ID is still ANONYMOUS, the user was logged in to RosCMS, but not yet to phpBB. + // So do that now. + if($valid_login && $user["user_id"] == ANONYMOUS) + login_box(); + + return $valid_login; +} + +/* This function is called, when no phpBB session exists and we're in the process of creating the session cookie. */ +function autologin_roscms() { global $db; - if($_COOKIE["roscmsusrkey"]) + // Get the User ID of the logged in user (if any), check the session expiration time and perform session cleanups. + $userid = (int)roscms_subsys_login("phpbb", ROSCMS_LOGIN_OPTIONAL, ""); + + if($userid) { - if($user["user_id"] == ANONYMOUS) - { - // The user is logged in in RosCMS, but not yet in phpBB. Do that now - login_box(); - } - else - { - // Update the session expiration time - $sql = "UPDATE " . ROSCMS_DB_NAME . ".user_sessions " . - "SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . - "WHERE usersession_id = '" . $db->sql_escape($_COOKIE["roscmsusrkey"]) . "' " . - "AND usersession_expires IS NOT NULL"; - $db->sql_query($sql); - } + // Return the phpBB user row if a user is logged in. + $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id = $userid"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + return $row; } - - return true; } ?> Modified: trunk/web/reactos.org/htdocs/forum/includes/functions.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/functions.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/functions.php [iso-8859-1] Wed Jun 11 15:02:19 2008 @@ -15,8 +15,6 @@ { exit; } - -require_once("$phpbb_root_path/../roscms/inc/subsys_login.php"); // Common global functions @@ -2257,14 +2255,9 @@ } trigger_error('NO_AUTH_ADMIN'); } - - // Login using RosCMS - // The function will return the phpBB user ID if we're already logged in. - // Otherwise this function will be automatically called again through validate_session_roscms, when we will be redirected to the forum. - $userid = roscms_subsys_login("phpbb", ROSCMS_LOGIN_REQUIRED, "/forum"); - // If authentication is successful we redirect user to previous page - $result = $auth->login($userid, '', true, true, $admin); + // Don't pass anything here, login_roscms will call roscms_subsys_login on its own. + $result = $auth->login('', '', false, true, $admin); // If admin authentication and login, we will log if it was a success or not... // We also break the operation on the first non-success login - it could be argued that the user already knows

16 years, 3 months

[ros-arm-bringup] 33935: - We now implement a skeleton framework for context switching - The only things we do are swap the stack and then display the old/new thread/stack. - More work to be done to actually save the non-volatiles, prepare the thread state, and restore the volatiles for the new thread. - Then we will return to the saved return address, and we should be in Phase 1 with working thread switching/scheduling.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 11 14:13:25 2008 New Revision: 33935 URL: http://svn.reactos.org/svn/reactos?rev=33935&view=rev Log: - We now implement a skeleton framework for context switching - The only things we do are swap the stack and then display the old/new thread/stack. - More work to be done to actually save the non-volatiles, prepare the thread state, and restore the volatiles for the new thread. - Then we will return to the saved return address, and we should be in Phase 1 with working thread switching/scheduling. Added: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s (with props) Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/stubs.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -55,6 +55,11 @@ */ .equ PcCurrentIrql, 0x14C +/* + * KTHREAD Offsets + */ +.equ ThKernelStack, 0x20 + #else /* Added: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s (added) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -1,0 +1,50 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/arm/ctxswtch.s + * PURPOSE: Context Switch and Idle Thread on ARM + * PROGRAMMERS: ReactOS Portable Systems Group + */ + + .title "ARM Context Switching" + .include "ntoskrnl/include/internal/arm/kxarm.h" + .include "ntoskrnl/include/internal/arm/ksarm.h" + + TEXTAREA + NESTED_ENTRY KiSwapContext + PROLOG_END KiSwapContext + // + // a1 = Old Thread + // a2 = New Thread + // + + // + // Save volatile registers for the OLD thread + // + + // + // Switch stacks + // + str sp, [a1, #ThKernelStack] + ldr sp, [a2, #ThKernelStack] + + // + // Call the C context switch code + // + bl KiSwapContextInternal + + // + // Restore volatile registers for the NEW thread + // + + // + // Jump to saved restore address + // + + // + // FIXME: TODO + // + b . + + ENTRY_END KiSwapContext + Propchange: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -2,6 +2,8 @@ #define NDEBUG #include "debug.h" +CCHAR KeNumberProcessors; +ULONG KeDcacheFlushCount; ULONG KeActiveProcessors; ULONG KeProcessorArchitecture; ULONG KeProcessorLevel; Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -12,17 +12,14 @@ // // Exported Ke Arch-Specific APIs // -GENERATE_ARM_STUB KiSwapContext GENERATE_ARM_STUB DbgBreakPointWithStatus GENERATE_ARM_STUB KeConnectInterrupt -GENERATE_ARM_STUB KeDcacheFlushCount GENERATE_ARM_STUB KeDisconnectInterrupt GENERATE_ARM_STUB KeFlushEntireTb GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment GENERATE_ARM_STUB KeIcacheFlushCount GENERATE_ARM_STUB KeInitializeInterrupt GENERATE_ARM_STUB KeInvalidateAllCaches -GENERATE_ARM_STUB KeNumberProcessors GENERATE_ARM_STUB KeQueryActiveProcessors GENERATE_ARM_STUB KeRaiseUserException GENERATE_ARM_STUB KeSaveStateForHibernate Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -24,7 +24,6 @@ IN PULONG Arguments, IN ULONG ArgumentCount ); - /* FUNCTIONS ******************************************************************/ @@ -33,6 +32,18 @@ VOID FASTCALL HalClearSoftwareInterrupt(IN KIRQL Request); + +VOID +KiSwapContextInternal(IN PKTHREAD OldThread, + IN PKTHREAD NewThread) +{ + // + // FIXME: TODO + // + DPRINT1("Switching from: %p to %p\n", OldThread, NewThread); + DPRINT1("Stacks: %p %p\n", OldThread->KernelStack, NewThread->KernelStack); + while (TRUE); +} VOID KiDispatchInterrupt(VOID) @@ -107,9 +118,12 @@ // // Swap to the new thread + // On ARM we call KiSwapContext instead of KiSwapContextInternal, + // because we're calling this from C code and not assembly. + // This is similar to how it gets called for unwaiting, on x86 // DPRINT1("Swapping context!\n"); - //KiSwapContextInternal(); + KiSwapContext(OldThread, NewThread); while (TRUE); } } Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Jun 11 14:13:25 2008 @@ -63,6 +63,7 @@ <file first="true">boot.s</file> <file>arm_kprintf.c</file> <file>cpu.c</file> + <file>ctxswtch.s</file> <file>exp.c</file> <file>kiinit.c</file> <file>stubs_asm.s</file>

16 years, 3 months

[ros-arm-bringup] 33934: - We now make appropriate space on the stack to save the old IRQL in the trap frame. - Save the old IRQL and assert it in the interrupt handler. - Fix KTRAP_FRAME structure.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 11 13:39:44 2008 New Revision: 33934 URL: http://svn.reactos.org/svn/reactos?rev=33934&view=rev Log: - We now make appropriate space on the stack to save the old IRQL in the trap frame. - Save the old IRQL and assert it in the interrupt handler. - Fix KTRAP_FRAME structure. Modified: trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Wed Jun 11 13:39:44 2008 @@ -59,6 +59,12 @@ // typedef struct _KTRAP_FRAME { + ULONG OldIrql; + // UCHAR PreviousMode; + // ULONG Fpscr; + // ULONG FpExc; + // ULONG S[33]; + // ULONG FpExtra[8]; ULONG Spsr; ULONG R0; ULONG R1; @@ -78,12 +84,6 @@ ULONG SvcSp; ULONG SvcLr; ULONG Pc; - ULONG OldIrql; -// UCHAR PreviousMode; -// ULONG Fpscr; -// ULONG FpExc; -// ULONG S[33]; -// ULONG FpExtra[8]; } KTRAP_FRAME, *PKTRAP_FRAME; #ifndef NTOS_MODE_USER Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/armddk.h [iso-8859-1] Wed Jun 11 13:39:44 2008 @@ -35,9 +35,9 @@ // #define KeGetCurrentProcessorNumber() PCR->Number #define KeGetCurrentIrql() PCR->CurrentIrql -#define _KeGetCurrentThread() PCR->CurrentThread -#define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode -#define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0) +#define _KeGetCurrentThread() PCR->CurrentThread +#define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode +#define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0) #define KeGetDcacheFillSize() PCR->DcacheFillSize // Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Wed Jun 11 13:39:44 2008 @@ -50,6 +50,11 @@ */ .equ KiPcr, 0xFFFFF000 +/* + * PCR Offsets + */ +.equ PcCurrentIrql, 0x14C + #else /* Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Wed Jun 11 13:39:44 2008 @@ -68,10 +68,20 @@ str r0, [sp, #-4]! // + // Make space for IRQL + // + sub sp, sp, #4 + + // // Call the C handler // mov r0, sp bl KiSoftwareInterruptHandler + + // + // Skip IRQL + // + add sp, sp, #(4) // // Get the SPSR and restore it @@ -140,12 +150,7 @@ // Save the SVC sp before we modify it // mov r2, sp - - // - // Dummy OldIrql - // - //str r0, [sp, #-4]! - + // // Save the abort lr // @@ -185,6 +190,11 @@ // mrs r0, spsr_all str r0, [sp, #-4]! + + // + // Make space for IRQL + // + sub sp, sp, #4 // // Call the C handler @@ -194,6 +204,11 @@ ldr pc, =KiDataAbortHandler AbortExit: + + // + // Skip IRQL + // + add sp, sp, #(4) // // Get the SPSR and restore it @@ -253,11 +268,6 @@ mov r2, sp // - // Dummy OldIrql - // - //str r0, [sp, #-4]! - - // // Save the IRQ lr // str r0, [sp, #-4]! @@ -296,6 +306,11 @@ // mrs r0, spsr_all str r0, [sp, #-4]! + + // + // Make space for IRQL + // + sub sp, sp, #4 // // Call the C handler Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Jun 11 13:39:44 2008 @@ -125,13 +125,15 @@ // // Get the old IRQL // - OldIrql = TrapFrame->OldIrql; + OldIrql = KeGetCurrentIrql(); + TrapFrame->OldIrql = OldIrql; // // Get the interrupt source // InterruptCause = HalGetInterruptSource(); DPRINT1("Interrupt (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); + DPRINT1("OLD IRQL: %x\n", OldIrql); // // Get the new IRQL and Interrupt Mask @@ -144,14 +146,14 @@ // // Make sure the IRQL is valid // - //if (OldIrql < Irql) - //{ + if (OldIrql < Irql) + { // // We should just return, probably // - //DPRINT1("IRQL Race!\n"); - //while (TRUE); - //} + DPRINT1("IRQL Race!\n"); + while (TRUE); + } // // Check if this interrupt is at DISPATCH or higher

16 years, 3 months

[ros-arm-bringup] 33933: - Fix build on ARM: - _iob is already defined as a dll_import - _rotl intrinsic is now implemented (should use rol instruction, but not sure on the syntax!) - Add a stub psctx.h for ARM - Added InterlockedEXchangePointers - Fix uninitialized variable warning in ex/resource.c - Start to implement interrupt handling: - We now have a rudimentary interrupt handler that takes care of software interrupts - We now have a rudimentary DPC handler which takes care of switching to

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 11 11:48:07 2008 New Revision: 33933 URL: http://svn.reactos.org/svn/reactos?rev=33933&view=rev Log: - Fix build on ARM: - _iob is already defined as a dll_import - _rotl intrinsic is now implemented (should use rol instruction, but not sure on the syntax!) - Add a stub psctx.h for ARM - Added InterlockedEXchangePointers - Fix uninitialized variable warning in ex/resource.c - Start to implement interrupt handling: - We now have a rudimentary interrupt handler that takes care of software interrupts - We now have a rudimentary DPC handler which takes care of switching to the next thread, if any - We now setup the HAL Interrupt Source -> IRQL Table (The IRQLMask Table). - Implemented HalGetInterruptSource, which allows us to get the interrupt # that cause the IRQ. Note: this wasn't needed on Alpha/PPC/MIPS NT ports, because that information is stored on the CPU, and the kernel could read it -- we must abstract it through the HAL. - Add the OldIrql to the TRAP_FRAME, we don't use it yet. - We are now ready to context switch to the Phase 1 thread. Added: trunk/reactos/ntoskrnl/ps/arm/ trunk/reactos/ntoskrnl/ps/arm/psctx.c (with props) Modified: trunk/reactos/hal/hal/hal_arm.def trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/reactos/armddk.h trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=33… ============================================================================== --- trunk/reactos/hal/hal/hal_arm.def [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal_arm.def [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -42,6 +42,7 @@ HalGetBusData HalGetBusDataByOffset HalGetEnvironmentVariable +HalGetInterruptSource HalGetInterruptVector HalHandleNMI HalInitSystem Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -414,7 +414,7 @@ // CLOCK_LEVEL - 0x10 (everything disabled except 4) // POWER_LEVEL, IPI_LEVEL, HIGH_LEVEL - 0x00 (everything disabled) -ULONG HalpIrqlTable[] = +ULONG HalpIrqlTable[HIGH_LEVEL + 1] = { 0xFFFFFFFF, // IRQL 0 PASSIVE_LEVEL 0xFFFFFFFD, // IRQL 1 APC_LEVEL @@ -450,44 +450,94 @@ 0x00, // IRQL 31 HIGH_LEVEL }; - -VOID -HalpStallInterrupt(VOID) -{ - DPRINT1("STALL INTERRUPT!!!\n"); - while (TRUE); -} - -VOID -HalpInitializeInterrupts(VOID) -{ - ULONG i; - PKPCR Pcr = (PKPCR)KeGetPcr(); - - // - // Fill out the IRQL mappings - // - for (i = 0; i < (HIGH_LEVEL + 1); i++) - { - // - // Save the valeue in the PCR - // - Pcr->IrqlTable[i] = HalpIrqlTable[i]; - } - - // - // Setup the clock and profile interrupt - // - Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; - // Pcr->InterruptRoutine[PROFILE_LEVEL] = HalpCountInterrupt; -} - -ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; - +UCHAR HalpMaskTable[HIGH_LEVEL + 1] = +{ + PROFILE_LEVEL, + APC_LEVEL, + DISPATCH_LEVEL, + IPI_LEVEL, + CLOCK2_LEVEL, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 26, + 26 +}; + +#define VICINTSTATUS (PVOID)0xE0040000 #define VICINTENABLE (PVOID)0xE0040010 #define VICINTENCLEAR (PVOID)0xE0040014 #define VICSOFTINT (PVOID)0xE0040018 #define VICSOFTINTCLEAR (PVOID)0xE004001C + + +#define _clz(a) \ +({ ULONG __value, __arg = (a); \ + asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ + __value; }) + +ULONG +HalGetInterruptSource(VOID) +{ + ULONG InterruptStatus; + + // + // Get the interrupt status, and return the highest bit set + // + InterruptStatus = READ_REGISTER_ULONG(VICINTSTATUS); + return 31 - _clz(InterruptStatus); +} + +VOID +HalpStallInterrupt(VOID) +{ + DPRINT1("STALL INTERRUPT!!!\n"); + while (TRUE); +} + +VOID +HalpInitializeInterrupts(VOID) +{ + PKPCR Pcr = (PKPCR)KeGetPcr(); + + // + // Fill out the IRQL mappings + // + RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); + RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); +// Pcr->IrqlTable = HalpIrqlTable; + // Pcr->IrqlMask = HalpMaskTable; + + // + // Setup the clock and profile interrupt + // + Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; + // Pcr->InterruptRoutine[PROFILE_LEVEL] = HalpCountInterrupt; +} + +ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; + /* * @implemented @@ -714,13 +764,38 @@ WRITE_REGISTER_ULONG(VICSOFTINT, Interrupt); } -VOID FASTCALL -HalClearSoftwareInterrupt( - IN KIRQL Request) -{ - UNIMPLEMENTED; -} - +VOID +FASTCALL +HalClearSoftwareInterrupt(IN KIRQL Request) +{ + ULONG Interrupt = 0; + + // + // Get the interrupt that maches this IRQL level + // + switch (Request) + { + case APC_LEVEL: + + Interrupt = 1 << 1; + break; + + case DISPATCH_LEVEL: + + Interrupt = 1 << 2; + break; + + default: + + ASSERT(FALSE); + } + + // + // Force a software interrupt + // + DPRINT1("About to kill interrupt mask: %d\n", Interrupt); + WRITE_REGISTER_ULONG(VICSOFTINTCLEAR, Interrupt); +} VOID NTAPI Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -78,8 +78,8 @@ ULONG SvcSp; ULONG SvcLr; ULONG Pc; -// UCHAR OldIrql; -// UCHAR PreviousMode; + ULONG OldIrql; +// UCHAR PreviousMode; // ULONG Fpscr; // ULONG FpExc; // ULONG S[33]; Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -83,6 +83,12 @@ return a; } + +static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +{ + return _InterlockedExchange(Target, Value); +} + static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) { char x; @@ -276,5 +282,13 @@ ); } +#ifndef __MSVCRT__ +static __inline__ __attribute__((always_inline)) unsigned long _rotl(const unsigned long value, const unsigned char shift) +{ + return (((value) << ((int)(shift))) | ((value) >> (32 - (int)(shift)))); +} +#endif + + #endif /* EOF */ Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/armddk.h [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -53,7 +53,9 @@ // On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA // #ifdef _WINNT_H -#define PKINTERRUPT_ROUTINE PVOID // Hack! +typedef +VOID +(*PKINTERRUPT_ROUTINE)(VOID); #endif typedef struct _KPCR { @@ -85,7 +87,7 @@ PVOID InstructionBusError; ULONG CachePolicy; ULONG AlignedCachePolicy; -// UCHAR IrqlMask[64]; + UCHAR IrqlMask[HIGH_LEVEL + 1]; ULONG IrqlTable[HIGH_LEVEL + 1]; UCHAR CurrentIrql; KAFFINITY SetMember; Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -33,7 +33,7 @@ #define debugstr_a #endif -extern FILE _iob[]; +//extern FILE _iob[]; /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -895,7 +895,7 @@ { KLOCK_QUEUE_HANDLE LockHandle; ERESOURCE_THREAD Thread; - POWNER_ENTRY Owner; + POWNER_ENTRY Owner = NULL; BOOLEAN FirstEntryBusy; /* Get the thread */ Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -142,7 +142,7 @@ // // Point to the same template // - Pcr->InterruptRoutine[i] = &KxUnexpectedInterrupt.DispatchCode; + Pcr->InterruptRoutine[i] = (PVOID)&KxUnexpectedInterrupt.DispatchCode; } // Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -42,7 +42,6 @@ // // Internal Ke Arch-Specific Helpers // -GENERATE_ARM_STUB KiDispatchInterrupt GENERATE_ARM_STUB KiSaveProcessorControlState GENERATE_ARM_STUB KiInitializeUserApc GENERATE_ARM_STUB KeDisableInterrupts @@ -69,3 +68,4 @@ GENERATE_ARM_STUB RtlpGetStackLimits GENERATE_ARM_STUB KdpGdbStubInit +GENERATE_ARM_STUB MmDbgTranslatePhysicalAddress Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -142,6 +142,11 @@ mov r2, sp // + // Dummy OldIrql + // + //str r0, [sp, #-4]! + + // // Save the abort lr // str r0, [sp, #-4]! @@ -217,6 +222,91 @@ NESTED_ENTRY KiInterruptException PROLOG_END KiInterruptException + // + // Fixup lr + // + sub lr, lr, #4 + + // + // Save the bottom 4 registers + // + stmdb sp, {r0-r3} + + // + // Save the IRQ lr, sp, spsr, cpsr + // + mov r0, lr + mov r1, sp + mrs r2, cpsr + mrs r3, spsr + + // + // Switch to SVC mode + // + bic r2, r2, #CPSR_MODES + orr r2, r2, #CPSR_SVC_MODE + msr cpsr_c, r2 + + // + // Save the SVC sp before we modify it + // + mov r2, sp + + // + // Dummy OldIrql + // + //str r0, [sp, #-4]! + + // + // Save the IRQ lr + // + str r0, [sp, #-4]! + + // + // Save the SVC lr and sp + // + str lr, [sp, #-4]! + str r2, [sp, #-4]! + + // + // Restore the saved SPSR + // + msr spsr_all, r3 + + // + // Restore our 4 registers + // + ldmdb r1, {r0-r3} + + // + // Make space for the trap frame + // + sub sp, sp, #(4*15) // TrapFrameLength + + // + // Save user-mode registers + // + stmia sp, {r0-r12} + add r0, sp, #(4*13) + stmia r0, {r13-r14}^ + mov r0, r0 + + // + // Save SPSR + // + mrs r0, spsr_all + str r0, [sp, #-4]! + + // + // Call the C handler + // + adr lr, IntExit + mov r0, sp + mov r1, #0 + ldr pc, =KiInterruptHandler + +IntExit: + // // FIXME: TODO // Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -27,6 +27,166 @@ /* FUNCTIONS ******************************************************************/ + +ULONG +HalGetInterruptSource(VOID); + +VOID FASTCALL +HalClearSoftwareInterrupt(IN KIRQL Request); + +VOID +KiDispatchInterrupt(VOID) +{ + PKPCR Pcr; + PKTHREAD NewThread, OldThread; + + // + // Get the PCR and disable interrupts + // + Pcr = (PKPCR)KeGetPcr(); + _disable(); + + // + //Check if we have to deliver DPCs, timers, or deferred threads + // + if ((Pcr->Prcb->DpcData[0].DpcQueueDepth) || + (Pcr->Prcb->TimerRequest) || + (Pcr->Prcb->DeferredReadyListHead.Next)) + { + // + // FIXME: TODO + // + DPRINT1("DPC/Timer Delivery!\n"); + while (TRUE); + } + + // + // Re-enable interrupts + // + _enable(); + + // + // Check for quantum end + // + if (Pcr->Prcb->QuantumEnd) + { + // + // FIXME: TODO + // + DPRINT1("Quantum End!\n"); + while (TRUE); + return; + } + + // + // Check if we have a thread to swap to + // + if (Pcr->Prcb->NextThread) + { + DPRINT1("Switching threads!\n"); + + // + // Next is now current + // + OldThread = Pcr->Prcb->CurrentThread; + NewThread = Pcr->Prcb->NextThread; + Pcr->Prcb->CurrentThread = NewThread; + Pcr->Prcb->NextThread = NULL; + + // + // Update thread states + // + NewThread->State = Running; + OldThread->WaitReason = WrDispatchInt; + + // + // Make the old thread ready + // + DPRINT1("Queueing the ready thread\n"); + KxQueueReadyThread(OldThread, Pcr->Prcb); + + // + // Swap to the new thread + // + DPRINT1("Swapping context!\n"); + //KiSwapContextInternal(); + while (TRUE); + } +} + +VOID +KiInterruptHandler(IN PKTRAP_FRAME TrapFrame, + IN ULONG Reserved) +{ + KIRQL OldIrql, Irql; + ULONG InterruptCause, InterruptMask; + PKPCR Pcr; + + // + // Get the old IRQL + // + OldIrql = TrapFrame->OldIrql; + + // + // Get the interrupt source + // + InterruptCause = HalGetInterruptSource(); + DPRINT1("Interrupt (%x) @ %p %p\n", InterruptCause, TrapFrame->SvcLr, TrapFrame->Pc); + + // + // Get the new IRQL and Interrupt Mask + // + Pcr = (PKPCR)KeGetPcr(); + Irql = Pcr->IrqlMask[InterruptCause]; + InterruptMask = Pcr->IrqlTable[Irql]; + DPRINT1("IRQL (%x) MASK (%x)\n", Irql, InterruptMask); + + // + // Make sure the IRQL is valid + // + //if (OldIrql < Irql) + //{ + // + // We should just return, probably + // + //DPRINT1("IRQL Race!\n"); + //while (TRUE); + //} + + // + // Check if this interrupt is at DISPATCH or higher + // + if (Irql > DISPATCH_LEVEL) + { + // + // ISR Handling Code + // + DPRINT1("ISR!\n"); + while (TRUE); + } + + // + // We know this is APC or DPC. + // Clear the software interrupt. + // Reenable interrupts and update the IRQL + // + HalClearSoftwareInterrupt(Irql); + _enable(); + Pcr->CurrentIrql = Irql; + + // + // Increment interrupt count + // + Pcr->Prcb->InterruptCount++; + + // + // Call the registered interrupt routine + // + DPRINT1("Calling handler\n"); + Pcr->InterruptRoutine[Irql](); + DPRINT1("Done!\n"); + while (TRUE); +} NTSTATUS KiDataAbortHandler(IN PKTRAP_FRAME TrapFrame) Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -403,6 +403,11 @@ <file>psctx.c</file> </directory> </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>psctx.c</file> + </directory> + </if> <file>debug.c</file> <file>job.c</file> <file>kill.c</file> Added: trunk/reactos/ntoskrnl/ps/arm/psctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/arm/psctx.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ps/arm/psctx.c (added) +++ trunk/reactos/ntoskrnl/ps/arm/psctx.c [iso-8859-1] Wed Jun 11 11:48:07 2008 @@ -1,0 +1,47 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ps/arm/pxctx.c + * PURPOSE: Process Manager: Set/Get Context for ARM + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +PspGetContext(IN PKTRAP_FRAME TrapFrame, + IN PVOID NonVolatileContext, + IN OUT PCONTEXT Context) +{ + PAGED_CODE(); +} + +VOID +NTAPI +PspSetContext(OUT PKTRAP_FRAME TrapFrame, + OUT PVOID NonVolatileContext, + IN PCONTEXT Context, + IN KPROCESSOR_MODE Mode) +{ + PAGED_CODE(); +} + +VOID +NTAPI +PspGetOrSetContextKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArgument2) +{ + UNIMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/ps/arm/psctx.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ps/arm/psctx.c ------------------------------------------------------------------------------ svn:eol-tyle = native Propchange: trunk/reactos/ntoskrnl/ps/arm/psctx.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

16 years, 3 months

[mkupfer] 33932: - minor fix of german wordpad menu entry - german translation of dialog resource of keyboard layout switcher completed including start menu entry

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Jun 11 07:31:23 2008 New Revision: 33932 URL: http://svn.reactos.org/svn/reactos?rev=33932&view=rev Log: - minor fix of german wordpad menu entry - german translation of dialog resource of keyboard layout switcher completed including start menu entry Modified: trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Wed Jun 11 07:31:23 2008 @@ -78,7 +78,7 @@ MENUITEM "Sch&riftart...", ID_FONTSETTINGS MENUITEM "Auf&zählungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT - MENUITEM "&Tabsstopps..." ID_TABSTOPS + MENUITEM "&Tabstopps..." ID_TABSTOPS POPUP "&Hintergrund" BEGIN MENUITEM "&System\tStrg+1", ID_BACK_1 Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Wed Jun 11 07:31:23 2008 @@ -47,22 +47,22 @@ IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Tastenkombination ändern" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "&Eingabesprache umschalten", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "Shift", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + AUTORADIOBUTTON "&Strg", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "&Alt links", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "&Tastaturlayout umschalten", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Shift", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 - AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "S&trg", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "A&lt links", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 172, 27, 52, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -90,13 +90,13 @@ IDS_WHATS_THIS "Was ist das?" IDS_LANGUAGE "Sprache" IDS_LAYOUT "Tastaturlayout" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." - IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REM_QUESTION "Möchten Sie das gewählte Tastaturlayout entfernen?" + IDS_CONFIRMATION "Bestätigung" + IDS_LAYOUT_EXISTS "Dieses Layout existiert bereits." + IDS_LAYOUT_EXISTS2 "Dieses Layout existiert bereits und kann nicht hinzugefügt werden." + IDS_CTRL_SHIFT "Strg+Shift" + IDS_LEFT_ALT_SHIFT "Alt links+Shift" + IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed Jun 11 07:31:23 2008 @@ -219,7 +219,7 @@ BEGIN IDS_SYS_TOOLS "Systemprogramme" IDS_CMT_CHARMAP "Zeichentabelle" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_KBSWITCH "Tastaturlayout-Umschalter" END @@ -259,7 +259,7 @@ IDS_SHORT_CHARMAP "Zeichentabelle.lnk" IDS_SHORT_MAGNIFY "Bildschirmlupe.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_KBSWITCH "Tastaturlayout-Umschalter.lnk" END STRINGTABLE

16 years, 3 months

[fireball] 33931: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 11 07:00:09 2008 New Revision: 33931 URL: http://svn.reactos.org/svn/reactos?rev=33931&view=rev Log: - Fix build. Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Jun 11 07:00:09 2008 @@ -1105,15 +1105,15 @@ /* FIXME: Check if Machine Type and SubSys Version Match */ /* We don't support POSIX or anything else for now */ - if (IMAGE_SUBSYSTEM_WINDOWS_GUI != SectionImageInfo.SubsystemType && - IMAGE_SUBSYSTEM_WINDOWS_CUI != SectionImageInfo.SubsystemType) - { - DPRINT1("Invalid subsystem %d\n", SectionImageInfo.SubsystemType); + if (IMAGE_SUBSYSTEM_WINDOWS_GUI != SectionImageInfo.SubSystemType && + IMAGE_SUBSYSTEM_WINDOWS_CUI != SectionImageInfo.SubSystemType) + { + DPRINT1("Invalid subsystem %d\n", SectionImageInfo.SubSystemType); SetLastError(ERROR_BAD_EXE_FORMAT); goto Cleanup; } - if (IMAGE_SUBSYSTEM_WINDOWS_GUI == SectionImageInfo.SubsystemType) + if (IMAGE_SUBSYSTEM_WINDOWS_GUI == SectionImageInfo.SubSystemType) { /* Do not create a console for GUI applications */ dwCreationFlags &= ~CREATE_NEW_CONSOLE; @@ -1329,7 +1329,7 @@ /* Duplicate the handles if needed */ if (!bInheritHandles && !(StartupInfo.dwFlags & STARTF_USESTDHANDLES) && - SectionImageInfo.SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) + SectionImageInfo.SubSystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) { PRTL_USER_PROCESS_PARAMETERS RemoteParameters;

16 years, 3 months

[fireball] 33930: - Fix typos in NDK structures.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 11 06:48:59 2008 New Revision: 33930 URL: http://svn.reactos.org/svn/reactos?rev=33930&view=rev Log: - Fix typos in NDK structures. Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Wed Jun 11 06:48:59 2008 @@ -304,17 +304,17 @@ ULONG ZeroBits; ULONG MaximumStackSize; ULONG CommittedStackSize; - ULONG SubsystemType; + ULONG SubSystemType; USHORT SubSystemMinorVersion; USHORT SubSystemMajorVersion; ULONG GpValue; USHORT ImageCharacteristics; - USHORT DllChracteristics; + USHORT DllCharacteristics; USHORT Machine; UCHAR ImageContainsCode; UCHAR Spare1; ULONG LoaderFlags; - ULONG ImageFileSIze; + ULONG ImageFileSize; ULONG Reserved[1]; } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; @@ -369,7 +369,7 @@ ULONG NumberOfCommittedPages; PMMEXTEND_INFO ExtendInfo; SEGMENT_FLAGS SegmentFlags; - PVOID BaseAddress; + PVOID BasedAddress; union { SIZE_T ImageCommitment; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jun 11 06:48:59 2008 @@ -4262,7 +4262,7 @@ Sii->TransferAddress = (PVOID)ImageSectionObject->EntryPoint; Sii->MaximumStackSize = ImageSectionObject->StackReserve; Sii->CommittedStackSize = ImageSectionObject->StackCommit; - Sii->SubsystemType = ImageSectionObject->Subsystem; + Sii->SubSystemType = ImageSectionObject->Subsystem; Sii->SubSystemMinorVersion = ImageSectionObject->MinorSubsystemVersion; Sii->SubSystemMajorVersion = ImageSectionObject->MajorSubsystemVersion; Sii->ImageCharacteristics = ImageSectionObject->ImageCharacteristics;

16 years, 3 months

[fireball] 33929: - Unregress KDBG: It has to increment EIP in case of STATUS_BREAKPOINT to skip over the current instruction, but now do it inside KDBG's exception handler. - In Kd and GDB exception handler wrappers, return FALSE if kdDoNotHandleException, and return TRUE otherwise (kdHandled / kdContinue). After my previous commit these functions were always returning FALSE / exception not handled.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 11 06:34:04 2008 New Revision: 33929 URL: http://svn.reactos.org/svn/reactos?rev=33929&view=rev Log: - Unregress KDBG: It has to increment EIP in case of STATUS_BREAKPOINT to skip over the current instruction, but now do it inside KDBG's exception handler. - In Kd and GDB exception handler wrappers, return FALSE if kdDoNotHandleException, and return TRUE otherwise (kdHandled / kdContinue). After my previous commit these functions were always returning FALSE / exception not handled. Modified: trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Wed Jun 11 06:34:04 2008 @@ -167,7 +167,7 @@ /* Convert return to BOOLEAN */ if (Return == kdDoNotHandleException) return FALSE; - return FALSE; + return TRUE; } BOOLEAN @@ -196,7 +196,7 @@ /* Convert return to BOOLEAN */ if (Return == kdDoNotHandleException) return FALSE; - return FALSE; + return TRUE; } /* PUBLIC FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Wed Jun 11 06:34:04 2008 @@ -1269,7 +1269,7 @@ * * \param ExceptionRecord Unused. * \param PreviousMode UserMode if the exception was raised from umode, otherwise KernelMode. - * \param Context Unused. + * \param Context Context, IN/OUT parameter. * \param TrapFrame Exception TrapFrame. * \param FirstChance TRUE when called before exception frames were serached, * FALSE for the second call. @@ -1280,7 +1280,7 @@ KdbEnterDebuggerException( IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, IN KPROCESSOR_MODE PreviousMode, - IN PCONTEXT Context OPTIONAL, + IN PCONTEXT Context, IN OUT PKTRAP_FRAME TrapFrame, IN BOOLEAN FirstChance) { @@ -1324,12 +1324,6 @@ if (ExceptionCode == STATUS_BREAKPOINT) { - /* - * The breakpoint will point to the next instruction by default so - * point it back to the start of original instruction. - */ - //TrapFrame->Eip--; - /* * ... and restore the original instruction. */ @@ -1618,6 +1612,8 @@ /* Clear dr6 status flags. */ TrapFrame->Dr6 &= ~0x0000e00f; + /* Skip the current instruction */ + Context->Eip++; } return ContinueType;

16 years, 3 months

[fireball] 33928: - Revert 33689 as breaking mIRC installation. See issue #3328 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 11 04:05:39 2008 New Revision: 33928 URL: http://svn.reactos.org/svn/reactos?rev=33928&view=rev Log: - Revert 33689 as breaking mIRC installation. See issue #3328 for more details. Modified: trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Wed Jun 11 04:05:39 2008 @@ -421,22 +421,15 @@ LPSTR lpClassName, int nMaxCount) { - UNICODE_STRING ClassName; - INT Result; - - ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); - ClassName.Buffer = LocalAlloc(LMEM_FIXED, ClassName.MaximumLength); - if (ClassName.Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - Result = NtUserGetClassName(hWnd, FALSE, &ClassName); - - WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Result, lpClassName, nMaxCount - 1, NULL, NULL); - lpClassName[nMaxCount - 1] = '\0'; - LocalFree(ClassName.Buffer); + ANSI_STRING ClassName; + int Result; + + ClassName.MaximumLength = nMaxCount; + ClassName.Buffer = lpClassName; + + Result = NtUserGetClassName(hWnd, + (PUNICODE_STRING)&ClassName, + TRUE); TRACE("%p class/atom: %s/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -463,7 +456,9 @@ ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); ClassName.Buffer = lpClassName; - Result = NtUserGetClassName(hWnd, FALSE, &ClassName); + Result = NtUserGetClassName(hWnd, + &ClassName, + FALSE); TRACE("%p class/atom: %S/%04x %x\n", hWnd, IS_ATOM(lpClassName) ? NULL : lpClassName, @@ -634,24 +629,12 @@ UINT STDCALL RealGetWindowClassW( - HWND hWnd, + HWND hwnd, LPWSTR pszType, UINT cchType) { - UNICODE_STRING ClassName; - UINT Length; - - ClassName.MaximumLength = cchType * sizeof(WCHAR); - ClassName.Buffer = pszType; - - Length = NtUserGetClassName(hWnd, TRUE, &ClassName); - - TRACE("%p class/atom: %S/%04x %x\n", hWnd, - IS_ATOM(pszType) ? NULL : pszType, - IS_ATOM(pszType) ? pszType : 0, - cchType); - - return Length; + /* FIXME: Implement correct functionality of RealGetWindowClass */ + return GetClassNameW(hwnd,pszType,cchType); } @@ -661,33 +644,12 @@ UINT STDCALL RealGetWindowClassA( - HWND hWnd, + HWND hwnd, LPSTR pszType, UINT cchType) { - UNICODE_STRING ClassName; - UINT Length; - - ClassName.MaximumLength = cchType * sizeof(WCHAR); - ClassName.Buffer = LocalAlloc(LMEM_FIXED, ClassName.MaximumLength); - if (ClassName.Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - Length = NtUserGetClassName(hWnd, TRUE, &ClassName); - - WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Length, pszType, cchType - 1, NULL, NULL); - pszType[cchType - 1] = '\0'; - LocalFree(ClassName.Buffer); - - TRACE("%p class/atom: %s/%04x %x\n", hWnd, - IS_ATOM(pszType) ? NULL : pszType, - IS_ATOM(pszType) ? pszType : 0, - cchType); - - return Length; + /* FIXME: Implement correct functionality of RealGetWindowClass */ + return GetClassNameA(hwnd,pszType,cchType); } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jun 11 04:05:39 2008 @@ -1255,11 +1255,18 @@ LPWSTR *ppszMenuName, BOOL Ansi); -UINT +INT NTAPI NtUserGetClassName(HWND hWnd, - BOOL bGetRealClass, // 0 GetClassNameA/W, 1 RealGetWindowClassA/W + PUNICODE_STRING ClassName, + BOOL Ansi); +#if 0 // Real NtUserGetClassName +INT +NTAPI +NtUserGetClassName(HWND hWnd, + BOOL Unknown, // 0 GetClassNameW, 1 RealGetWindowClassA/W PUNICODE_STRING ClassName); +#endif HANDLE NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Wed Jun 11 04:05:39 2008 @@ -1264,39 +1264,118 @@ INT UserGetClassName(IN PWINDOWCLASS Class, - IN OUT PUNICODE_STRING ClassName) + IN OUT PUNICODE_STRING ClassName, + IN BOOL Ansi) { NTSTATUS Status = STATUS_SUCCESS; - ULONG BufLen; + WCHAR szStaticTemp[32]; + PWSTR szTemp = NULL; + ULONG BufLen = sizeof(szStaticTemp); INT Ret = 0; /* Note: Accessing the buffer in ClassName may raise an exception! */ _SEH_TRY { - BufLen = ClassName->MaximumLength; - - /* query the atom name */ - Status = RtlQueryAtomInAtomTable(gAtomTable, - Class->Atom, - NULL, - NULL, - ClassName->Buffer, - &BufLen); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - _SEH_LEAVE; - } - - Ret = BufLen / sizeof(WCHAR); + if (Ansi) + { + PANSI_STRING AnsiClassName = (PANSI_STRING)ClassName; + UNICODE_STRING UnicodeClassName; + + /* limit the size of the static buffer on the stack to the + size of the buffer provided by the caller */ + if (BufLen / sizeof(WCHAR) > AnsiClassName->MaximumLength) + { + BufLen = AnsiClassName->MaximumLength * sizeof(WCHAR); + } + + /* find out how big the buffer needs to be */ + Status = RtlQueryAtomInAtomTable(gAtomTable, + Class->Atom, + NULL, + NULL, + szStaticTemp, + &BufLen); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + if (BufLen / sizeof(WCHAR) > AnsiClassName->MaximumLength) + { + /* the buffer required exceeds the ansi buffer provided, + pretend like we're using the ansi buffer and limit the + size to the buffer size provided */ + BufLen = AnsiClassName->MaximumLength * sizeof(WCHAR); + } + + /* allocate a temporary buffer that can hold the unicode class name */ + szTemp = ExAllocatePool(PagedPool, + BufLen); + if (szTemp == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + _SEH_LEAVE; + } + + /* query the class name */ + Status = RtlQueryAtomInAtomTable(gAtomTable, + Class->Atom, + NULL, + NULL, + szTemp, + &BufLen); + } + else + szTemp = szStaticTemp; + + if (NT_SUCCESS(Status)) + { + /* convert the atom name to ansi */ + + RtlInitUnicodeString(&UnicodeClassName, + szTemp); + + Status = RtlUnicodeStringToAnsiString(AnsiClassName, + &UnicodeClassName, + FALSE); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + _SEH_LEAVE; + } + } + + Ret = BufLen / sizeof(WCHAR); + } + else /* !Ansi */ + { + BufLen = ClassName->MaximumLength; + + /* query the atom name */ + Status = RtlQueryAtomInAtomTable(gAtomTable, + Class->Atom, + NULL, + NULL, + ClassName->Buffer, + &BufLen); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + _SEH_LEAVE; + } + + Ret = BufLen / sizeof(WCHAR); + } } _SEH_HANDLE { SetLastNtError(_SEH_GetExceptionCode()); } _SEH_END; + + if (Ansi && szTemp != NULL && szTemp != szStaticTemp) + { + ExFreePool(szTemp); + } return Ret; } @@ -2195,10 +2274,10 @@ -UINT NTAPI -NtUserGetClassName(IN HWND hWnd, - IN BOOL bGetRealClass, // 0 GetClassNameA/W, 1 RealGetWindowClassA/W - OUT PUNICODE_STRING ClassName) +INT NTAPI +NtUserGetClassName (IN HWND hWnd, + OUT PUNICODE_STRING ClassName, + IN BOOL Ansi) { PWINDOW_OBJECT Window; UNICODE_STRING CapturedClassName; @@ -2214,11 +2293,10 @@ ProbeForWriteUnicodeString(ClassName); CapturedClassName = *ClassName; - /* TODO: Get real class name here if bGetRealClass == TRUE */ - /* get the class name */ Ret = UserGetClassName(Window->Wnd->Class, - &CapturedClassName); + &CapturedClassName, + Ansi); if (Ret != 0) {

16 years, 3 months

← Newer
1
...
27
28
29
30
31
32
33
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008