Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64772: [NPFS] - Don't return a canceled IRP from NpRemoveDataQueueEntry.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 16 21:43:03 2014 New Revision: 64772 URL: http://svn.reactos.org/svn/reactos?rev=64772&view=rev Log: [NPFS] - Don't return a canceled IRP from NpRemoveDataQueueEntry. Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] Thu Oct 16 21:43:03 2014 @@ -146,9 +146,10 @@ Irp = QueueEntry->Irp; NpFreeClientSecurityContext(QueueEntry->ClientSecurityContext); - if (Irp && IoSetCancelRoutine(Irp, NULL)) + if (Irp && !IoSetCancelRoutine(Irp, NULL)) { Irp->Tail.Overlay.DriverContext[3] = NULL; + Irp = NULL; } ExFreePool(QueueEntry);

9 years, 11 months

[pschweitzer] 64771: [NTFS] Bugfixing... Part 2/X: - Please welcome yet another structure in our NTFS driver... The INDX buffer which is used for non resident index entries. Doc (incomplete) here: ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Oct 16 21:37:27 2014 New Revision: 64771 URL: http://svn.reactos.org/svn/reactos?rev=64771&view=rev Log: [NTFS] Bugfixing... Part 2/X: - Please welcome yet another structure in our NTFS driver... The INDX buffer which is used for non resident index entries. Doc (incomplete) here: http://bos.asmhackers.net/docs/filesystems/ntfs/INDX.html - Make use of it in NtfsFindMftRecord() to replace some totally obscure code. - Add some asserts to verify we read somehow what we expect. One of the assert is not working properly... Hum! Need to find out why. We don't go any farther so far. Good news though: a FIXME has been replaced by another FIXME. NB: This would deserve being ported to FreeLDR to fix the same FIXME. Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Oct 16 21:37:27 2014 @@ -495,6 +495,7 @@ PNTFS_ATTR_CONTEXT IndexBitmapCtx; PNTFS_ATTR_CONTEXT IndexAllocationCtx; PINDEX_ROOT_ATTRIBUTE IndexRoot; + PINDEX_BUFFER IndexBuffer; ULONGLONG BitmapDataSize; ULONGLONG IndexAllocationSize; PCHAR BitmapData; @@ -626,9 +627,12 @@ break; } - /* FIXME */ - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + 0x18 + *(USHORT *)(IndexRecord + 0x18)); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexBlockSize); + IndexBuffer = (PINDEX_BUFFER)IndexRecord; + ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); + ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + //ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); FIXME: Why doesn't it work? while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Oct 16 21:37:27 2014 @@ -331,6 +331,13 @@ typedef struct { + NTFS_RECORD_HEADER Ntfs; + ULONGLONG VCN; + INDEX_HEADER_ATTRIBUTE Header; +} INDEX_BUFFER, *PINDEX_BUFFER; + +typedef struct +{ union { struct

9 years, 11 months

[tkreuzer] 64770: {NTOSKRNL] Handle int 0x2c (assertion failure) in KDBG by breaking into the debugger instead of ignoring it and pretending it was handled. Now NT_ASSERT works on GCC builds as wel...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 16 21:33:32 2014 New Revision: 64770 URL: http://svn.reactos.org/svn/reactos?rev=64770&view=rev Log: {NTOSKRNL] Handle int 0x2c (assertion failure) in KDBG by breaking into the debugger instead of ignoring it and pretending it was handled. Now NT_ASSERT works on GCC builds as well. (As good as things work in KDBG...) 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=6… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Thu Oct 16 21:33:32 2014 @@ -189,13 +189,8 @@ /* Check if this is an assertion failure */ if (ExceptionRecord->ExceptionCode == STATUS_ASSERTION_FAILURE) { - /* Warn about it */ - DbgPrint("\n!!! Assertion Failure at Address 0x%p !!!\n\n", - (PVOID)Context->Eip); - - /* Bump EIP to the instruction following the int 2C and return */ + /* Bump EIP to the instruction following the int 2C */ Context->Eip += 2; - return TRUE; } #endif Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Oct 16 21:33:32 2014 @@ -57,26 +57,27 @@ static KDB_ENTER_CONDITION KdbEnterConditions[][2] = { /* First chance Last chance */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* Zero devide */ - { KdbEnterFromKmode, KdbDoNotEnter }, /* Debug trap */ - { KdbDoNotEnter, KdbEnterAlways }, /* NMI */ - { KdbEnterFromKmode, KdbDoNotEnter }, /* INT3 */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* Overflow */ - { KdbDoNotEnter, KdbEnterFromKmode }, - { KdbDoNotEnter, KdbEnterFromKmode }, /* Invalid opcode */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* No math coprocessor fault */ - { KdbEnterAlways, KdbEnterAlways }, - { KdbEnterAlways, KdbEnterAlways }, - { KdbDoNotEnter, KdbEnterFromKmode }, - { KdbDoNotEnter, KdbEnterFromKmode }, - { KdbDoNotEnter, KdbEnterFromKmode }, /* Stack fault */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* General protection fault */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* Page fault */ - { KdbEnterAlways, KdbEnterAlways }, /* Reserved (15) */ - { KdbDoNotEnter, KdbEnterFromKmode }, /* FPU fault */ - { KdbDoNotEnter, KdbEnterFromKmode }, - { KdbDoNotEnter, KdbEnterFromKmode }, - { KdbDoNotEnter, KdbEnterFromKmode }, /* SIMD fault */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 0: Zero divide */ + { KdbEnterFromKmode, KdbDoNotEnter }, /* 1: Debug trap */ + { KdbDoNotEnter, KdbEnterAlways }, /* 2: NMI */ + { KdbEnterFromKmode, KdbDoNotEnter }, /* 3: INT3 */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 4: Overflow */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 5: BOUND range exceeded */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 6: Invalid opcode */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 7: No math coprocessor fault */ + { KdbEnterAlways, KdbEnterAlways }, /* 8: Double Fault */ + { KdbEnterAlways, KdbEnterAlways }, /* 9: Unknown(9) */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 10: Invalid TSS */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 11: Segment Not Present */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 12: Stack fault */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 13: General protection fault */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 14: Page fault */ + { KdbEnterAlways, KdbEnterAlways }, /* 15: Reserved (15) */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 16: FPU fault */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 17: Alignment Check */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 18: Machine Check */ + { KdbDoNotEnter, KdbEnterFromKmode }, /* 19: SIMD fault */ + { KdbEnterAlways, KdbEnterAlways }, /* 20: Assertion failure */ { KdbDoNotEnter, KdbEnterFromKmode } /* Last entry: used for unknown exceptions */ }; @@ -102,7 +103,8 @@ "Math Fault", "Alignment Check", "Machine Check", - "SIMD Fault" + "SIMD Fault", + "Assertion Failure" }; ULONG @@ -1320,6 +1322,9 @@ case STATUS_FLOAT_MULTIPLE_TRAPS: Ret = 18; break; + case STATUS_ASSERTION_FAILURE: + Ret = 20; + break; default: Ret = RTL_NUMBER_OF(KdbEnterConditions) - 1;

9 years, 11 months

[jgardou] 64769: [TCPIP] - Fix potential NULL pointer dereference

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 16 20:15:33 2014 New Revision: 64769 URL: http://svn.reactos.org/svn/reactos?rev=64769&view=rev Log: [TCPIP] - Fix potential NULL pointer dereference Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Oct 16 20:15:33 2014 @@ -679,8 +679,12 @@ PCONNECTION_ENDPOINT Connection, BOOLEAN Set) { + if (!Connection) + return STATUS_UNSUCCESSFUL; + if (Connection->SocketContext == NULL) return STATUS_UNSUCCESSFUL; + LibTCPSetNoDelay(Connection->SocketContext, Set); return STATUS_SUCCESS; }

9 years, 11 months

[jgardou] 64768: [INCLUDE/IDL] - Properly mark some arguments as [out] only for wlansvc interface.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 16 20:15:26 2014 New Revision: 64768 URL: http://svn.reactos.org/svn/reactos?rev=64768&view=rev Log: [INCLUDE/IDL] - Properly mark some arguments as [out] only for wlansvc interface. Modified: trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Thu Oct 16 20:15:26 2014 @@ -7,7 +7,7 @@ typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; -typedef [handle] LPWSTR WLANSVC_HANDLE; +typedef [handle, string] LPWSTR WLANSVC_HANDLE; /* FIXME */ typedef struct struct_C { @@ -49,8 +49,8 @@ DWORD _RpcOpenHandle( [in] WLANSVC_HANDLE szMachineName, [in] DWORD dwClientVersion, - [in, out] DWORD* pdwNegotiatedVersion, - [in, out] LPWLANSVC_RPC_HANDLE phClientHandle); + [out] DWORD* pdwNegotiatedVersion, + [out] LPWLANSVC_RPC_HANDLE phClientHandle); /* Function: 0x01 */ DWORD _RpcCloseHandle(

9 years, 11 months

[jgardou] 64767: [USERENV] - Add proper stubs for GetAppliedGPOList[A, W] CORE-8636

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 16 20:15:13 2014 New Revision: 64767 URL: http://svn.reactos.org/svn/reactos?rev=64767&view=rev Log: [USERENV] - Add proper stubs for GetAppliedGPOList[A,W] CORE-8636 Modified: trunk/reactos/dll/win32/userenv/gpolicy.c trunk/reactos/dll/win32/userenv/userenv.spec Modified: trunk/reactos/dll/win32/userenv/gpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/gpolicy.… ============================================================================== --- trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] Thu Oct 16 20:15:13 2014 @@ -572,3 +572,31 @@ return Ret; } + +DWORD +WINAPI +GetAppliedGPOListA( + _In_ DWORD dwFlags, + _In_ LPCSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTA *ppGPOList +) +{ + DPRINT1("GetAppliedGPOListA is UNIMPLEMENTED!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +GetAppliedGPOListW( + _In_ DWORD dwFlags, + _In_ LPCWSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTW *ppGPOList +) +{ + DPRINT1("GetAppliedGPOListW is UNIMPLEMENTED!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/dll/win32/userenv/userenv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] Thu Oct 16 20:15:13 2014 @@ -16,8 +16,8 @@ 188 stub GenerateRsopPolicy #stdcall GenerateRsopPolicy(48) 189 stdcall GetAllUsersProfileDirectoryA(str ptr) 190 stdcall GetAllUsersProfileDirectoryW(wstr ptr) -191 stub GetAppliedGPOListA #stdcall GetAppliedGPOListA(long str ptr ptr ptr) -192 stub GetAppliedGPOListW #stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) +191 stdcall GetAppliedGPOListA(long str ptr ptr ptr) +192 stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) 193 stdcall GetDefaultUserProfileDirectoryA(str ptr) 194 stdcall GetDefaultUserProfileDirectoryW(wstr ptr) 195 stub GetGPOListA #stdcall GetGPOListA(ptr str str str long ptr)

9 years, 11 months

[jgardou] 64766: [PSDK] - Add GetAppliedGPOList[A, W] declarations CORE-8636

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 16 20:14:25 2014 New Revision: 64766 URL: http://svn.reactos.org/svn/reactos?rev=64766&view=rev Log: [PSDK] - Add GetAppliedGPOList[A,W] declarations CORE-8636 Modified: trunk/reactos/include/psdk/userenv.h Modified: trunk/reactos/include/psdk/userenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/userenv.h?rev… ============================================================================== --- trunk/reactos/include/psdk/userenv.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/userenv.h [iso-8859-1] Thu Oct 16 20:14:25 2014 @@ -42,6 +42,48 @@ LPWSTR lpPolicyPath; HANDLE hProfile; } PROFILEINFOW, *LPPROFILEINFOW; + +#if (WINVER >= 0x0502) +typedef enum _GPO_LINK { + GPLinkUnknown = 0, + GPLinkMachine, + GPLinkSite, + GPLinkDomain, + GPLinkOrganizationalUnit +} GPO_LINK, *PGPO_LINK; + +typedef struct _GROUP_POLICY_OBJECTA { + DWORD dwOptions; + DWORD dwVersion; + LPSTR lpDSPath; + LPSTR lpFileSysPath; + LPSTR lpDisplayName; + CHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTA *pNext; + struct _GROUP_POLICY_OBJECTA *pPrev; + LPSTR lpExtensions; + LPARAM lParam2; + LPSTR lpLink; +} GROUP_POLICY_OBJECTA, *PGROUP_POLICY_OBJECTA; + +typedef struct _GROUP_POLICY_OBJECTW { + DWORD dwOptions; + DWORD dwVersion; + LPWSTR lpDSPath; + LPWSTR lpFileSysPath; + LPWSTR lpDisplayName; + WCHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTW *pNext; + struct _GROUP_POLICY_OBJECTW *pPrev; + LPWSTR lpExtensions; + LPARAM lParam2; + LPWSTR lpLink; +} GROUP_POLICY_OBJECTW, *PGROUP_POLICY_OBJECTW; +#endif /* begin private */ BOOL WINAPI InitializeProfiles (VOID); @@ -85,6 +127,27 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); #endif +#if (WINVER >= 0x0502) +DWORD +WINAPI +GetAppliedGPOListA( + _In_ DWORD dwFlags, + _In_ LPCSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTA *ppGPOList +); +DWORD +WINAPI +GetAppliedGPOListW( + _In_ DWORD dwFlags, + _In_ LPCWSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTW *ppGPOList +); +#endif + HANDLE WINAPI EnterCriticalPolicySection (BOOL); BOOL WINAPI LeaveCriticalPolicySection (HANDLE); BOOL WINAPI RefreshPolicy (BOOL); @@ -115,6 +178,11 @@ #if (WINVER >= 0x0500) #define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserW #endif +#if (WINVER >= 0x0502) +typedef GROUP_POLICY_OBJECTW GROUP_POLICY_OBJECT; +typedef PGROUP_POLICY_OBJECTW PGROUP_POLICY_OBJECT; +#define GetAppliedGPOList GetAppliedGPOListW +#endif #else typedef PROFILEINFOA PROFILEINFO; typedef LPPROFILEINFOA LPPROFILEINFO; @@ -136,6 +204,11 @@ #if (WINVER >= 0x0500) #define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserA #endif +#if (WINVER >= 0x0502) +typedef GROUP_POLICY_OBJECTA GROUP_POLICY_OBJECT; +typedef PGROUP_POLICY_OBJECTA PGROUP_POLICY_OBJECT; +#define GetAppliedGPOList GetAppliedGPOListA +#endif #endif #ifdef __cplusplus

9 years, 11 months

[pschweitzer] 64765: [NTFS] Bugfixing... Part 1/X: - FixupUpdateSequenceArray() returns a NTSTATUS, so properly handle it. - Actually... Attributes name can be unicode in case of a file name, but i...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Oct 16 20:05:36 2014 New Revision: 64765 URL: http://svn.reactos.org/svn/reactos?rev=64765&view=rev Log: [NTFS] Bugfixing... Part 1/X: - FixupUpdateSequenceArray() returns a NTSTATUS, so properly handle it. - Actually... Attributes name can be unicode in case of a file name, but it can also be ansi, for streams name... So, don't force UNICODE_STRING, it causes more troubles than it solves. So, now, we really progress in reading directory. Instead of finding no files because we improperly read attributes, we now corrupt memory somewhere and crash ReactOS. Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Oct 16 20:05:36 2014 @@ -34,8 +34,6 @@ #define NDEBUG #include <debug.h> -UNICODE_STRING EmptyName = RTL_CONSTANT_STRING(L""); - /* FUNCTIONS ****************************************************************/ /* @@ -274,7 +272,7 @@ return Status; } - Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, &EmptyName, &DeviceExt->MFTContext); + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, L"", 0, &DeviceExt->MFTContext); if (!NT_SUCCESS(Status)) { DPRINT1("Can't find data attribute for Master File Table.\n"); @@ -312,7 +310,7 @@ NtfsDumpFileAttributes(VolumeRecord); /* Get volume name */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, &EmptyName, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, L"", 0, &AttrCtxt); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { @@ -348,7 +346,7 @@ DeviceExt->VolumeFcb = VolumeFcb; /* Get volume information */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, &EmptyName, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, L"", 0, &AttrCtxt); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Oct 16 20:05:36 2014 @@ -31,8 +31,6 @@ #define NDEBUG #include <debug.h> -UNICODE_STRING IndexOfFileNames = RTL_CONSTANT_STRING(L"$I30"); - /* FUNCTIONS ****************************************************************/ PNTFS_ATTR_CONTEXT @@ -84,10 +82,10 @@ PNTFS_ATTR_RECORD AttrRecord, PNTFS_ATTR_RECORD AttrRecordEnd, ULONG Type, - const WCHAR *Name, + PCWSTR Name, ULONG NameLength) { - DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %s, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + DPRINT1("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); while (AttrRecord < AttrRecordEnd) { @@ -143,7 +141,6 @@ if (AttrRecord->Type == Type) { - DPRINT("%d, %d\n", AttrRecord->NameLength, NameLength); if (AttrRecord->NameLength == NameLength) { PWCHAR AttrName; @@ -176,18 +173,19 @@ FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, ULONG Type, - PUNICODE_STRING Name, + PCWSTR Name, + ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx) { PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; - DPRINT("NtfsFindAttribute(%p, %p, %u, %s)\n", Vcb, MftRecord, Type, Name); + DPRINT1("NtfsFindAttribute(%p, %p, %u, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); - *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name->Buffer, Name->Length); + *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); if (*AttrCtx == NULL) { return STATUS_OBJECT_NAME_NOT_FOUND; @@ -507,6 +505,8 @@ NTSTATUS Status; ULONG CurrentEntry = 0; + DPRINT1("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex, OutName); + MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); @@ -519,7 +519,7 @@ { //Magic = MftRecord->Magic; - Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, &IndexOfFileNames, &IndexRootCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -566,10 +566,10 @@ IndexBlockSize = IndexRoot->SizeOfEntry; - Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, &IndexOfFileNames, &IndexBitmapCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, L"$I30", 4, &IndexBitmapCtx); if (!NT_SUCCESS(Status)) { - DPRINT("Corrupted filesystem!\n"); + DPRINT1("Corrupted filesystem!\n"); ExFreePoolWithTag(MftRecord, TAG_NTFS); return Status; } @@ -589,7 +589,7 @@ ReadAttribute(Vcb, IndexBitmapCtx, 0, BitmapData, (ULONG)BitmapDataSize); ReleaseAttributeContext(IndexBitmapCtx); - Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, &IndexOfFileNames, &IndexAllocationCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx); if (!NT_SUCCESS(Status)) { DPRINT("Corrupted filesystem!\n"); @@ -621,7 +621,7 @@ ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); - if (!FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs)) + if (!NT_SUCCESS(FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs))) { break; } @@ -677,10 +677,10 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { - UNICODE_STRING Current, Remaining, Found; + UNICODE_STRING Current, Remaining; NTSTATUS Status; WCHAR FoundName[MAX_PATH + 1]; - ULONG FirstEntry = 0; + ULONG FirstEntry = 0, Length; DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); @@ -714,9 +714,9 @@ return Status; } - RtlInitUnicodeString(&Found, FoundName); - - Status = FindAttribute(Vcb, *FileRecord, AttributeData, &Found, DataContext); + Length = wcslen(FoundName) * sizeof(WCHAR); + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, FoundName, Length, DataContext); if (!NT_SUCCESS(Status)) { DPRINT("NtfsLookupFileAt: Can't find data attribute\n"); @@ -748,9 +748,9 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { - UNICODE_STRING Found; NTSTATUS Status; WCHAR FoundName[MAX_PATH + 1]; + ULONG Length; DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); @@ -775,9 +775,9 @@ return Status; } - RtlInitUnicodeString(&Found, FoundName); - - Status = FindAttribute(Vcb, *FileRecord, AttributeData, &Found, DataContext); + Length = wcslen(FoundName) * sizeof(WCHAR); + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, FoundName, Length, DataContext); if (!NT_SUCCESS(Status)) { DPRINT("NtfsFindFileAt: Can't find data attribute\n"); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Oct 16 20:05:36 2014 @@ -613,7 +613,8 @@ FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, ULONG Type, - PUNICODE_STRING Name, + PCWSTR Name, + ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx); VOID

9 years, 11 months

[akhaldi] 64764: [WIN32K] * Zap EGAColorsTriples and DefLogPaletteTriples. * Remove extra () around a comparison.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 16 19:14:52 2014 New Revision: 64764 URL: http://svn.reactos.org/svn/reactos?rev=64764&view=rev Log: [WIN32K] * Zap EGAColorsTriples and DefLogPaletteTriples. * Remove extra () around a comparison. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Oct 16 19:14:52 2014 @@ -30,27 +30,6 @@ { 0xff, 0x00, 0xff, 0x00 }, { 0xff, 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff, 0x00 } -}; - -static const RGBTRIPLE EGAColorsTriples[16] = -{ - /* rgbBlue, rgbGreen, rgbRed */ - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x80 }, - { 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x80 }, - { 0x80, 0x00, 0x00 }, - { 0x80, 0x00, 0x80 }, - { 0x80, 0x80, 0x00 }, - { 0x80, 0x80, 0x80 }, - { 0xc0, 0xc0, 0xc0 }, - { 0x00, 0x00, 0xff }, - { 0x00, 0xff, 0x00 }, - { 0x00, 0xff, 0xff }, - { 0xff, 0x00, 0x00 }, - { 0xff, 0x00, 0xff }, - { 0xff, 0xff, 0x00 }, - { 0xff, 0xff, 0xff } }; static const RGBQUAD DefLogPaletteQuads[20] = /* Copy of Default Logical Palette */ @@ -76,31 +55,6 @@ { 0xff, 0x00, 0xff, 0x00 }, { 0xff, 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff, 0x00 } -}; - -static const RGBQUAD DefLogPaletteTriples[20] = /* Copy of Default Logical Palette */ -{ - /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x80 }, - { 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x80 }, - { 0x80, 0x00, 0x00 }, - { 0x80, 0x00, 0x80 }, - { 0x80, 0x80, 0x00 }, - { 0xc0, 0xc0, 0xc0 }, - { 0xc0, 0xdc, 0xc0 }, - { 0xf0, 0xca, 0xa6 }, - { 0xf0, 0xfb, 0xff }, - { 0xa4, 0xa0, 0xa0 }, - { 0x80, 0x80, 0x80 }, - { 0x00, 0x00, 0xf0 }, - { 0x00, 0xff, 0x00 }, - { 0x00, 0xff, 0xff }, - { 0xff, 0x00, 0x00 }, - { 0xff, 0x00, 0xff }, - { 0xff, 0xff, 0x00 }, - { 0xff, 0xff, 0xff } }; PPALETTE @@ -1383,7 +1337,7 @@ DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); // Check if the first color of the colormap is black - if ((col == RGB(0, 0, 0))) + if (col == RGB(0, 0, 0)) { rgb++; col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue);

9 years, 11 months

[tfaber] 64763: [NPFS] - Don't truncate pipe name in the RootPipe case in NpCreateFcb. Found by Windows's RtlInsertUnicodePrefix implementation -- which might indicate that ours is broken.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 16 16:57:11 2014 New Revision: 64763 URL: http://svn.reactos.org/svn/reactos?rev=64763&view=rev Log: [NPFS] - Don't truncate pipe name in the RootPipe case in NpCreateFcb. Found by Windows's RtlInsertUnicodePrefix implementation -- which might indicate that ours is broken. Modified: trunk/reactos/drivers/filesystems/npfs/strucsup.c Modified: trunk/reactos/drivers/filesystems/npfs/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] Thu Oct 16 16:57:11 2014 @@ -218,7 +218,6 @@ PNP_FCB Fcb; BOOLEAN RootPipe; PWCHAR NameBuffer; - ULONG BufferOffset; USHORT Length, MaximumLength; PAGED_CODE(); @@ -233,6 +232,7 @@ RootPipe = FALSE; if (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR) { + Length += sizeof(OBJ_NAME_PATH_SEPARATOR); MaximumLength += sizeof(OBJ_NAME_PATH_SEPARATOR); RootPipe = TRUE; if (MaximumLength < sizeof(WCHAR)) @@ -262,15 +262,21 @@ InsertTailList(&Dcb->FcbList, &Fcb->DcbEntry); - BufferOffset = 0; if (RootPipe) { NameBuffer[0] = OBJ_NAME_PATH_SEPARATOR; - BufferOffset = 1; - } - - RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, Length); - NameBuffer[BufferOffset + (Length / sizeof(WCHAR))] = UNICODE_NULL; + RtlCopyMemory(NameBuffer + 1, + PipeName->Buffer, + PipeName->Length); + } + else + { + RtlCopyMemory(NameBuffer, + PipeName->Buffer, + PipeName->Length); + } + + NameBuffer[Length / sizeof(WCHAR)] = UNICODE_NULL; Fcb->FullName.Length = Length; Fcb->FullName.MaximumLength = MaximumLength;

9 years, 11 months

← Newer
1
...
37
38
39
40
41
42
43
...
73
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 October 2014