Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66271: [SHELL32] - magic_value--; - Don't assign a desktop background colour by default. So that we can get the safe-mode background working (in safe mode), while having the default desk...
by hbelusca＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: hbelusca Date: Sat Feb 14 19:56:04 2015 New Revision: 66271 URL: http://svn.reactos.org/svn/reactos?rev=66271&view=rev Log: [SHELL32] - magic_value--; - Don't assign a desktop background colour by default. So that we can get the safe-mode background working (in safe mode), while having the default desktop background colours in normal situations. Patch by Giannis. Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Sat Feb 14 19:56:04 2015 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(desktop); -#define SHDESK_TAG 0x4b534544 +#define SHDESK_TAG 'KSED' static const WCHAR szProgmanClassName [] = L"Progman"; static const WCHAR szProgmanWindowName [] = L"Program Manager"; @@ -551,7 +551,7 @@ wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); + wcProgman.hbrBackground = NULL; wcProgman.lpszMenuName = NULL; wcProgman.lpszClassName = szProgmanClassName;

1 0

[tfaber] 66270: [RTL] - Implement RtlIpv4StringToAddressExW. Patch by Mark Jansen. CORE-6490
by tfaber＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tfaber Date: Sat Feb 14 19:14:32 2015 New Revision: 66270 URL: http://svn.reactos.org/svn/reactos?rev=66270&view=rev Log: [RTL] - Implement RtlIpv4StringToAddressExW. Patch by Mark Jansen. CORE-6490 Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6627… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Feb 14 19:14:32 2015 @@ -337,17 +337,52 @@ } /* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv4StringToAddressExW(IN PCWSTR AddressString, - IN BOOLEAN Strict, - OUT struct in_addr *Address, - OUT PUSHORT Port) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +* @implemented +*/ +NTSTATUS +NTAPI +RtlIpv4StringToAddressExW( + _In_ PCWSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port) +{ + PCWSTR CurrentChar; + ULONG ConvertedPort; + NTSTATUS Status; + + if (!AddressString || !Address || !Port) + return STATUS_INVALID_PARAMETER; + + Status = RtlIpv4StringToAddressW(AddressString, + Strict, + &CurrentChar, + Address); + if (!NT_SUCCESS(Status)) + return Status; + + if (!*CurrentChar) + { + *Port = 0; + return STATUS_SUCCESS; + } + + if (*CurrentChar != L':') + return STATUS_INVALID_PARAMETER; + ++CurrentChar; + + Status = RtlpStringToUlong(CurrentChar, + FALSE, + &CurrentChar, + &ConvertedPort); + if (!NT_SUCCESS(Status)) + return Status; + + if (*CurrentChar || !ConvertedPort || ConvertedPort > 0xffff) + return STATUS_INVALID_PARAMETER; + + *Port = WN2H(ConvertedPort); + return STATUS_SUCCESS; } /*

1 0

[tkreuzer] 66269: [DRIVERS] Fix a few MSVC warnings
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 19:07:36 2015 New Revision: 66269 URL: http://svn.reactos.org/svn/reactos?rev=66269&view=rev Log: [DRIVERS] Fix a few MSVC warnings Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbstor/fdo.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -28,7 +28,7 @@ * 1. via "Device Specific (D-State) Control" * 2. via "Power Resource Control". * This module is used to manage devices relying on Power Resource Control. - * + * * An ACPI "power resource object" describes a software controllable power * plane, clock plane, or other resource used by a power managed device. * A device may rely on multiple power resources, and a power resource @@ -37,7 +37,7 @@ /* * Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #include <precomp.h> @@ -346,13 +346,14 @@ /* * Prepare a wakeup device, two steps (Ref ACPI 2.0:P229): - * 1. Power on the power resources required for the wakeup device + * 1. Power on the power resources required for the wakeup device * 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power * State Wake) for the device, if present */ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state) { - int i, err = 0; + unsigned int i; + int err = 0; if (!dev || !dev->wakeup.flags.valid) return -1; @@ -396,7 +397,8 @@ */ int acpi_disable_wakeup_device_power(struct acpi_device *dev) { - int i, err = 0; + unsigned int i; + int err = 0; if (!dev || !dev->wakeup.flags.valid) return -1; @@ -486,7 +488,7 @@ int result = 0; struct acpi_handle_list *cl = NULL; /* Current Resources */ struct acpi_handle_list *tl = NULL; /* Target Resources */ - int i = 0; + unsigned int i = 0; if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3)) return_VALUE(-1); @@ -589,14 +591,14 @@ break; } - + DPRINT("%s [%s] (%s)\n", acpi_device_name(device), acpi_device_bid(device), state?"on":"off"); end: if (result) ExFreePool(resource); - + return result; } @@ -654,7 +656,7 @@ return 0; } -int +int acpi_power_init (void) { int result = 0; Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -210,7 +210,7 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension; PWORK_ITEM_DATA WorkItemData; PORT_STATUS_CHANGE PortStatus; - LONG PortId; + ULONG PortId; BOOLEAN SignalResetComplete = FALSE; DPRINT("Entered DeviceStatusChangeThread, Context %x\n", Context); Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -307,7 +307,7 @@ case IOCTL_INTERNAL_USB_GET_PORT_STATUS: { PORT_STATUS_CHANGE PortStatus; - LONG PortId; + ULONG PortId; PUCHAR PortStatusBits; PortStatusBits = (PUCHAR)Stack->Parameters.Others.Argument1; Modified: trunk/reactos/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015 @@ -40,7 +40,7 @@ IN OUT PIRP Irp) { ULONG DeviceCount = 0; - ULONG Index; + LONG Index; PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; @@ -63,7 +63,7 @@ // // go through array and count device objects // - for(Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++) + for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++) { if (DeviceExtension->ChildPDO[Index]) { @@ -391,7 +391,7 @@ case IRP_MN_QUERY_CAPABILITIES: { // - // FIXME: set custom capabilities + // FIXME: set custom capabilities // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);

1 0

[tkreuzer] 66268: [CMAKE] Disable MSVC linker warning LNK4078 (multiple sections found with different attributes) for INIT sections.
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 18:58:52 2015 New Revision: 66268 URL: http://svn.reactos.org/svn/reactos?rev=66268&view=rev Log: [CMAKE] Disable MSVC linker warning LNK4078 (multiple sections found with different attributes) for INIT sections. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66268… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Feb 14 18:58:52 2015 @@ -229,9 +229,10 @@ if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} STREQUAL "kernelmodedriver") - add_target_link_flags(${MODULE} "/DRIVER") + # Disable linker warning 4078 (multiple sections found with different attributes) for INIT section use + add_target_link_flags(${MODULE} "/DRIVER /IGNORE:4078") elseif(${TYPE} STREQUAL "wdmdriver") - add_target_link_flags(${MODULE} "/DRIVER:WDM") + add_target_link_flags(${MODULE} "/DRIVER:WDM /IGNORE:4078") endif() if(RUNTIME_CHECKS)

1 0

[tkreuzer] 66267: [PSDK] Add #ifdef include guards to winnt.h. RC doesn't seem to support #pragma once and emits a redefinition warning, since with RC we first include winnt.h without STRICT define...
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 17:04:42 2015 New Revision: 66267 URL: http://svn.reactos.org/svn/reactos?rev=66267&view=rev Log: [PSDK] Add #ifdef include guards to winnt.h. RC doesn't seem to support #pragma once and emits a redefinition warning, since with RC we first include winnt.h without STRICT defined, then again from windef.h with STRICT defined. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt.template.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Feb 14 17:04:42 2015 @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -6130,3 +6131,5 @@ #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */ Modified: trunk/reactos/include/xdk/winnt.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template… ============================================================================== --- trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] Sat Feb 14 17:04:42 2015 @@ -20,6 +20,7 @@ */ #pragma once +#ifndef _WINNT_ #define _WINNT_ /* We require WDK / VS 2008 or newer */ @@ -74,3 +75,5 @@ #ifdef __cplusplus } // extern "C" #endif + +#endif /* _WINNT_ */

1 0

[tkreuzer] 66266: [CMAKE] - Disable warning C4800: forcing value to bool 'true' or 'false' (performance warning). This is emitted when assigning an integer value to a C++ bool, which is always true...
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 15:44:44 2015 New Revision: 66266 URL: http://svn.reactos.org/svn/reactos?rev=66266&view=rev Log: [CMAKE] - Disable warning C4800: forcing value to bool 'true' or 'false' (performance warning). This is emitted when assigning an integer value to a C++ bool, which is always true (1) or false (0), so assigning an integer to it, will result in an implicit comparison against 0. But "fixing" this warning by adding an explicit comparison ("bool f = (i != 0);") will actually result in LESS efficient code (for whatever reasons). So this warning can be considered entirely useless and counter productive. - Remove C4018 (signed/unsigned mismatch) from the TODO in the disable list. A comparison between an unsigned and a signed value will very likely result in wrong behavior and can easily cause hard to spot security bugs (e.g. when doing overflow checks). It is also often easy to fix. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66266… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Feb 14 15:44:44 2015 @@ -35,11 +35,11 @@ # Disable overly sensitive warnings as well as those that generally aren't # useful to us. -# - TODO: C4018: signed/unsigned mismatch # - C4244: implicit integer truncation # - C4290: C++ exception specification ignored -#add_compile_flags("/wd4018 /wd4244 /wd4290") -add_compile_flags("/wd4290 /wd4244") +# - C4800: forcing value to bool 'true' or 'false' (performance warning) +#add_compile_flags("/wd4244 /wd4290 /wd4800 ") +add_compile_flags("/wd4244 /wd4290 /wd4800") # The following warnings are treated as errors: # - C4013: implicit function declaration

1 0

[pschweitzer] 66265: [NTFS] NtfsMoonWalkID(): - Do not allow opening a file by ID if it's not in use any longer - Do not attempt to create the full path, if an error occured during walk
by pschweitzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: pschweitzer Date: Sat Feb 14 15:41:44 2015 New Revision: 66265 URL: http://svn.reactos.org/svn/reactos?rev=66265&view=rev Log: [NTFS] NtfsMoonWalkID(): - Do not allow opening a file by ID if it's not in use any longer - Do not attempt to create the full path, if an error occured during walk Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Feb 14 15:41:44 2015 @@ -116,6 +116,11 @@ break; ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + if (!(MftRecord->Flags & FRH_IN_USE)) + { + Status = STATUS_OBJECT_PATH_NOT_FOUND; + break; + } FileName = GetBestFileNameFromRecord(MftRecord); WritePosition -= FileName->NameLength; @@ -131,6 +136,9 @@ } ExFreePoolWithTag(MftRecord, TAG_NTFS); + + if (!NT_SUCCESS(Status)) + return Status; OutPath->Length = (MAX_PATH - WritePosition - 1) * sizeof(WCHAR); OutPath->MaximumLength = (MAX_PATH - WritePosition) * sizeof(WCHAR);

1 0

[pschweitzer] 66264: [NTFS] Simplify the implementation of the "Open by ID" feature of our driver. Instead of creating singleton FCB not linked to the rest of FS tree, just walk the whole path down...
by pschweitzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: pschweitzer Date: Sat Feb 14 15:35:35 2015 New Revision: 66264 URL: http://svn.reactos.org/svn/reactos?rev=66264&view=rev Log: [NTFS] Simplify the implementation of the "Open by ID" feature of our driver. Instead of creating singleton FCB not linked to the rest of FS tree, just walk the whole path down, to recreate it. This doesn't make nfi work properly though. Will investigate more. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Feb 14 15:35:35 2015 @@ -46,6 +46,18 @@ Fcb = pFileObject->FsContext; ASSERT(Fcb); + if (Fcb->Flags & FCB_IS_VOLUME) + { + /* This is likely to be an opening by ID, return ourselves */ + if (pRelativeFileName[0] == L'\\') + { + *pAbsoluteFilename = NULL; + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; + } + /* verify related object is a directory and target name don't start with \. */ if (NtfsFCBIsDirectory(Fcb) == FALSE || @@ -71,6 +83,66 @@ return STATUS_SUCCESS; } + +static +NTSTATUS +NtfsMoonWalkID(PDEVICE_EXTENSION DeviceExt, + ULONGLONG Id, + PUNICODE_STRING OutPath) +{ + NTSTATUS Status; + PFILE_RECORD_HEADER MftRecord; + PFILENAME_ATTRIBUTE FileName; + WCHAR FullPath[MAX_PATH]; + ULONG WritePosition = MAX_PATH - 1; + + DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); + + Id = Id & NTFS_MFT_MASK; + + RtlZeroMemory(FullPath, sizeof(FullPath)); + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + while (TRUE) + { + Status = ReadFileRecord(DeviceExt, Id, MftRecord); + if (!NT_SUCCESS(Status)) + break; + + ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + + FileName = GetBestFileNameFromRecord(MftRecord); + WritePosition -= FileName->NameLength; + ASSERT(WritePosition < MAX_PATH); + RtlCopyMemory(FullPath + WritePosition, FileName->Name, FileName->NameLength * sizeof(WCHAR)); + WritePosition -= 1; + ASSERT(WritePosition < MAX_PATH); + FullPath[WritePosition] = L'\\'; + + Id = FileName->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + if (Id == NTFS_FILE_ROOT) + break; + } + + ExFreePoolWithTag(MftRecord, TAG_NTFS); + + OutPath->Length = (MAX_PATH - WritePosition - 1) * sizeof(WCHAR); + OutPath->MaximumLength = (MAX_PATH - WritePosition) * sizeof(WCHAR); + OutPath->Buffer = ExAllocatePoolWithTag(NonPagedPool, OutPath->MaximumLength, TAG_NTFS); + if (OutPath->Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlCopyMemory(OutPath->Buffer, FullPath + WritePosition, OutPath->MaximumLength); + + return Status; +} /* * FUNCTION: Opens a file @@ -80,7 +152,6 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, PWSTR FileName, - BOOLEAN OpenById, PNTFS_FCB * FoundFCB) { PNTFS_FCB ParentFcb; @@ -88,81 +159,53 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %u, %p)\n", DeviceExt, FileObject, (!OpenById ? FileName : NULL), OpenById, FoundFCB); + DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); *FoundFCB = NULL; - if (OpenById) - { - ULONGLONG Id = (*(PULONGLONG)FileName) & NTFS_MFT_MASK; - - DPRINT1("Will attempt to open by id: %I64x\n", Id); - - Fcb = NtfsGrabFCBFromTableById(DeviceExt, - Id); - if (Fcb == NULL) - { - Status = NtfsGetFCBForFileById(DeviceExt, - &Fcb, - Id); - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - return Status; - } - - Fcb->Flags |= FCB_IS_OPEN_BY_ID; - } - } - else - { - if (FileObject->RelatedFileObject) - { - DPRINT("Converting relative filename to absolute filename\n"); - - Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, - FileName, - &AbsFileName); - FileName = AbsFileName; - if (!NT_SUCCESS(Status)) - { - return Status; - } - - return STATUS_UNSUCCESSFUL; - } - - //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) - - DPRINT("PathName to open: %S\n", FileName); - - /* try first to find an existing FCB in memory */ - DPRINT("Checking for existing FCB in memory\n"); - Fcb = NtfsGrabFCBFromTable(DeviceExt, + if (FileObject->RelatedFileObject) + { + DPRINT("Converting relative filename to absolute filename\n"); + + Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, + FileName, + &AbsFileName); + if (AbsFileName) FileName = AbsFileName; + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) + + DPRINT("PathName to open: %S\n", FileName); + + /* try first to find an existing FCB in memory */ + DPRINT("Checking for existing FCB in memory\n"); + Fcb = NtfsGrabFCBFromTable(DeviceExt, + FileName); + if (Fcb == NULL) + { + DPRINT("No existing FCB found, making a new one if file exists.\n"); + Status = NtfsGetFCBForFile(DeviceExt, + &ParentFcb, + &Fcb, FileName); - if (Fcb == NULL) - { - DPRINT("No existing FCB found, making a new one if file exists.\n"); - Status = NtfsGetFCBForFile(DeviceExt, - &ParentFcb, - &Fcb, - FileName); - if (ParentFcb != NULL) - { - NtfsReleaseFCB(DeviceExt, - ParentFcb); - } - - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - if (AbsFileName) - ExFreePool(AbsFileName); - - return Status; - } + if (ParentFcb != NULL) + { + NtfsReleaseFCB(DeviceExt, + ParentFcb); + } + + if (!NT_SUCCESS (Status)) + { + DPRINT("Could not make a new FCB, status: %x\n", Status); + + if (AbsFileName) + ExFreePool(AbsFileName); + + return Status; } } @@ -196,6 +239,7 @@ PNTFS_FCB Fcb; // PWSTR FileName; NTSTATUS Status; + UNICODE_STRING FullPath; DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, Irp); @@ -213,12 +257,6 @@ return STATUS_INVALID_PARAMETER; } - if (RequestedOptions & FILE_OPEN_BY_FILE_ID) - { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; - } - FileObject = Stack->FileObject; if (RequestedDisposition == FILE_CREATE || @@ -228,10 +266,18 @@ return STATUS_ACCESS_DENIED; } - if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID && - FileObject->FileName.Length != sizeof(ULONGLONG)) - { - return STATUS_INVALID_PARAMETER; + if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID) + { + if (FileObject->FileName.Length != sizeof(ULONGLONG)) + return STATUS_INVALID_PARAMETER; + + Status = NtfsMoonWalkID(DeviceExt, (*(PULONGLONG)FileObject->FileName.Buffer), &FullPath); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT1("Open by ID: %I64x -> %wZ\n", (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK, &FullPath); } /* This a open operation for the volume itself */ @@ -258,9 +304,13 @@ Status = NtfsOpenFile(DeviceExt, FileObject, - FileObject->FileName.Buffer, - ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID), + ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), &Fcb); + + if (RequestedOptions & FILE_OPEN_BY_FILE_ID) + { + ExFreePoolWithTag(FullPath.Buffer, TAG_NTFS); + } if (NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Feb 14 15:35:35 2015 @@ -220,8 +220,7 @@ Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); - if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) != FCB_IS_OPEN_BY_ID && - _wcsicmp(FileName, Fcb->PathName) == 0) + if (_wcsicmp(FileName, Fcb->PathName) == 0) { Fcb->RefCount++; KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -229,38 +228,6 @@ } //FIXME: need to compare against short name in FCB here - - current_entry = current_entry->Flink; - } - - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - - return NULL; -} - - -PNTFS_FCB -NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, - ULONGLONG Id) -{ - KIRQL oldIrql; - PNTFS_FCB Fcb; - PLIST_ENTRY current_entry; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - - current_entry = Vcb->FcbListHead.Flink; - while (current_entry != &Vcb->FcbListHead) - { - Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); - - if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) == FCB_IS_OPEN_BY_ID && - Fcb->MFTIndex == Id) - { - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return Fcb; - } current_entry = current_entry->Flink; } @@ -698,42 +665,6 @@ NTSTATUS -NtfsGetFCBForFileById(PNTFS_VCB Vcb, - PNTFS_FCB *pFCB, - ULONGLONG Id) -{ - NTSTATUS Status; - PFILE_RECORD_HEADER FileRecord; - - FileRecord = ExAllocatePoolWithTag(NonPagedPool, - Vcb->NtfsInfo.BytesPerFileRecord, - TAG_NTFS); - if (FileRecord == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ReadFileRecord(Vcb, Id, FileRecord); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return Status; - } - - if ((FileRecord->Flags & FRH_IN_USE) != FRH_IN_USE) - { - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return STATUS_INVALID_PARAMETER; - } - - Status = NtfsMakeFCBFromDirEntry(Vcb, NULL, NULL, FileRecord, Id, pFCB); - - ExFreePoolWithTag(FileRecord, TAG_NTFS); - - return Status; -} - -NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, PNTFS_FCB pFCB, ULONG Type, 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] Sat Feb 14 15:35:35 2015 @@ -416,7 +416,6 @@ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 -#define FCB_IS_OPEN_BY_ID 0x0008 #define MAX_PATH 260 typedef struct _FCB @@ -601,10 +600,6 @@ NtfsGrabFCBFromTable(PNTFS_VCB Vcb, PCWSTR FileName); -PNTFS_FCB -NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, - ULONGLONG Id); - NTSTATUS NtfsFCBInitializeCache(PNTFS_VCB Vcb, PNTFS_FCB Fcb); @@ -625,11 +620,6 @@ PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, const PWSTR pFileName); - -NTSTATUS -NtfsGetFCBForFileById(PNTFS_VCB Vcb, - PNTFS_FCB *pFCB, - ULONGLONG Id); NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb,

1 0

[tkreuzer] 66263: [SPEC2DEF] Silence warning about ignored C++ redirections
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 14:28:02 2015 New Revision: 66263 URL: http://svn.reactos.org/svn/reactos?rev=66263&view=rev Log: [SPEC2DEF] Silence warning about ignored C++ redirections Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat Feb 14 14:28:02 2015 @@ -567,8 +567,8 @@ { if (pexp->strName.buf[0] == '?') { - fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", - pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); + //fprintf(stderr, "warning: ignoring C++ redirection %.*s -> %.*s\n", + // pexp->strName.len, pexp->strName.buf, pexp->strTarget.len, pexp->strTarget.buf); } else {

1 0

[tkreuzer] 66262: [GDI32_APITEST] Add additional tests for CreateBitmap and fix a test. Patch by Victor Martinez ROSTESTS-56 #resolve
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 14:07:50 2015 New Revision: 66262 URL: http://svn.reactos.org/svn/reactos?rev=66262&view=rev Log: [GDI32_APITEST] Add additional tests for CreateBitmap and fix a test. Patch by Victor Martinez ROSTESTS-56 #resolve Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sat Feb 14 14:07:50 2015 @@ -76,12 +76,13 @@ ok_err(0); /* Check for overflow in width * height */ - hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL); - //ok(hbmp != 0, "\n"); // fails on windows 2003 - DeleteObject(hbmp); - - SetLastError(0); - hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL); + hbmp = CreateBitmap(0x2000, 0x4000, 1, 1, NULL); //128 MB.Should work. + ok(hbmp != 0, "\n"); + DeleteObject(hbmp); + + /* XP doesn't allow to create bitmaps larger than 128 Mb */ + SetLastError(0); + hbmp = CreateBitmap(0x2000, 0x4001, 1, 1, NULL);//More than 128MB.Should fail. ok(hbmp == 0, "\n"); ok_err(0); @@ -98,6 +99,7 @@ HBITMAP hbmp; BITMAP bitmap; ULONG cjWidthBytes, cBitsPixel, cExpectedBitsPixel; + int result, TestBitsPixel, ExpectedBitsPixel; hbmp = CreateBitmap(0, 0, 0, 0, NULL); ok(hbmp != 0, "should get a 1x1 bitmap\n"); @@ -112,6 +114,36 @@ ok_ptr(bitmap.bmBits, 0); DeleteObject(hbmp); + /* Above 32 bpp should fail */ + hbmp = CreateBitmap(1, 2, 1, 33, NULL); + ok(hbmp == 0, "should fail\n"); + + for (TestBitsPixel = 0; TestBitsPixel <= 32; TestBitsPixel++) + { + /* CreateBitmap API accepts any number as BitsPixels param. + but it can only create 1, 4, 8, 16, 24, 32 bpp bitmaps */ + if (TestBitsPixel <= 1) ExpectedBitsPixel = 1; + else if(TestBitsPixel <= 4) ExpectedBitsPixel = 4; + else if(TestBitsPixel <= 8) ExpectedBitsPixel = 8; + else if(TestBitsPixel <= 16) ExpectedBitsPixel = 16; + else if(TestBitsPixel <= 24) ExpectedBitsPixel = 24; + else if(TestBitsPixel <= 32) ExpectedBitsPixel = 32; + + /* Calculate proper bmWidthBytes */ + + hbmp = CreateBitmap(1, 2, 1, TestBitsPixel, NULL); + ok(hbmp != 0, "should get a 1x2 bitmap\n"); + result = GetObject(hbmp, sizeof(bitmap), &bitmap); + ok(result > 0, "result = %d\n", result); + ok(bitmap.bmType == 0, "bmType = %ld\n", bitmap.bmType); + ok(bitmap.bmWidth == 1, "bmWidth = %ld\n", bitmap.bmWidth); + ok(bitmap.bmHeight == 2, "bmHeight = %ld\n", bitmap.bmHeight); + ok(bitmap.bmPlanes == 1, "bmPlanes = %d\n", bitmap.bmPlanes); + ok(bitmap.bmBitsPixel == ExpectedBitsPixel, "bmBitsPixel = %d ExpectedBitsPixel= %d \n", bitmap.bmBitsPixel, ExpectedBitsPixel); + ok(bitmap.bmBits == 0, "bmBits = %p\n", bitmap.bmBits); + DeleteObject(hbmp); + } + hbmp = CreateBitmap(1, 2, 1, 1, NULL); ok(hbmp != 0, "should get a 1x2 bitmap\n"); ok_int(GetObject(hbmp, sizeof(bitmap), &bitmap), sizeof(BITMAP)); @@ -162,7 +194,7 @@ START_TEST(CreateBitmap) { - //Test_CreateBitmap_Params(); + Test_CreateBitmap_Params(); Test_CreateBitmap(); }

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