Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[hbelusca] 68855: [i8042prt] Improve debugging experience when pressing Tab+k, at least with WinDBG, by breaking with a suitable control code (adopt the SysRq one even if we don't use SysRq key for...
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 13:53:55 2015 New Revision: 68855 URL: http://svn.reactos.org/svn/reactos?rev=68855&view=rev Log: [i8042prt] Improve debugging experience when pressing Tab+k, at least with WinDBG, by breaking with a suitable control code (adopt the SysRq one even if we don't use SysRq key for breaking, but instead, Tab+k). Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Sat Aug 29 13:53:55 2015 @@ -855,7 +855,7 @@ if (InputData->MakeCode == 0x25) { /* k - Breakpoint */ - DbgBreakPoint(); + DbgBreakPointWithStatus(DBG_STATUS_SYSRQ); } else if (InputData->MakeCode == 0x30) {

1 0

[hbelusca] 68854: [NTOS] Addendum to r68851: - Reset the state of the worker thread *after* having captured the data, not before. - Fix the explanations given in comments.
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 12:53:08 2015 New Revision: 68854 URL: http://svn.reactos.org/svn/reactos?rev=68854&view=rev Log: [NTOS] Addendum to r68851: - Reset the state of the worker thread *after* having captured the data, not before. - Fix the explanations given in comments. Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -16,7 +16,7 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread data + * WinDBG Debugger Worker State Machine data */ WORK_QUEUE_ITEM ExpDebuggerWorkItem; /* @@ -33,19 +33,22 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread - * - * A worker thread is queued whenever WinDBG wants to attach or kill a user-mode + * WinDBG Debugger Worker State Machine + * + * This functionality is used whenever WinDBG wants to attach or kill a user-mode * process from within live kernel-mode session, and/or page-in an address region. + * It is implemented as a state machine: when it is in "Ready" state, WinDBG can + * initialize the data for the state machine, then switch its state to "Start". + * The worker thread balance manager detects this, switches the state to "Initialized" + * and queues a worker thread. As long as the state is not "Ready" again, WinDBG + * prevents from requeuing a new thread. When the thread is started, it captures + * all the data, then resets the machine state to "Ready", thus allowing WinDBG + * to requeue another worker thread. * * WinDBG commands: * .process /i <addr> (where <addr> is the address of the EPROCESS block for this process) * .kill <addr> ( " " " " ) * .pagein <addr> (where <addr> is the address to page in) - * - * The implementation is very naive because the same data is reused, so that if - * the worker thread has not started before WinDBG sends fresh new data again, - * then only the latest data is taken into account. */ VOID NTAPI @@ -59,22 +62,25 @@ UNREFERENCED_PARAMETER(Context); /* Be sure we were started in an initialized state */ - ASSERTMSG("ExpDebuggerWorker being entered with state != 2\n", + ASSERTMSG("ExpDebuggerWorker being entered in non-initialized state!\n", ExpDebuggerWork == WinKdWorkerInitialized); - if (ExpDebuggerWork != WinKdWorkerInitialized) return; - - /* Reset the worker flag to the disabled state */ - ExpDebuggerWork = WinKdWorkerDisabled; + if (ExpDebuggerWork != WinKdWorkerInitialized) + { + /* An error happened, so get a chance to restart proper */ + ExpDebuggerWork = WinKdWorkerReady; + return; + } /* Get the processes to be attached or killed, and the address to page in */ ProcessToAttach = ExpDebuggerProcessAttach; ProcessToKill = ExpDebuggerProcessKill; PageInAddress = ExpDebuggerPageIn; - /* Reset to their default values */ + /* Reset the state machine to its ready state */ ExpDebuggerProcessAttach = NULL; ExpDebuggerProcessKill = NULL; ExpDebuggerPageIn = (ULONG_PTR)NULL; + ExpDebuggerWork = WinKdWorkerReady; /* Default to the current process if we don't find the process to be attached or killed */ Process = NULL; Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=688… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -491,7 +491,7 @@ * If WinDBG wants to attach or kill a user-mode process, and/or * page-in an address region, queue a debugger worker thread. */ - if (ExpDebuggerWork == WinKdWorkerActivate) + if (ExpDebuggerWork == WinKdWorkerStart) { ExInitializeWorkItem(&ExpDebuggerWorkItem, ExpDebuggerWorker, NULL); ExpDebuggerWork = WinKdWorkerInitialized; Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Aug 29 12:53:08 2015 @@ -44,12 +44,12 @@ // #ifdef _WINKD_ /* - * WinDBG Debugger Worker Thread data (see dbgctrl.c) + * WinDBG Debugger Worker State Machine data (see dbgctrl.c) */ typedef enum _WINKD_WORKER_STATE { - WinKdWorkerDisabled = 0, - WinKdWorkerActivate, + WinKdWorkerReady = 0, + WinKdWorkerStart, WinKdWorkerInitialized } WINKD_WORKER_STATE;

1 0

[tfaber] 68853: [FUSION] - Add missing psdk dependency to fusion_common
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 07:41:52 2015 New Revision: 68853 URL: http://svn.reactos.org/svn/reactos?rev=68853&view=rev Log: [FUSION] - Add missing psdk dependency to fusion_common Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat Aug 29 07:41:52 2015 @@ -13,6 +13,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) add_library(fusion_common STATIC ${COMMON_SOURCE}) +add_dependencies(fusion_common psdk) add_library(fusion SHARED version.rc

1 0

[tfaber] 68852: [NTOS:EX] - Remove superfluous dereference in NtCreateProfile - Allocate the right size for KPROFILE object - Don't leak the KPROFILE when deleting an EPROFILE - Avoid some casts CO...
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 07:35:59 2015 New Revision: 68852 URL: http://svn.reactos.org/svn/reactos?rev=68852&view=rev Log: [NTOS:EX] - Remove superfluous dereference in NtCreateProfile - Allocate the right size for KPROFILE object - Don't leak the KPROFILE when deleting an EPROFILE - Avoid some casts CORE-10066 Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 07:35:59 2015 @@ -42,7 +42,7 @@ ULONG State; /* Typecast the Object */ - Profile = (PEPROFILE)ObjectBody; + Profile = ObjectBody; /* Check if there if the Profile was started */ if (Profile->LockedBufferAddress) @@ -55,6 +55,7 @@ MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); IoFreeMdl(Profile->Mdl); + ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE); } /* Check if a Process is associated and reference it */ @@ -247,7 +248,6 @@ 0, NULL, &hProfile); - ObDereferenceObject(Profile); /* Check for Success */ if (!NT_SUCCESS(Status)) @@ -361,7 +361,7 @@ /* Allocate a Kernel Profile Object. */ ProfileObject = ExAllocatePoolWithTag(NonPagedPool, - sizeof(EPROFILE), + sizeof(*ProfileObject), TAG_PROFILE); if (!ProfileObject) { @@ -396,7 +396,7 @@ /* Initialize the Kernel Profile Object */ Profile->ProfileObject = ProfileObject; KeInitializeProfile(ProfileObject, - (PKPROCESS)Profile->Process, + &Profile->Process->Pcb, Profile->RangeBase, Profile->RangeSize, Profile->BucketSize,

1 0

[hbelusca] 68851: [NTOS] Implement the WinDBG Debugger Worker Thread, which is created inside a target process whenever one uses the ".process /i <addr>" (invasive debugging) command using WinDBG i...
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 02:03:56 2015 New Revision: 68851 URL: http://svn.reactos.org/svn/reactos?rev=68851&view=rev Log: [NTOS] Implement the WinDBG Debugger Worker Thread, which is created inside a target process whenever one uses the ".process /i <addr>" (invasive debugging) command using WinDBG in kernel-mode debugging. See https://www.microsoftpressstore.com/articles/article.aspx?p=2201303&seqNum=2 section "Switching the Current Process Context" (from the book "Inside Windows Debugging" by Tarik Soulami, pp.101-102) for more details. The names of the variables must be kept as they are, because WinDBG (more exactly, dbgeng.dll) searches for them within the kernel symbols and retrieves their addresses (since those variables are not publicly exported). Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c [iso-8859-1] Sat Aug 29 02:03:56 2015 @@ -12,7 +12,131 @@ #define NDEBUG #include <debug.h> +/* DATA **********************************************************************/ + +// #ifdef _WINKD_ +/* + * WinDBG Debugger Worker Thread data + */ +WORK_QUEUE_ITEM ExpDebuggerWorkItem; +/* + * The following global variables must be visible through all the kernel + * because WinDBG explicitely search for them inside our symbols. + */ +WINKD_WORKER_STATE ExpDebuggerWork; +PEPROCESS ExpDebuggerProcessAttach; +PEPROCESS ExpDebuggerProcessKill; +ULONG_PTR ExpDebuggerPageIn; +// #endif /* _WINKD_ */ + /* FUNCTIONS *****************************************************************/ + +// #ifdef _WINKD_ +/* + * WinDBG Debugger Worker Thread + * + * A worker thread is queued whenever WinDBG wants to attach or kill a user-mode + * process from within live kernel-mode session, and/or page-in an address region. + * + * WinDBG commands: + * .process /i <addr> (where <addr> is the address of the EPROCESS block for this process) + * .kill <addr> ( " " " " ) + * .pagein <addr> (where <addr> is the address to page in) + * + * The implementation is very naive because the same data is reused, so that if + * the worker thread has not started before WinDBG sends fresh new data again, + * then only the latest data is taken into account. + */ +VOID +NTAPI +ExpDebuggerWorker(IN PVOID Context) +{ + PEPROCESS ProcessToAttach, ProcessToKill; + ULONG_PTR PageInAddress; + PEPROCESS Process; + KAPC_STATE ApcState; + + UNREFERENCED_PARAMETER(Context); + + /* Be sure we were started in an initialized state */ + ASSERTMSG("ExpDebuggerWorker being entered with state != 2\n", + ExpDebuggerWork == WinKdWorkerInitialized); + if (ExpDebuggerWork != WinKdWorkerInitialized) return; + + /* Reset the worker flag to the disabled state */ + ExpDebuggerWork = WinKdWorkerDisabled; + + /* Get the processes to be attached or killed, and the address to page in */ + ProcessToAttach = ExpDebuggerProcessAttach; + ProcessToKill = ExpDebuggerProcessKill; + PageInAddress = ExpDebuggerPageIn; + + /* Reset to their default values */ + ExpDebuggerProcessAttach = NULL; + ExpDebuggerProcessKill = NULL; + ExpDebuggerPageIn = (ULONG_PTR)NULL; + + /* Default to the current process if we don't find the process to be attached or killed */ + Process = NULL; + + /* Check if we need to attach or kill some process */ + if (ProcessToAttach != NULL || ProcessToKill != NULL) + { + /* Find the process in the list */ + Process = PsGetNextProcess(Process); + while (Process) + { + /* Is this the process we want to attach to? */ + if (Process == ProcessToAttach) + { + /* Yes, attach ourselves to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + break; + } + /* Or is this the process we want to kill? */ + else if (Process == ProcessToKill) + { + /* Yes, kill and dereference it, then return */ + PsTerminateProcess(Process, DBG_TERMINATE_PROCESS); + ObDereferenceObject(Process); + return; + } + + /* Get the next process */ + Process = PsGetNextProcess(Process); + } + + /* We either have found a process, or we default to the current process */ + } + + /* If we have an address to page in... */ + if (PageInAddress) + { + /* ... try to do it by attempting to read at this address */ + _SEH2_TRY + { + ProbeForReadUchar(PageInAddress); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Failed to page in address 0x%p, Status 0x%08lx\n", PageInAddress, _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* Break into the process (or the current one if Process == NULL) */ + DbgBreakPointWithStatus(DBG_STATUS_WORKER); + + /* If we are attached to a process, not the current one... */ + if (Process) + { + /* ... we can detach from the process */ + KeUnstackDetachProcess(&ApcState); + /* Dereference the process which was referenced for us by PsGetNextProcess */ + ObDereferenceObject(Process); + } +} +// #endif /* _WINKD_ */ /*++ * @name NtSystemDebugControl Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=688… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Aug 29 02:03:56 2015 @@ -485,6 +485,19 @@ ObDereferenceObject(ExpLastWorkerThread); PsTerminateSystemThread(STATUS_SYSTEM_SHUTDOWN); } + +// #ifdef _WINKD_ + /* + * If WinDBG wants to attach or kill a user-mode process, and/or + * page-in an address region, queue a debugger worker thread. + */ + if (ExpDebuggerWork == WinKdWorkerActivate) + { + ExInitializeWorkItem(&ExpDebuggerWorkItem, ExpDebuggerWorker, NULL); + ExpDebuggerWork = WinKdWorkerInitialized; + ExQueueWorkItem(&ExpDebuggerWorkItem, DelayedWorkQueue); + } +// #endif /* _WINKD_ */ } } @@ -744,4 +757,3 @@ } /* EOF */ - Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Sat Aug 29 02:03:56 2015 @@ -141,7 +141,7 @@ IN KPROCESSOR_MODE PreviousMode, OUT HANDLE *DebugHandle ); - + extern ULONG DbgkpTraceLevel; extern POBJECT_TYPE DbgkDebugObjectType; Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Aug 29 02:03:56 2015 @@ -42,6 +42,25 @@ extern UNICODE_STRING CmCSDVersionString; extern CHAR NtBuildLab[]; +// #ifdef _WINKD_ +/* + * WinDBG Debugger Worker Thread data (see dbgctrl.c) + */ +typedef enum _WINKD_WORKER_STATE +{ + WinKdWorkerDisabled = 0, + WinKdWorkerActivate, + WinKdWorkerInitialized +} WINKD_WORKER_STATE; + +extern WORK_QUEUE_ITEM ExpDebuggerWorkItem; +extern WINKD_WORKER_STATE ExpDebuggerWork; +extern PEPROCESS ExpDebuggerProcessAttach; +extern PEPROCESS ExpDebuggerProcessKill; +extern ULONG_PTR ExpDebuggerPageIn; +VOID NTAPI ExpDebuggerWorker(IN PVOID Context); +// #endif /* _WINKD_ */ + #ifdef _WIN64 #define HANDLE_LOW_BITS (PAGE_SHIFT - 4) #define HANDLE_HIGH_BITS (PAGE_SHIFT - 3)

1 0

[hbelusca] 68850: [NTDLL] Make its version information compatible with the one of NTOSKRNL (and accessorily its resource file). Addendum to r25937.
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 01:56:11 2015 New Revision: 68850 URL: http://svn.reactos.org/svn/reactos?rev=68850&view=rev Log: [NTDLL] Make its version information compatible with the one of NTOSKRNL (and accessorily its resource file). Addendum to r25937. Modified: trunk/reactos/dll/ntdll/def/ntdll.rc trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/ntdll/include/ntdllp.h Modified: trunk/reactos/dll/ntdll/def/ntdll.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.rc?rev… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.rc [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.rc [iso-8859-1] Sat Aug 29 01:56:11 2015 @@ -1,7 +1,22 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Layer DLL" -#define REACTOS_STR_INTERNAL_NAME "ntdll" -#define REACTOS_STR_ORIGINAL_FILENAME "ntdll.dll" -#include <reactos/version.rc> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: dll/ntdll/def/ntdll.rc + * PURPOSE: Native Library Resource File + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ +#include <winver.h> +#include <ntverp.h> + +/* Version Data */ +#define VER_FILETYPE VFT_DLL +#define VER_FILESUBTYPE VFT2_UNKNOWN +#define VER_FILEDESCRIPTION_STR "NT Layer DLL" +#define VER_INTERNALNAME_STR "ntdll.dll" +#define VER_ORIGINALFILENAME_STR "ntdll.dll" +#define VER_LANGNEUTRAL +#include "common.ver" + +/* NT Status Codes */ #include <ntstatus.rc> Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sat Aug 29 01:56:11 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries * FILE: dll/ntdll/include/ntdll.h - * PURPOSE: Native Libary Header + * PURPOSE: Native Library Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Aug 29 01:56:11 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries * FILE: dll/ntdll/include/ntdllp.h - * PURPOSE: Native Libary Internal Header + * PURPOSE: Native Library Internal Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */

1 0

[gadamopoulos] 68849: [SHELL32] - Only return the flags that the caller asked for in SHELL32_GetFSItemAttributes. Allows us to get rid of a hell lot of calls to CFSFolder::BindToChild which lead to...
by gadamopoulos＠svn.reactos.org 28 Aug '15

28 Aug '15

Author: gadamopoulos Date: Fri Aug 28 15:08:19 2015 New Revision: 68849 URL: http://svn.reactos.org/svn/reactos?rev=68849&view=rev Log: [SHELL32] - Only return the flags that the caller asked for in SHELL32_GetFSItemAttributes. Allows us to get rid of a hell lot of calls to CFSFolder::BindToChild which lead to many calls to FindFirstFile. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Fri Aug 28 15:08:19 2015 @@ -521,7 +521,7 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { - DWORD dwAttributes; + DWORD dwFileAttributes, dwShellAttributes; if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) { @@ -536,35 +536,36 @@ *pdwAttributes &= dwSupportedAttr; } - dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); + dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); /* Set common attributes */ - *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | - SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; - - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - } - else - *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - - if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) - *pdwAttributes |= SFGAO_HIDDEN; - else - *pdwAttributes &= ~SFGAO_HIDDEN; - - if (dwAttributes & FILE_ATTRIBUTE_READONLY) - *pdwAttributes |= SFGAO_READONLY; - else - *pdwAttributes &= ~SFGAO_READONLY; + dwShellAttributes = *pdwAttributes; + dwShellAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; + + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + dwShellAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + } + else + dwShellAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + + if (dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + dwShellAttributes |= SFGAO_HIDDEN; + else + dwShellAttributes &= ~SFGAO_HIDDEN; + + if (dwFileAttributes & FILE_ATTRIBUTE_READONLY) + dwShellAttributes |= SFGAO_READONLY; + else + dwShellAttributes &= ~SFGAO_READONLY; if (SFGAO_LINK & *pdwAttributes) { char ext[MAX_PATH]; if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) - *pdwAttributes &= ~SFGAO_LINK; + dwShellAttributes &= ~SFGAO_LINK; } if (SFGAO_HASSUBFOLDER & *pdwAttributes) @@ -576,10 +577,12 @@ if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) { if (pEnumIL->Skip(1) != S_OK) - *pdwAttributes &= ~SFGAO_HASSUBFOLDER; + dwShellAttributes &= ~SFGAO_HASSUBFOLDER; } } } + + *pdwAttributes &= dwShellAttributes; TRACE ("-- 0x%08x\n", *pdwAttributes); return S_OK;

1 0

[hbelusca] 68848: [NTOS] Fix x64 compilation: - Some KDBG symbols for win32k debugging are defined only in x86 platform when _WINKD_ is disabled. - KdSetOwedBreakpoints is defined only if _WINKD_ i...
by hbelusca＠svn.reactos.org 28 Aug '15

28 Aug '15

Author: hbelusca Date: Fri Aug 28 14:01:58 2015 New Revision: 68848 URL: http://svn.reactos.org/svn/reactos?rev=68848&view=rev Log: [NTOS] Fix x64 compilation: - Some KDBG symbols for win32k debugging are defined only in x86 platform when _WINKD_ is disabled. - KdSetOwedBreakpoints is defined only if _WINKD_ is enabled, addendum for x64 to r68842. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Fri Aug 28 14:01:58 2015 @@ -354,7 +354,7 @@ #endif -#if DBG +#if DBG && defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c #define ID_Win32PreServiceHook 'WSH0' #define ID_Win32PostServiceHook 'WSH1' typedef void (NTAPI *PKDBG_PRESERVICEHOOK)(ULONG, PULONG_PTR); Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Fri Aug 28 14:01:58 2015 @@ -26,8 +26,8 @@ typedef struct { - ULONG ComponentId; - ULONG Level; + ULONG ComponentId; + ULONG Level; } KD_COMPONENT_DATA; #define MAX_KD_COMPONENT_TABLE_ENTRIES 128 KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; @@ -74,6 +74,7 @@ break; } +#if defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c /* Register a debug callback */ case 'CsoR': { @@ -90,6 +91,7 @@ } break; } +#endif /* Special case for stack frame dumps */ case 'DsoR': Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Aug 28 14:01:58 2015 @@ -15,13 +15,17 @@ EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC -EXTERN KdSetOwedBreakpoints:PROC EXTERN KiSystemFatalException:PROC EXTERN KiNpxNotAvailableFaultHandler:PROC EXTERN KiGeneralProtectionFaultHandler:PROC EXTERN KiXmmExceptionHandler:PROC EXTERN KiDeliverApc:PROC EXTERN KiDpcInterruptHandler:PROC + +#ifdef _WINKD_ +EXTERN KdSetOwedBreakpoints:PROC +#endif + /* GLOBALS *******************************************************************/ @@ -509,16 +513,19 @@ /* Check for success */ test eax, eax +#ifndef _WINKD_ + jge PageFaultReturn +#else jl PageFaultError - /* - * We succeeded. Check whether the kernel debugger has - * owed breakpoints to be inserted, then return. - */ + /* Check whether the kernel debugger has owed breakpoints to be inserted */ call KdSetOwedBreakpoints + /* We succeeded, return */ jmp PageFaultReturn PageFaultError: +#endif + /* Disable interrupts again for the debugger */ cli Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 28 14:01:58 2015 @@ -49,7 +49,7 @@ }; PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler; -#if DBG && !defined(_WINKD_) +#if DBG && defined(_M_IX86) && !defined(_WINKD_) PKDBG_PRESERVICEHOOK KeWin32PreServiceHook = NULL; PKDBG_POSTSERVICEHOOK KeWin32PostServiceHook = NULL; #endif @@ -1278,12 +1278,10 @@ if (NT_SUCCESS(Status)) { #ifdef _WINKD_ - /* - * We succeeded. Check whether the kernel debugger has - * owed breakpoints to be inserted, then return. - */ + /* Check whether the kernel debugger has owed breakpoints to be inserted */ KdSetOwedBreakpoints(); #endif + /* We succeeded, return */ KiEoiHelper(TrapFrame); }

1 0

[tfaber] 68847: [CMD] - Avoid statically importing FindFirstStreamW/FindNextStreamW so that our cmd.exe can work on WinXP. - Accept lowercase /r switch
by tfaber＠svn.reactos.org 28 Aug '15

28 Aug '15

Author: tfaber Date: Fri Aug 28 11:39:45 2015 New Revision: 68847 URL: http://svn.reactos.org/svn/reactos?rev=68847&view=rev Log: [CMD] - Avoid statically importing FindFirstStreamW/FindNextStreamW so that our cmd.exe can work on WinXP. - Accept lowercase /r switch Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Fri Aug 28 11:39:45 2015 @@ -341,7 +341,7 @@ lpFlags->bRecursive = ! bNegative; else if (cCurUChar == _T('X')) lpFlags->bShortName = ! bNegative; - else if (cCurChar == _T('R')) + else if (cCurUChar == _T('R')) lpFlags->bDataStreams = ! bNegative; else if (cCurChar == _T('4')) lpFlags->b4Digit = ! bNegative; @@ -1342,6 +1342,8 @@ WIN32_FIND_STREAM_DATA wfsdStreamInfo; PDIRFINDSTREAMNODE * ptrCurNode; /* The pointer to the first stream */ PDIRFINDSTREAMNODE ptrFreeNode; /* The pointer used during cleanup */ + static HANDLE (WINAPI *pFindFirstStreamW)(LPCWSTR, STREAM_INFO_LEVELS, LPVOID, DWORD); + static BOOL (WINAPI *pFindNextStreamW)(HANDLE, LPVOID); /* Initialize Variables */ ptrStartNode = NULL; @@ -1437,13 +1439,28 @@ /* Alternate streams are only displayed with new long list */ if (lpFlags->bNewLongList && lpFlags->bDataStreams) { + if (!pFindFirstStreamW) + { + pFindFirstStreamW = (PVOID)GetProcAddress(GetModuleHandle(_T("kernel32")), "FindFirstStreamW"); + pFindNextStreamW = (PVOID)GetProcAddress(GetModuleHandle(_T("kernel32")), "FindNextStreamW"); + } + /* Try to get stream information */ - hStreams = FindFirstStreamW(wfdFileInfo.cFileName, FindStreamInfoStandard, &wfsdStreamInfo, 0); + if (pFindFirstStreamW && pFindNextStreamW) + { + hStreams = pFindFirstStreamW(wfdFileInfo.cFileName, FindStreamInfoStandard, &wfsdStreamInfo, 0); + } + else + { + hStreams = INVALID_HANDLE_VALUE; + ERR("FindFirstStreamW not supported!\n"); + } + if (hStreams != INVALID_HANDLE_VALUE) { /* We totally ignore first stream. It contains data about ::$DATA */ ptrCurNode = &ptrNextNode->ptrNext->stInfo.ptrHead; - while (FindNextStreamW(hStreams, &wfsdStreamInfo)) + while (pFindNextStreamW(hStreams, &wfsdStreamInfo)) { *ptrCurNode = cmd_alloc(sizeof(DIRFINDSTREAMNODE)); if (*ptrCurNode == NULL)

1 0

[tfaber] 68846: [CMD] - In DirList, initialize stInfo.ptrHead of the dummy node to avoid invalid memory access. Fixes regression in cmd:batch
by tfaber＠svn.reactos.org 28 Aug '15

28 Aug '15

Author: tfaber Date: Fri Aug 28 10:51:10 2015 New Revision: 68846 URL: http://svn.reactos.org/svn/reactos?rev=68846&view=rev Log: [CMD] - In DirList, initialize stInfo.ptrHead of the dummy node to avoid invalid memory access. Fixes regression in cmd:batch Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Fri Aug 28 10:51:10 2015 @@ -1376,6 +1376,7 @@ WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); return 1; /* Error cannot allocate memory for 1st object */ } + ptrStartNode->stInfo.ptrHead = NULL; ptrNextNode = ptrStartNode; /*Checking ir szPath is a File with/wout extension*/ @@ -1478,8 +1479,8 @@ ptrCurNode = &(*ptrCurNode)->ptrNext; } - FindClose(hStreams); - *ptrCurNode = NULL; + FindClose(hStreams); + *ptrCurNode = NULL; } } @@ -1538,12 +1539,12 @@ dwCount = 0; while (ptrNextNode->ptrNext) { - *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stInfo; + ptrFileArray[dwCount] = &ptrNextNode->ptrNext->stInfo; ptrNextNode = ptrNextNode->ptrNext; dwCount++; } - /* Sort Data if requested*/ + /* Sort Data if requested */ if (lpFlags->stOrderBy.sCriteriaCount > 0) QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags);

1 0

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015