Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 75924: [SAMSRV] Implement SamIFree_SAMPR_ALIAS_INFO_BUFFER, SamIFree_SAMPR_DOMAIN_INFO_BUFFER and SamIFree_SAMPR_GROUP_INFO_BUFFER.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 10:05:48 2017 New Revision: 75924 URL: http://svn.reactos.org/svn/reactos?rev=75924&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_ALIAS_INFO_BUFFER, SamIFree_SAMPR_DOMAIN_INFO_BUFFER and SamIFree_SAMPR_GROUP_INFO_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Fri Sep 22 10:05:48 2017 @@ -151,6 +151,122 @@ VOID NTAPI +SamIFree_SAMPR_ALIAS_INFO_BUFFER( + PSAMPR_ALIAS_INFO_BUFFER Ptr, + ALIAS_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case AliasGeneralInformation: + if (Ptr->General.Name.Buffer != NULL) + MIDL_user_free(Ptr->General.Name.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + break; + + case AliasNameInformation: + if (Ptr->Name.Name.Buffer != NULL) + MIDL_user_free(Ptr->Name.Name.Buffer); + break; + + case AliasAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI +SamIFree_SAMPR_DOMAIN_INFO_BUFFER( + PSAMPR_DOMAIN_INFO_BUFFER Ptr, + DOMAIN_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case DomainPasswordInformation: + break; + + case DomainGeneralInformation: + if (Ptr->General.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->General.OemInformation.Buffer); + + if (Ptr->General.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->General.DomainName.Buffer); + + if (Ptr->General.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->General.ReplicaSourceNodeName.Buffer); + break; + + case DomainLogoffInformation: + break; + + case DomainOemInformation: + if (Ptr->Oem.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->Oem.OemInformation.Buffer); + break; + + case DomainNameInformation: + if (Ptr->Name.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->Name.DomainName.Buffer); + break; + + case DomainReplicationInformation: + if (Ptr->Replication.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->Replication.ReplicaSourceNodeName.Buffer); + break; + + case DomainServerRoleInformation: + break; + + case DomainModifiedInformation: + break; + + case DomainStateInformation: + break; + + case DomainGeneralInformation2: + if (Ptr->General2.I1.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.OemInformation.Buffer); + + if (Ptr->General2.I1.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.DomainName.Buffer); + + if (Ptr->General2.I1.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.ReplicaSourceNodeName.Buffer); + break; + + case DomainLockoutInformation: + break; + + case DomainModifiedInformation2: + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_ENUMERATION_BUFFER(PSAMPR_ENUMERATION_BUFFER Ptr) { ULONG i; @@ -206,6 +322,47 @@ VOID NTAPI +SamIFree_SAMPR_GROUP_INFO_BUFFER( + PSAMPR_GROUP_INFO_BUFFER Ptr, + GROUP_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case GroupGeneralInformation: + if (Ptr->General.Name.Buffer != NULL) + MIDL_user_free(Ptr->General.Name.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + break; + + case GroupNameInformation: + if (Ptr->Name.Name.Buffer != NULL) + MIDL_user_free(Ptr->Name.Name.Buffer); + break; + + case GroupAttributeInformation: + break; + + case GroupAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Fri Sep 22 10:05:48 2017 @@ -17,13 +17,13 @@ @ stub SamIFreeSidAndAttributesList @ stub SamIFreeSidArray @ stdcall SamIFreeVoid(ptr) -@ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER +@ stdcall SamIFree_SAMPR_ALIAS_INFO_BUFFER(ptr long) @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER -@ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER +@ stdcall SamIFree_SAMPR_DOMAIN_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_MEMBERS_BUFFER(ptr) -@ stub SamIFree_SAMPR_GROUP_INFO_BUFFER +@ stdcall SamIFree_SAMPR_GROUP_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) @ stdcall SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(ptr)

1 0

[tfaber] 75923: [CMAKE] - Hackfix base addresses to avoid comctl32/rpcrt4 overlap. This makes use of the fact that baseaddress_winspool.drv is not being used (it should be called baseaddress_winspo...
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 09:26:32 2017 New Revision: 75923 URL: http://svn.reactos.org/svn/reactos?rev=75923&view=rev Log: [CMAKE] - Hackfix base addresses to avoid comctl32/rpcrt4 overlap. This makes use of the fact that baseaddress_winspool.drv is not being used (it should be called baseaddress_winspool). Base addresses should be properly regenerated at some point, and the issues exposed by the relocations are still bugs that need to be fixed. This should at least make testbot reliable again though. CORE-13804 Modified: trunk/reactos/sdk/cmake/baseaddress.cmake Modified: trunk/reactos/sdk/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Fri Sep 22 09:26:32 2017 @@ -11,10 +11,9 @@ set(baseaddress_ws2_32 0x7c280000) set(baseaddress_ws2help 0x7c250000) set(baseaddress_shlwapi 0x7c1a0000) -set(baseaddress_rpcrt4 0x7c0d0000) -set(baseaddress_comctl32 0x7bf40000) -set(baseaddress_ole32 0x7bd60000) -set(baseaddress_winspool.drv 0x7bd30000) +set(baseaddress_rpcrt4 0x7c0e0000) +set(baseaddress_comctl32 0x7bf20000) +set(baseaddress_ole32 0x7bd20000) set(baseaddress_winmm 0x7bc70000) set(baseaddress_comdlg32 0x7bb70000) set(baseaddress_shell32 0x7b1b0000)

1 0

[tfaber] 75922: [NDIS] - Don't assert on IRP_MJ_CLEANUP CORE-7630
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 07:31:57 2017 New Revision: 75922 URL: http://svn.reactos.org/svn/reactos?rev=75922&view=rev Log: [NDIS] - Don't assert on IRP_MJ_CLEANUP CORE-7630 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 22 07:31:57 2017 @@ -2579,7 +2579,8 @@ if (DeviceObject->DeviceType == FILE_DEVICE_PHYSICAL_NETCARD) { if ((IrpSp->MajorFunction == IRP_MJ_CREATE) || - (IrpSp->MajorFunction == IRP_MJ_CLOSE)) + (IrpSp->MajorFunction == IRP_MJ_CLOSE) || + (IrpSp->MajorFunction == IRP_MJ_CLEANUP)) { return NdisICreateClose(DeviceObject, Irp); }

1 0

[tfaber] 75921: [NDIS] - Don't assert on unimplemented ioctl. Print the control code instead. CORE-7630
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 07:28:29 2017 New Revision: 75921 URL: http://svn.reactos.org/svn/reactos?rev=75921&view=rev Log: [NDIS] - Don't assert on unimplemented ioctl. Print the control code instead. CORE-7630 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 22 07:28:29 2017 @@ -2293,13 +2293,15 @@ PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)DeviceObject->DeviceExtension; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NDIS_STATUS Status = STATUS_NOT_SUPPORTED; + ULONG ControlCode; ULONG Written; Irp->IoStatus.Information = 0; ASSERT(Adapter); - switch (Stack->Parameters.DeviceIoControl.IoControlCode) + ControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; + switch (ControlCode) { case IOCTL_NDIS_QUERY_GLOBAL_STATS: Status = MiniQueryInformation(Adapter, @@ -2311,7 +2313,7 @@ break; default: - ASSERT(FALSE); + NDIS_DbgPrint(MIN_TRACE, ("NdisIDeviceIoControl: unsupported control code 0x%lx\n", ControlCode)); break; }

1 0

[tfaber] 75920: [SVCHOST] - Don't print "GetProcAddress failed" error for optional functions
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 07:17:20 2017 New Revision: 75920 URL: http://svn.reactos.org/svn/reactos?rev=75920&view=rev Log: [SVCHOST] - Don't print "GetProcAddress failed" error for optional functions Modified: trunk/reactos/base/services/svchost/svchost.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Fri Sep 22 07:17:20 2017 @@ -701,10 +701,10 @@ /* Next, get the address being looked up*/ lpAddress = GetProcAddress(hModule, lpProcName); - if (!lpAddress) + if (!lpAddress && lpdwError) { /* We couldn't find it, write the error code and a debug statement */ - if (lpdwError) *lpdwError = GetLastError(); + *lpdwError = GetLastError(); DBG_ERR("GetProcAddress (%s) failed on DLL %ws. Error %d.\n", lpProcName, pDll->pszDllPath,

1 0

[pschweitzer] 75919: [FASTFAT] Don't allow temporary attribute to be set on a directory. Even though our FastFAT totally ignores such attribute, this is illegal on Windows and makes SetFileAttribut...
by pschweitzer＠svn.reactos.org 21 Sep '17

21 Sep '17

Author: pschweitzer Date: Thu Sep 21 10:33:23 2017 New Revision: 75919 URL: http://svn.reactos.org/svn/reactos?rev=75919&view=rev Log: [FASTFAT] Don't allow temporary attribute to be set on a directory. Even though our FastFAT totally ignores such attribute, this is illegal on Windows and makes SetFileAttribute fail, so do the same. CORE-13495 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Sep 21 10:33:23 2017 @@ -181,6 +181,12 @@ if (vfatFCBIsDirectory(FCB)) { + if (BooleanFlagOn(BasicInfo->FileAttributes, FILE_ATTRIBUTE_TEMPORARY)) + { + DPRINT("Setting temporary attribute on a directory!\n"); + return STATUS_INVALID_PARAMETER; + } + Attributes |= FILE_ATTRIBUTE_DIRECTORY; } else

1 0

[pschweitzer] 75918: [FASTFAT] Notify in case of attributes/dates changes
by pschweitzer＠svn.reactos.org 21 Sep '17

21 Sep '17

Author: pschweitzer Date: Thu Sep 21 09:47:13 2017 New Revision: 75918 URL: http://svn.reactos.org/svn/reactos?rev=75918&view=rev Log: [FASTFAT] Notify in case of attributes/dates changes Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Sep 21 09:47:13 2017 @@ -156,6 +156,8 @@ PDEVICE_EXTENSION DeviceExt, PFILE_BASIC_INFORMATION BasicInfo) { + ULONG NotifyFilter; + DPRINT("VfatSetBasicInformation()\n"); ASSERT(NULL != FileObject); @@ -165,6 +167,8 @@ /* Check volume label bit */ ASSERT(0 == (*FCB->Attributes & _A_VOLID)); + NotifyFilter = 0; + if (BasicInfo->FileAttributes != 0) { UCHAR Attributes; @@ -192,6 +196,7 @@ { *FCB->Attributes = Attributes; DPRINT("Setting attributes 0x%02x\n", *FCB->Attributes); + NotifyFilter |= FILE_NOTIFY_CHANGE_ATTRIBUTES; } } @@ -203,6 +208,7 @@ &BasicInfo->CreationTime, &FCB->entry.FatX.CreationDate, &FCB->entry.FatX.CreationTime); + NotifyFilter |= FILE_NOTIFY_CHANGE_CREATION; } if (BasicInfo->LastAccessTime.QuadPart != 0 && BasicInfo->LastAccessTime.QuadPart != -1) @@ -211,6 +217,7 @@ &BasicInfo->LastAccessTime, &FCB->entry.FatX.AccessDate, &FCB->entry.FatX.AccessTime); + NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; } if (BasicInfo->LastWriteTime.QuadPart != 0 && BasicInfo->LastWriteTime.QuadPart != -1) @@ -219,6 +226,7 @@ &BasicInfo->LastWriteTime, &FCB->entry.FatX.UpdateDate, &FCB->entry.FatX.UpdateTime); + NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_WRITE; } } else @@ -229,6 +237,7 @@ &BasicInfo->CreationTime, &FCB->entry.Fat.CreationDate, &FCB->entry.Fat.CreationTime); + NotifyFilter |= FILE_NOTIFY_CHANGE_CREATION; } if (BasicInfo->LastAccessTime.QuadPart != 0 && BasicInfo->LastAccessTime.QuadPart != -1) @@ -237,6 +246,7 @@ &BasicInfo->LastAccessTime, &FCB->entry.Fat.AccessDate, NULL); + NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; } if (BasicInfo->LastWriteTime.QuadPart != 0 && BasicInfo->LastWriteTime.QuadPart != -1) @@ -245,10 +255,21 @@ &BasicInfo->LastWriteTime, &FCB->entry.Fat.UpdateDate, &FCB->entry.Fat.UpdateTime); + NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_WRITE; } } VfatUpdateEntry(FCB, vfatVolumeIsFatX(DeviceExt)); + + if (NotifyFilter != 0) + { + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), + (PSTRING)&FCB->PathNameU, + FCB->PathNameU.Length - FCB->LongNameU.Length, + NULL, NULL, NotifyFilter, FILE_ACTION_MODIFIED, + NULL); + } return STATUS_SUCCESS; }

1 0

[pschweitzer] 75917: [FASTFAT] Misc fixes: - Only set file attributes if they changed - Fail to set attributes if directory attribute is asked for a file - Perform file attributes setting before da...
by pschweitzer＠svn.reactos.org 21 Sep '17

21 Sep '17

Author: pschweitzer Date: Thu Sep 21 09:45:23 2017 New Revision: 75917 URL: http://svn.reactos.org/svn/reactos?rev=75917&view=rev Log: [FASTFAT] Misc fixes: - Only set file attributes if they changed - Fail to set attributes if directory attribute is asked for a file - Perform file attributes setting before dates to allow safe fail Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Sep 21 09:45:23 2017 @@ -165,6 +165,36 @@ /* Check volume label bit */ ASSERT(0 == (*FCB->Attributes & _A_VOLID)); + if (BasicInfo->FileAttributes != 0) + { + UCHAR Attributes; + + Attributes = (BasicInfo->FileAttributes & (FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_READONLY)); + + if (vfatFCBIsDirectory(FCB)) + { + Attributes |= FILE_ATTRIBUTE_DIRECTORY; + } + else + { + if (BooleanFlagOn(BasicInfo->FileAttributes, FILE_ATTRIBUTE_DIRECTORY)) + { + DPRINT("Setting directory attribute on a file!\n"); + return STATUS_INVALID_PARAMETER; + } + } + + if (Attributes != *FCB->Attributes) + { + *FCB->Attributes = Attributes; + DPRINT("Setting attributes 0x%02x\n", *FCB->Attributes); + } + } + if (vfatVolumeIsFatX(DeviceExt)) { if (BasicInfo->CreationTime.QuadPart != 0 && BasicInfo->CreationTime.QuadPart != -1) @@ -216,18 +246,6 @@ &FCB->entry.Fat.UpdateDate, &FCB->entry.Fat.UpdateTime); } - } - - if (BasicInfo->FileAttributes) - { - *FCB->Attributes = (unsigned char)((*FCB->Attributes & - (FILE_ATTRIBUTE_DIRECTORY | 0x48)) | - (BasicInfo->FileAttributes & - (FILE_ATTRIBUTE_ARCHIVE | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_READONLY))); - DPRINT("Setting attributes 0x%02x\n", *FCB->Attributes); } VfatUpdateEntry(FCB, vfatVolumeIsFatX(DeviceExt));

1 0

[pschweitzer] 75916: [KMTESTS:KERNEL32] Magic values--;
by pschweitzer＠svn.reactos.org 21 Sep '17

21 Sep '17

Author: pschweitzer Date: Thu Sep 21 08:52:27 2017 New Revision: 75916 URL: http://svn.reactos.org/svn/reactos?rev=75916&view=rev Log: [KMTESTS:KERNEL32] Magic values--; Modified: trunk/rostests/kmtests/kernel32/FileAttributes_user.c Modified: trunk/rostests/kmtests/kernel32/FileAttributes_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FileAttr… ============================================================================== --- trunk/rostests/kmtests/kernel32/FileAttributes_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/FileAttributes_user.c [iso-8859-1] Thu Sep 21 08:52:27 2017 @@ -36,7 +36,7 @@ /* Set invalid attributes */ KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_VALID_SET_FLAGS); - Ret = SetFileAttributesW(FileName, 0xFFFFFFFF); + Ret = SetFileAttributesW(FileName, INVALID_FILE_ATTRIBUTES); ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); /* Query read-only attribute */ @@ -60,9 +60,9 @@ ok_eq_hex(Attributes, 0); /* Query invalid attributes */ - KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, 0xFFFFFFFF); + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, INVALID_FILE_ATTRIBUTES); Attributes = GetFileAttributesW(FileName); - ok_eq_hex(Attributes, 0xFFFFFFFF); + ok_eq_hex(Attributes, INVALID_FILE_ATTRIBUTES); /** Directory attribute **/ /* Set read-only and directory attribute */

1 0

[pschweitzer] 75915: [KERNEL32] Rewrite GetFileAttributesW() to make it simpler and more accurate. Make GetFileAttributesA() call GetFileAttributesW() This fixes the last failing tests from r75236....
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 16:38:48 2017 New Revision: 75915 URL: http://svn.reactos.org/svn/reactos?rev=75915&view=rev Log: [KERNEL32] Rewrite GetFileAttributesW() to make it simpler and more accurate. Make GetFileAttributesA() call GetFileAttributesW() This fixes the last failing tests from r75236. CORE-13495 Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] Wed Sep 20 16:38:48 2017 @@ -765,33 +765,55 @@ DWORD WINAPI GetFileAttributesA(LPCSTR lpFileName) { - WIN32_FILE_ATTRIBUTE_DATA FileAttributeData; PWSTR FileNameW; - BOOL ret; if (!lpFileName || !(FileNameW = FilenameA2W(lpFileName, FALSE))) return INVALID_FILE_ATTRIBUTES; - ret = GetFileAttributesExW(FileNameW, GetFileExInfoStandard, &FileAttributeData); - - return ret ? FileAttributeData.dwFileAttributes : INVALID_FILE_ATTRIBUTES; -} - - -/* - * @implemented - */ -DWORD WINAPI + return GetFileAttributesW(FileNameW); +} + + +/* + * @implemented + */ +DWORD +WINAPI GetFileAttributesW(LPCWSTR lpFileName) { - WIN32_FILE_ATTRIBUTE_DATA FileAttributeData; - BOOL Result; - - TRACE ("GetFileAttributeW(%S) called\n", lpFileName); - - Result = GetFileAttributesExW(lpFileName, GetFileExInfoStandard, &FileAttributeData); - - return Result ? FileAttributeData.dwFileAttributes : INVALID_FILE_ATTRIBUTES; + NTSTATUS Status; + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_BASIC_INFORMATION FileInformation; + + /* Get the NT path name */ + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_FILE_ATTRIBUTES; + } + + /* Prepare for querying attributes */ + InitializeObjectAttributes(&ObjectAttributes, &FileName, + OBJ_CASE_INSENSITIVE, + NULL, NULL); + /* Simply query attributes */ + Status = NtQueryAttributesFile(&ObjectAttributes, &FileInformation); + if (!NT_SUCCESS(Status)) + { + /* It failed? Is it a DOS device? */ + if (RtlIsDosDeviceName_U(lpFileName)) + { + return FILE_ATTRIBUTE_ARCHIVE; + } + + /* Set the error otherwise */ + BaseSetLastNTError(Status); + return INVALID_FILE_ATTRIBUTES; + } + + /* Return the file attributes */ + return FileInformation.FileAttributes; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs