Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[pschweitzer] 75910: [FSUTIL] Implement fsutil volume dismount CORE-13805
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 08:15:10 2017 New Revision: 75910 URL: http://svn.reactos.org/svn/reactos?rev=75910&view=rev Log: [FSUTIL] Implement fsutil volume dismount CORE-13805 Added: trunk/reactos/base/applications/cmdutils/fsutil/volume.c (with props) Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -4,6 +4,7 @@ fsinfo.c fsutil.c hardlink.c + volume.c fsutil.h) add_executable(fsutil ${SOURCE} fsutil.rc) set_module_type(fsutil win32cui UNICODE) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -12,12 +12,14 @@ HandlerProc DirtyMain; HandlerProc FsInfoMain; HandlerProc HardLinkMain; +HandlerProc VolumeMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") }, { FsInfoMain, _T("fsinfo"), _T("Gathers informations about file systems") }, { HardLinkMain, _T("hardlink"), _T("Handles hard links") }, + { VolumeMain, _T("volume"), _T("Manages volumes") }, }; static void Added: trunk/reactos/base/applications/cmdutils/fsutil/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/volume.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -0,0 +1,96 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/volume.c + * PURPOSE: FSutil volumes management + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "fsutil.h" + +/* Add handlers here for subcommands */ +static HandlerProc DismountMain; +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { DismountMain, _T("dismount"), _T("Dismounts a volume") }, +}; + +static int +LockOrUnlockVolume(HANDLE Volume, BOOLEAN Lock) +{ + DWORD Operation; + ULONG BytesRead; + + Operation = (Lock ? FSCTL_LOCK_VOLUME : FSCTL_UNLOCK_VOLUME); + if (DeviceIoControl(Volume, Operation, NULL, 0, NULL, 0, + &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + return 1; + } + + return 0; +} + +static int +DismountMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + ULONG BytesRead; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil volume dismount <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil volume dismount d:\n")); + return 1; + } + + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); + if (Volume == INVALID_HANDLE_VALUE) + { + return 1; + } + + /* Attempt to lock the volume */ + if (LockOrUnlockVolume(Volume, TRUE)) + { + CloseHandle(Volume); + return 1; + } + + /* Issue the dismount command */ + if (DeviceIoControl(Volume, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, + 0, &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + LockOrUnlockVolume(Volume, FALSE); + CloseHandle(Volume); + return 1; + } + + /* Unlock and quit */ + LockOrUnlockVolume(Volume, FALSE); + CloseHandle(Volume); + + _ftprintf(stdout, _T("The %s volume has been dismounted\n"), argv[1]); + + return 0; +} + +static void +PrintUsage(const TCHAR * Command) +{ + PrintDefaultUsage(_T(" VOLUME "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); +} + +int +VolumeMain(int argc, const TCHAR *argv[]) +{ + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/volume.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 75909: [FSUTIL] Define handlers type
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 07:50:48 2017 New Revision: 75909 URL: http://svn.reactos.org/svn/reactos?rev=75909&view=rev Log: [FSUTIL] Define handlers type Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -10,8 +10,8 @@ #include <winioctl.h> /* Add handlers here for subcommands */ -static int QueryMain(int argc, const TCHAR *argv[]); -static int SetMain(int argc, const TCHAR *argv[]); +static HandlerProc QueryMain; +static HandlerProc SetMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int DrivesMain(int argc, const TCHAR *argv[]); -static int DriveTypeMain(int argc, const TCHAR *argv[]); -static int VolumeInfoMain(int argc, const TCHAR *argv[]); +static HandlerProc DrivesMain; +static HandlerProc DriveTypeMain; +static HandlerProc VolumeInfoMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for commands */ -int DirtyMain(int argc, const TCHAR *argv[]); -int FsInfoMain(int argc, const TCHAR *argv[]); -int HardLinkMain(int argc, const TCHAR *argv[]); +HandlerProc DirtyMain; +HandlerProc FsInfoMain; +HandlerProc HardLinkMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -5,9 +5,12 @@ #include <tchar.h> #include <stdio.h> +typedef int (HandlerProc)(int argc, const TCHAR *argv[]); +typedef HandlerProc * pHandlerProc; + typedef struct { - int (*Handler)(int argc, const TCHAR *argv[]); + pHandlerProc Handler; const TCHAR * Command; const TCHAR * Desc; } HandlerItem; Modified: trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,7 +9,7 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int CreateMain(int argc, const TCHAR *argv[]); +static HandlerProc CreateMain; static HandlerItem HandlersList[] = { /* Proc, name, help */

1 0

[pschweitzer] 75908: [FASTFAT] Only perform dismount check on close/cleanup for volume opening. This prevents random dismounts and fixes 1st stage when ENABLE_SWAPOUT is enabled in FastFAT (disable...
by pschweitzer＠svn.reactos.org 19 Sep '17

19 Sep '17

Author: pschweitzer Date: Tue Sep 19 21:19:55 2017 New Revision: 75908 URL: http://svn.reactos.org/svn/reactos?rev=75908&view=rev Log: [FASTFAT] Only perform dismount check on close/cleanup for volume opening. This prevents random dismounts and fixes 1st stage when ENABLE_SWAPOUT is enabled in FastFAT (disabled by default). CORE-13805 Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/close.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Tue Sep 19 21:19:55 2017 @@ -25,6 +25,7 @@ { PVFATFCB pFcb; PVFATCCB pCcb; + BOOLEAN IsVolume; PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; PFILE_OBJECT FileObject = IrpContext->FileObject; @@ -36,7 +37,8 @@ if (!pFcb) return STATUS_SUCCESS; - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); + if (IsVolume) { pFcb->OpenHandleCount--; @@ -145,7 +147,7 @@ } #ifdef ENABLE_SWAPOUT - if (BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) + if (IsVolume && BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) { VfatCheckForDismount(DeviceExt, FALSE); } Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Tue Sep 19 21:19:55 2017 @@ -25,6 +25,7 @@ { PVFATFCB pFcb; PVFATCCB pCcb; + BOOLEAN IsVolume; NTSTATUS Status = STATUS_SUCCESS; DPRINT("VfatCloseFile(DeviceExt %p, FileObject %p)\n", @@ -39,7 +40,8 @@ return STATUS_SUCCESS; } - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); + if (IsVolume) { DPRINT("Volume\n"); FileObject->FsContext2 = NULL; @@ -59,7 +61,7 @@ } #ifdef ENABLE_SWAPOUT - if (DeviceExt->OpenHandleCount == 0) + if (IsVolume && DeviceExt->OpenHandleCount == 0) { VfatCheckForDismount(DeviceExt, FALSE); }

1 0

[tfaber] 75907: [USBPORT] - Simplify some loops in USBPORT_OpenInterface. No logical changes
by tfaber＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: tfaber Date: Mon Sep 18 12:01:12 2017 New Revision: 75907 URL: http://svn.reactos.org/svn/reactos?rev=75907&view=rev Log: [USBPORT] - Simplify some loops in USBPORT_OpenInterface. No logical changes Modified: trunk/reactos/drivers/usb/usbport/device.c Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Mon Sep 18 12:01:12 2017 @@ -304,17 +304,12 @@ RtlZeroMemory(InterfaceHandle, HandleLength); - if (NumEndpoints > 0) - { - PipeHandle = &InterfaceHandle->PipeHandle[0]; - - for (ix = 0; ix < NumEndpoints; ++ix) - { - PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; - PipeHandle->Endpoint = NULL; - - PipeHandle += 1; - } + for (ix = 0; ix < NumEndpoints; ++ix) + { + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; + PipeHandle->Endpoint = NULL; } IsAllocated = TRUE; @@ -335,79 +330,71 @@ Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (NumEndpoints) - { - PipeHandle = &InterfaceHandle->PipeHandle[0]; - + for (ix = 0; ix < NumEndpoints; ++ix) + { + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) + { + if (Descriptor->bLength == 0) + { + break; + } + else + { + Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + + Descriptor->bLength); + } + } + + if (InterfaceInfo->Pipes[ix].PipeFlags & USBD_PF_CHANGE_MAX_PACKET) + { + Descriptor->wMaxPacketSize = InterfaceInfo->Pipes[ix].MaximumPacketSize; + } + + RtlCopyMemory(&PipeHandle->EndpointDescriptor, + Descriptor, + sizeof(USB_ENDPOINT_DESCRIPTOR)); + + PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; + PipeHandle->PipeFlags = InterfaceInfo->Pipes[ix].PipeFlags; + PipeHandle->Endpoint = NULL; + + wMaxPacketSize = Descriptor->wMaxPacketSize; + + /* USB 2.0 Specification, 5.9 High-Speed, High Bandwidth Endpoints */ + MaxPacketSize = (wMaxPacketSize & 0x7FF) * (((wMaxPacketSize >> 11) & 3) + 1); + + InterfaceInfo->Pipes[ix].EndpointAddress = Descriptor->bEndpointAddress; + InterfaceInfo->Pipes[ix].PipeType = Descriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK; + InterfaceInfo->Pipes[ix].MaximumPacketSize = MaxPacketSize; + InterfaceInfo->Pipes[ix].PipeHandle = (USBD_PIPE_HANDLE)-1; + InterfaceInfo->Pipes[ix].Interval = Descriptor->bInterval; + + Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + + Descriptor->bLength); + } + + if (USBD_SUCCESS(USBDStatus)) + { for (ix = 0; ix < NumEndpoints; ++ix) { - while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) - { - if (Descriptor->bLength == 0) - { - break; - } - else - { - Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + - Descriptor->bLength); - } - } - - if (InterfaceInfo->Pipes[ix].PipeFlags & USBD_PF_CHANGE_MAX_PACKET) - { - Descriptor->wMaxPacketSize = InterfaceInfo->Pipes[ix].MaximumPacketSize; - } - - RtlCopyMemory(&PipeHandle->EndpointDescriptor, - Descriptor, - sizeof(USB_ENDPOINT_DESCRIPTOR)); - - PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; - PipeHandle->PipeFlags = InterfaceInfo->Pipes[ix].PipeFlags; - PipeHandle->Endpoint = NULL; - - wMaxPacketSize = Descriptor->wMaxPacketSize; - - /* USB 2.0 Specification, 5.9 High-Speed, High Bandwidth Endpoints */ - MaxPacketSize = (wMaxPacketSize & 0x7FF) * (((wMaxPacketSize >> 11) & 3) + 1); - - InterfaceInfo->Pipes[ix].EndpointAddress = Descriptor->bEndpointAddress; - InterfaceInfo->Pipes[ix].PipeType = Descriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK; - InterfaceInfo->Pipes[ix].MaximumPacketSize = MaxPacketSize; - InterfaceInfo->Pipes[ix].PipeHandle = (USBD_PIPE_HANDLE)-1; - InterfaceInfo->Pipes[ix].Interval = Descriptor->bInterval; - - Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + - Descriptor->bLength); - - PipeHandle += 1; - } - } - - if (USBD_SUCCESS(USBDStatus)) - { + PipeInfo = &InterfaceInfo->Pipes[ix]; + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + Status = USBPORT_OpenPipe(FdoDevice, + DeviceHandle, + PipeHandle, + &USBDStatus); + + if (!NT_SUCCESS(Status)) + break; + + PipeInfo->PipeHandle = PipeHandle; + } + if (NumEndpoints) { - PipeInfo = &InterfaceInfo->Pipes[0]; - PipeHandle = &InterfaceHandle->PipeHandle[0]; - - for (ix = 0; ix < NumEndpoints; ++ix) - { - Status = USBPORT_OpenPipe(FdoDevice, - DeviceHandle, - PipeHandle, - &USBDStatus); - - if (!NT_SUCCESS(Status)) - break; - - PipeInfo->PipeHandle = PipeHandle; - - PipeHandle += 1; - PipeInfo += 1; - } - USBPORT_USBDStatusToNtStatus(Urb, USBDStatus); } } @@ -847,7 +834,7 @@ PipeHandleList = PipeHandleList->Flink; - if (!(PipeHandle->Flags & PIPE_HANDLE_FLAG_NULL_PACKET_SIZE) && + if (!(PipeHandle->Flags & PIPE_HANDLE_FLAG_NULL_PACKET_SIZE) && USBPORT_EndpointHasQueuedTransfers(FdoDevice, PipeHandle->Endpoint, NULL)) { return TRUE;

1 0

[tfaber] 75906: [USBPORT] - Rename NumInterfaces to NumEndpoints in USBPORT_OpenInterface
by tfaber＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: tfaber Date: Mon Sep 18 11:50:42 2017 New Revision: 75906 URL: http://svn.reactos.org/svn/reactos?rev=75906&view=rev Log: [USBPORT] - Rename NumInterfaces to NumEndpoints in USBPORT_OpenInterface Modified: trunk/reactos/drivers/usb/usbport/device.c Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Mon Sep 18 11:50:42 2017 @@ -256,7 +256,7 @@ PUSBPORT_PIPE_HANDLE PipeHandle; PUSB_ENDPOINT_DESCRIPTOR Descriptor; PUSBD_PIPE_INFORMATION PipeInfo; - ULONG NumInterfaces; + ULONG NumEndpoints; SIZE_T Length; SIZE_T HandleLength; BOOLEAN IsAllocated = FALSE; @@ -273,10 +273,10 @@ InterfaceInfo->AlternateSetting, &InterfaceInfo->AlternateSetting); - NumInterfaces = InterfaceDescriptor->bNumEndpoints; + NumEndpoints = InterfaceDescriptor->bNumEndpoints; Length = sizeof(USBD_INTERFACE_INFORMATION) + - (NumInterfaces - 1) * sizeof(USBD_PIPE_INFORMATION); + (NumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); if (InterfaceInfo->AlternateSetting && IsSetInterface) { @@ -290,7 +290,7 @@ else { HandleLength = sizeof(USBPORT_INTERFACE_HANDLE) + - (NumInterfaces - 1) * sizeof(USBPORT_PIPE_HANDLE); + (NumEndpoints - 1) * sizeof(USBPORT_PIPE_HANDLE); InterfaceHandle = ExAllocatePoolWithTag(NonPagedPool, HandleLength, @@ -304,11 +304,11 @@ RtlZeroMemory(InterfaceHandle, HandleLength); - if (NumInterfaces > 0) + if (NumEndpoints > 0) { PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; PipeHandle->Endpoint = NULL; @@ -335,11 +335,11 @@ Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (NumInterfaces) + if (NumEndpoints) { PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) { @@ -387,12 +387,12 @@ if (USBD_SUCCESS(USBDStatus)) { - if (NumInterfaces) + if (NumEndpoints) { PipeInfo = &InterfaceInfo->Pipes[0]; PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { Status = USBPORT_OpenPipe(FdoDevice, DeviceHandle, @@ -424,7 +424,7 @@ { if (InterfaceHandle) { - if (NumInterfaces) + if (NumEndpoints) { DPRINT1("USBPORT_OpenInterface: USBDStatus - %lx\n", USBDStatus); }

1 0

[dquintana] 75905: * The work has been merged to trunk, this branch is now obsolete.
by dquintana＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: dquintana Date: Mon Sep 18 08:49:20 2017 New Revision: 75905 URL: http://svn.reactos.org/svn/reactos?rev=75905&view=rev Log: * The work has been merged to trunk, this branch is now obsolete. Removed: branches/GSoC_2017/rapps/

1 0

[dquintana] 75904: * Get rid of the old branch where I did my shell work. It was merged 3 years ago.
by dquintana＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: dquintana Date: Mon Sep 18 08:46:17 2017 New Revision: 75904 URL: http://svn.reactos.org/svn/reactos?rev=75904&view=rev Log: * Get rid of the old branch where I did my shell work. It was merged 3 years ago. Removed: branches/shell-experiments/

1 0

[akhaldi] 75903: [URLMON_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:58:07 2017 New Revision: 75903 URL: http://svn.reactos.org/svn/reactos?rev=75903&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sun Sep 17 22:58:07 2017 @@ -99,6 +99,7 @@ DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(QueryService_HttpSecurity); +DEFINE_EXPECT(QueryService_IBindCallbackRedirect); DEFINE_EXPECT(QueryInterface_IWinInetInfo); DEFINE_EXPECT(QueryInterface_IWinInetHttpInfo); DEFINE_EXPECT(BeginningTransaction); @@ -128,6 +129,7 @@ DEFINE_EXPECT(MimeFilter_Continue); DEFINE_EXPECT(Stream_Seek); DEFINE_EXPECT(Stream_Read); +DEFINE_EXPECT(Redirect); static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR index_url[] = @@ -145,9 +147,9 @@ static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; static IInternetProtocol *async_protocol = NULL; -static BOOL first_data_notif, http_is_first, test_redirect; +static BOOL first_data_notif, http_is_first, test_redirect, redirect_on_continue; static int prot_state, read_report_data, post_stream_read; -static DWORD bindf, ex_priority , pi; +static DWORD bindf, ex_priority , pi, bindinfo_options; static IInternetProtocol *binding_protocol, *filtered_protocol; static IInternetBindInfo *prot_bind_info; static IInternetProtocolSink *binding_sink, *filtered_sink; @@ -372,6 +374,39 @@ static IHttpNegotiate2 http_negotiate = { &HttpNegotiateVtbl }; +static HRESULT WINAPI BindCallbackRedirect_QueryInterface(IBindCallbackRedirect *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BindCallbackRedirect_AddRef(IBindCallbackRedirect *iface) +{ + return 2; +} + +static ULONG WINAPI BindCallbackRedirect_Release(IBindCallbackRedirect *iface) +{ + return 1; +} + +static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface, const WCHAR *url, VARIANT_BOOL *cancel) +{ + CHECK_EXPECT(Redirect); + *cancel = VARIANT_FALSE; + return S_OK; +} + +static const IBindCallbackRedirectVtbl BindCallbackRedirectVtbl = { + BindCallbackRedirect_QueryInterface, + BindCallbackRedirect_AddRef, + BindCallbackRedirect_Release, + BindCallbackRedirect_Redirect +}; + +static IBindCallbackRedirect redirect_callback = { &BindCallbackRedirectVtbl }; + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) @@ -407,6 +442,13 @@ ok(IsEqualGUID(&IID_IHttpSecurity, riid), "unexpected riid\n"); CHECK_EXPECT(QueryService_HttpSecurity); return IHttpSecurity_QueryInterface(&http_security, riid, ppv); + } + + if(IsEqualGUID(&IID_IBindCallbackRedirect, guidService)) { + CHECK_EXPECT(QueryService_IBindCallbackRedirect); + ok(IsEqualGUID(&IID_IBindCallbackRedirect, riid), "riid = %s\n", wine_dbgstr_guid(riid)); + *ppv = &redirect_callback; + return S_OK; } if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { @@ -600,7 +642,7 @@ todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } @@ -611,7 +653,8 @@ SET_EXPECT(ReportProgress_SENDINGREQUEST); break; case STATE_STARTDOWNLOADING: - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { SET_EXPECT(OnResponse); if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); @@ -624,13 +667,13 @@ break; } - if(state != STATE_SENDINGREQUEST) + if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) SET_EXPECT(ReportData); hres = IInternetProtocol_Continue(async_protocol, protocol_data); ok(hres == S_OK, "Continue failed: %08x\n", hres); if(tested_protocol == FTP_TEST || security_problem) CLEAR_CALLED(ReportData); - else if(state != STATE_SENDINGREQUEST) + else if(state != STATE_SENDINGREQUEST && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) CHECK_CALLED(ReportData); switch(state) { @@ -640,10 +683,10 @@ state = STATE_STARTDOWNLOADING; break; case STATE_STARTDOWNLOADING: - if (! security_problem) - { + if(!security_problem) { state = STATE_DOWNLOADING; - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + if((tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + && (!test_redirect || !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))) { CHECK_CALLED(OnResponse); if(tested_protocol == HTTPS_TEST || empty_file) CHECK_CALLED(ReportProgress_ACCEPTRANGES); @@ -1093,13 +1136,17 @@ exit(1); } #endif - if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort) + if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort || hrResult == INET_E_REDIRECT_FAILED) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS || broken(tested_protocol == MK_TEST), /* WinME and NT4 */ "dwError == ERROR_SUCCESS\n"); - ok(!szResult, "szResult != NULL\n"); + + if(hrResult == INET_E_REDIRECT_FAILED) + ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + else + ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); if(direct_read) SET_EXPECT(ReportData); /* checked after main loop */ @@ -1328,6 +1375,7 @@ cbSize = pbindinfo->cbSize; memset(pbindinfo, 0, cbSize); pbindinfo->cbSize = cbSize; + pbindinfo->dwOptions = bindinfo_options; if(http_post_test) { @@ -1343,21 +1391,6 @@ memcpy(data, post_data, sizeof(post_data)); U(pbindinfo->stgmedData).hGlobal = data; }else { - IStream *post_stream; - HGLOBAL data; - HRESULT hres; - - if(0) { - /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly */ - data = GlobalAlloc(GPTR, sizeof(post_data)); - memcpy(data, post_data, sizeof(post_data)); - U(pbindinfo->stgmedData).hGlobal = data; - - hres = CreateStreamOnHGlobal(data, FALSE, &post_stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); - - U(pbindinfo->stgmedData).pstm =post_stream;/* &Stream; */ - } U(pbindinfo->stgmedData).pstm = &Stream; } } @@ -1567,6 +1600,7 @@ static DWORD WINAPI thread_proc(PVOID arg) { + BOOL redirect_only = redirect_on_continue; HRESULT hres; memset(&protocoldata, -1, sizeof(protocoldata)); @@ -1596,6 +1630,11 @@ hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); CHECK_CALLED(Switch); ok(hres == S_OK, "Switch failed: %08x\n", hres); + + if(redirect_only) { + prot_state = 0; + return 0; + } if(!short_read) { prot_state = 2; @@ -1663,8 +1702,14 @@ memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); memcpy(&exp_bindinfo, &bindinfo, sizeof(bindinfo)); + if(test_redirect) + exp_bindinfo.dwOptions = bindinfo_options; SET_EXPECT(GetBindInfo); + if(redirect_on_continue && (bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + SET_EXPECT(QueryService_IBindCallbackRedirect); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &cbindf, &bindinfo); + if(redirect_on_continue && (bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + CHECK_CALLED(QueryService_IBindCallbackRedirect); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); CHECK_CALLED(GetBindInfo); ok(cbindf == (bindf|BINDF_FROMURLMON), "bindf = %x, expected %x\n", @@ -1848,6 +1893,35 @@ IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; static const WCHAR header[] = {'?',0}; + static const WCHAR redirect_urlW[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; + + if(redirect_on_continue) { + redirect_on_continue = FALSE; + + if(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + SET_EXPECT(Redirect); + SET_EXPECT(ReportProgress_REDIRECTING); + SET_EXPECT(Terminate); + SET_EXPECT(QueryService_InternetProtocol); + SET_EXPECT(CreateInstance); + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); + SET_EXPECT(SetPriority); + SET_EXPECT(Start); + hres = IInternetProtocolSink_ReportResult(binding_sink, INET_E_REDIRECT_FAILED, ERROR_SUCCESS, redirect_urlW); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + if(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + CHECK_CALLED(Redirect); + CHECK_CALLED(ReportProgress_REDIRECTING); + CHECK_CALLED(Terminate); + CHECK_CALLED(QueryService_InternetProtocol); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); + todo_wine CHECK_NOT_CALLED(SetPriority); + CHECK_CALLED(Start); + + return S_OK; + } hres = IInternetProtocolSink_QueryInterface(binding_sink, &IID_IServiceProvider, (void**)&service_provider); @@ -2283,9 +2357,73 @@ static IInternetProtocolEx MimeProtocol = { &MimeProtocolVtbl }; +static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI InternetProtocolInfo_AddRef(IInternetProtocolInfo *iface) +{ + return 2; +} + +static ULONG WINAPI InternetProtocolInfo_Release(IInternetProtocolInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, + DWORD *pcchResult, DWORD dwReserved) +{ + ok(0, "unexpected call %d\n", ParseAction); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, + LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, + LPCWSTR pwzUrl, QUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, + DWORD cbBuffer, DWORD *pcbBuf, DWORD dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IInternetProtocolInfoVtbl InternetProtocolInfoVtbl = { + InternetProtocolInfo_QueryInterface, + InternetProtocolInfo_AddRef, + InternetProtocolInfo_Release, + InternetProtocolInfo_ParseUrl, + InternetProtocolInfo_CombineUrl, + InternetProtocolInfo_CompareUrl, + InternetProtocolInfo_QueryInfo +}; + +static IInternetProtocolInfo protocol_info = { &InternetProtocolInfoVtbl }; + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { + *ppv = &protocol_info; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -2364,6 +2502,7 @@ #define TEST_EMPTY 0x1000 #define TEST_NOMIME 0x2000 #define TEST_FROMCACHE 0x4000 +#define TEST_DISABLEAUTOREDIRECT 0x8000 static void register_filter(BOOL do_register) { @@ -2415,12 +2554,16 @@ wait_for_switch = TRUE; short_read = (flags & TEST_SHORT_READ) != 0; http_post_test = TYMED_NULL; - test_redirect = (flags & TEST_REDIRECT) != 0; + redirect_on_continue = test_redirect = (flags & TEST_REDIRECT) != 0; test_abort = (flags & TEST_ABORT) != 0; impl_protex = (flags & TEST_IMPLPROTEX) != 0; empty_file = (flags & TEST_EMPTY) != 0; bind_from_cache = (flags & TEST_FROMCACHE) != 0; file_with_hash = FALSE; + + bindinfo_options = 0; + if(flags & TEST_DISABLEAUTOREDIRECT) + bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; register_filter(mimefilter_test); } @@ -3022,7 +3165,6 @@ init_test(prot, flags); http_url = url; http_post_test = tymed; - if(flags & TEST_FROMCACHE) create_cache_entry(url); @@ -3060,7 +3202,7 @@ SET_EXPECT(ReportProgress_CONNECTING); } SET_EXPECT(ReportProgress_SENDINGREQUEST); - if(test_redirect) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) SET_EXPECT(ReportProgress_REDIRECTING); SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) @@ -3083,7 +3225,13 @@ if(!direct_read && !test_abort && !bind_from_cache) SET_EXPECT(ReportResult); - expect_hrResult = test_abort ? E_ABORT : S_OK; + + if(flags & TEST_DISABLEAUTOREDIRECT) + expect_hrResult = INET_E_REDIRECT_FAILED; + else if(test_abort) + expect_hrResult = E_ABORT; + else + expect_hrResult = S_OK; if(direct_read) { SET_EXPECT(Switch); @@ -3233,6 +3381,10 @@ trace("Testing http protocol (redirected)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT, TYMED_NULL); + + trace("Testing http protocol (redirected, disable auto redirect)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT | TEST_DISABLEAUTOREDIRECT, TYMED_NULL); trace("Testing http protocol empty file...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; @@ -3837,6 +3989,10 @@ test_binding(ITS_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT); trace("Testing http binding (mime verification, emulate prot, short read, direct read)...\n"); test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_SHORT_READ|TEST_DIRECT_READ); + trace("Testing http binding (mime verification, redirect, emulate prot)...\n"); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_REDIRECT); + trace("Testing http binding (mime verification, redirect, disable auto redirect, emulate prot)...\n"); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_REDIRECT|TEST_DISABLEAUTOREDIRECT); trace("Testing file binding (mime verification, emulate prot, mime filter)...\n"); test_binding(FILE_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_FILTER); trace("Testing http binding (mime verification, emulate prot, mime filter)...\n");

1 0

[akhaldi] 75902: [URLMON] Sync with Wine Staging 2.16. CORE-13762 5660a9b urlmon: Remove a redundant NULL check before SysFreeString(). acb1f03 urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:58:01 2017 New Revision: 75902 URL: http://svn.reactos.org/svn/reactos?rev=75902&view=rev Log: [URLMON] Sync with Wine Staging 2.16. CORE-13762 5660a9b urlmon: Remove a redundant NULL check before SysFreeString(). acb1f03 urlmon: Support BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in BindProtocol object. ccc5ba2 urlmon: Added a helper function for releasing protocol handler. cded077 urlmon: Release previously set URI in BindProtocol::StartEx. 9e92254 urlmon: Added support for BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS in http protocol handler. Modified: trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/urlmon_main.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -325,6 +325,31 @@ return ref; } +static void release_protocol_handler(BindProtocol *This) +{ + if(This->wininet_info) { + IWinInetInfo_Release(This->wininet_info); + This->wininet_info = NULL; + } + if(This->wininet_http_info) { + IWinInetHttpInfo_Release(This->wininet_http_info); + This->wininet_http_info = NULL; + } + if(This->protocol) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } + if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) { + IInternetProtocol_Release(This->protocol_handler); + This->protocol_handler = &This->default_protocol_handler.IInternetProtocol_iface; + } + if(This->protocol_sink_handler && + This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) { + IInternetProtocolSink_Release(This->protocol_sink_handler); + This->protocol_sink_handler = &This->default_protocol_handler.IInternetProtocolSink_iface; + } +} + static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) { BindProtocol *This = impl_from_IInternetProtocolEx(iface); @@ -333,19 +358,11 @@ TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->wininet_info) - IWinInetInfo_Release(This->wininet_info); - if(This->wininet_http_info) - IWinInetHttpInfo_Release(This->wininet_http_info); - if(This->protocol) - IInternetProtocol_Release(This->protocol); + release_protocol_handler(This); + if(This->redirect_callback) + IBindCallbackRedirect_Release(This->redirect_callback); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) - IInternetProtocol_Release(This->protocol_handler); - if(This->protocol_sink_handler && - This->protocol_sink_handler != &This->default_protocol_handler.IInternetProtocolSink_iface) - IInternetProtocolSink_Release(This->protocol_sink_handler); if(This->uri) IUri_Release(This->uri); SysFreeString(This->display_uri); @@ -489,6 +506,10 @@ This->pi = grfPI; + if(This->uri) { + SysFreeString(This->display_uri); + IUri_Release(This->uri); + } IUri_AddRef(pUri); This->uri = pUri; @@ -707,6 +728,11 @@ This->bind_info = NULL; } + if(This->redirect_callback) { + IBindCallbackRedirect_Release(This->redirect_callback); + This->redirect_callback = NULL; + } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; } @@ -969,12 +995,42 @@ return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); } +static HRESULT handle_redirect(BindProtocol *This, const WCHAR *url) +{ + HRESULT hres; + + if(This->redirect_callback) { + VARIANT_BOOL cancel = VARIANT_FALSE; + IBindCallbackRedirect_Redirect(This->redirect_callback, url, &cancel); + if(cancel) + return INET_E_REDIRECT_FAILED; + } + + if(This->protocol_sink) { + hres = IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_REDIRECTING, url); + if(FAILED(hres)) + return hres; + } + + IInternetProtocol_Terminate(This->protocol, 0); /* should this be done in StartEx? */ + release_protocol_handler(This); + + return IInternetProtocolEx_Start(&This->IInternetProtocolEx_iface, url, This->protocol_sink, This->bind_info, This->pi, 0); +} + static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface); TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + + if(hrResult == INET_E_REDIRECT_FAILED) { + hrResult = handle_redirect(This, szResult); + if(hrResult == S_OK) + return S_OK; + szResult = NULL; + } if(This->protocol_sink) return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); @@ -1029,6 +1085,17 @@ return hres; } + if((pbindinfo->dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && !This->redirect_callback) { + IServiceProvider *service_provider; + + hres = IInternetProtocolSink_QueryInterface(This->protocol_sink, &IID_IServiceProvider, (void**)&service_provider); + if(SUCCEEDED(hres)) { + hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, + (void**)&This->redirect_callback); + IServiceProvider_Release(service_provider); + } + } + *grfBINDF |= BINDF_FROMURLMON; return hres; } Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -475,6 +475,18 @@ return S_OK; } +static BOOL is_redirect_response(DWORD status_code) +{ + switch(status_code) { + case HTTP_STATUS_REDIRECT: + case HTTP_STATUS_MOVED: + case HTTP_STATUS_REDIRECT_KEEP_VERB: + case HTTP_STATUS_REDIRECT_METHOD: + return TRUE; + } + return FALSE; +} + static HRESULT HttpProtocol_start_downloading(Protocol *prot) { HttpProtocol *This = impl_from_Protocol(prot); @@ -495,7 +507,21 @@ res = HttpQueryInfoW(This->base.request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status_code, &len, NULL); if(res) { - LPWSTR response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); + WCHAR *response_headers; + + if((This->base.bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) && is_redirect_response(status_code)) { + WCHAR *location; + + TRACE("Got redirect with disabled auto redirects\n"); + + location = query_http_info(This, HTTP_QUERY_LOCATION); + This->base.flags |= FLAG_RESULT_REPORTED | FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportResult(This->base.protocol_sink, INET_E_REDIRECT_FAILED, 0, location); + heap_free(location); + return INET_E_REDIRECT_FAILED; + } + + response_headers = query_http_info(This, HTTP_QUERY_RAW_HEADERS_CRLF); if(response_headers) { hres = IHttpNegotiate_OnResponse(This->http_negotiate, status_code, response_headers, NULL, NULL); Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -72,6 +72,8 @@ hres = protocol->vtbl->start_downloading(protocol); if(FAILED(hres)) { + if(hres == INET_E_REDIRECT_FAILED) + return S_OK; protocol_close_connection(protocol); report_result(protocol, hres); return hres; @@ -334,6 +336,8 @@ request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; if(protocol->bindf & BINDF_NEEDFILE) request_flags |= INTERNET_FLAG_NEED_FILE; + if(protocol->bind_info.dwOptions & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS) + request_flags |= INTERNET_FLAG_NO_AUTO_REDIRECT; hres = protocol->vtbl->open_request(protocol, uri, request_flags, internet_session, bind_info); if(FAILED(hres)) { Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -189,11 +189,13 @@ LONG ref; IInternetProtocol *protocol; + IWinInetInfo *wininet_info; + IWinInetHttpInfo *wininet_http_info; + IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; - IWinInetInfo *wininet_info; - IWinInetHttpInfo *wininet_http_info; + IBindCallbackRedirect *redirect_callback; struct { IInternetProtocol IInternetProtocol_iface; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:58:01 2017 @@ -188,7 +188,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-2.9 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9 -reactos/dll/win32/urlmon # Synced to WineStaging-2.9 +reactos/dll/win32/urlmon # Synced to WineStaging-2.16 reactos/dll/win32/usp10 # Synced to WineStaging-2.9 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-2.9

1 0

[akhaldi] 75901: [PSDK] Update urlmon.idl. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:57:54 2017 New Revision: 75901 URL: http://svn.reactos.org/svn/reactos?rev=75901&view=rev Log: [PSDK] Update urlmon.idl. CORE-13762 Modified: trunk/reactos/sdk/include/psdk/urlmon.idl Modified: trunk/reactos/sdk/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/urlmon.id… ============================================================================== --- trunk/reactos/sdk/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/urlmon.idl [iso-8859-1] Sun Sep 17 22:57:54 2017 @@ -193,6 +193,25 @@ LONG lindex; DWORD tymed; } RemFORMATETC, *LPREMFORMATETC; + + typedef enum + { + BINDINFO_OPTIONS_WININETFLAG = 0x00010000, + BINDINFO_OPTIONS_ENABLE_UTF8 = 0x00020000, + BINDINFO_OPTIONS_DISABLE_UTF8 = 0x00040000, + BINDINFO_OPTIONS_USE_IE_ENCODING = 0x00080000, + BINDINFO_OPTIONS_BINDTOOBJECT = 0x00100000, + BINDINFO_OPTIONS_SECURITYOPTOUT = 0x00200000, + BINDINFO_OPTIONS_IGNOREMIMETEXTPLAIN = 0x00400000, + BINDINFO_OPTIONS_USEBINDSTRINGCREDS = 0x00800000, + BINDINFO_OPTIONS_IGNOREHTTPHTTPSREDIRECTS = 0x01000000, + BINDINFO_OPTIONS_IGNORE_SSLERRORS_ONCE = 0x02000000, + BINDINFO_WPC_DOWNLOADBLOCKED = 0x08000000, + BINDINFO_WPC_LOGGING_ENABLED = 0x10000000, + BINDINFO_OPTIONS_ALLOWCONNECTDATA = 0x20000000, + BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS = 0x40000000, + BINDINFO_OPTIONS_SHDOCVW_NAVIGATE = (int)0x80000000 + } BINDINFO_OPTIONS; typedef enum { @@ -2048,6 +2067,24 @@ [out] HANDLE *pRetHandle); } +/***************************************************************************** + * IBindCallbackRedirect interface + */ +[ + local, + object, + uuid(11c81bc2-121e-4ed5-b9c4-b430bd54f2c0), + pointer_default(unique) +] +interface IBindCallbackRedirect : IUnknown +{ + typedef [unique] IBindCallbackRedirect *LPBINDCALLBACKREDIRECT; + + HRESULT Redirect( + [in] LPCWSTR lpcUrl, + [out] VARIANT_BOOL *vbCancel); +} + cpp_quote("#define CONFIRMSAFETYACTION_LOADOBJECT 0x00000001") struct CONFIRMSAFETY

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

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 September 2017