Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 54742: [RTL] - Samuel Serapion: Implement RtlIpv4AddressToStringEx A/W and minor enhancements RtlIpv4AddressToStringA/W. Fixes some ntdll:rtl winetests. See issue #6779 for more details.
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 20:40:02 2011 New Revision: 54742 URL: http://svn.reactos.org/svn/reactos?rev=54742&view=rev Log: [RTL] - Samuel Serapion: Implement RtlIpv4AddressToStringEx A/W and minor enhancements RtlIpv4AddressToStringA/W. Fixes some ntdll:rtl winetests. See issue #6779 for more details. 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=5474… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Fri Dec 23 20:40:02 2011 @@ -12,6 +12,15 @@ #define NDEBUG #include <debug.h> +/* maximum length of an ipv4 address expressed as a string */ +#define IPV4_ADDR_STRING_MAX_LEN 16 + +/* maximum length of an ipv4 port expressed as a string */ +#define IPV4_PORT_STRING_MAX_LEN 7 /* with the leading ':' */ + +/* network to host order conversion for little endian machines */ +#define WN2H(w) (((w & 0xFF00) >> 8) | ((w & 0x00FF) << 8)) + /* FUNCTIONS ***************************************************************/ /* @@ -22,19 +31,23 @@ RtlIpv4AddressToStringA(IN struct in_addr *Addr, OUT PCHAR S) { - CHAR Buffer[sizeof("255.255.255.255")]; + CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; INT Length; + + if(!S) + return NULL; + Length = sprintf(Buffer, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, Addr->S_un.S_un_b.s_b3, Addr->S_un.S_un_b.s_b4); - if (S) - strcpy(S, Buffer); + + strcpy(S, Buffer); return S + Length; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -43,8 +56,28 @@ OUT PCHAR AddressString, IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + ULONG Length; + + if (!Address || !AddressString || !AddressStringLength) + return STATUS_INVALID_PARAMETER; + + Length = sprintf(Buffer, "%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4); + + if (Port) Length += sprintf(Buffer + Length, ":%u", WN2H(Port)); + + if (*AddressStringLength > Length) + { + *AddressStringLength = Length + 1; + strcpy(AddressString, Buffer); + return STATUS_SUCCESS; + } + + *AddressStringLength = Length + 1; + return STATUS_INVALID_PARAMETER; } /* @@ -55,14 +88,24 @@ RtlIpv4AddressToStringW(IN struct in_addr *Addr, OUT PWCHAR S) { - return S + swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); -} - -/* - * @unimplemented + WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; + INT Length; + + if (!S) + return NULL; + + Length = swprintf(Buffer, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); + + wcscpy(S, Buffer); + + return S + Length; +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -71,8 +114,28 @@ OUT PWCHAR AddressString, IN OUT PULONG AddressStringLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN+IPV4_PORT_STRING_MAX_LEN]; + ULONG Length; + + if (!Address || !AddressString || !AddressStringLength) + return STATUS_INVALID_PARAMETER; + + Length = swprintf(Buffer, L"%u.%u.%u.%u", Address->S_un.S_un_b.s_b1, + Address->S_un.S_un_b.s_b2, + Address->S_un.S_un_b.s_b3, + Address->S_un.S_un_b.s_b4); + + if (Port) Length += swprintf(Buffer + Length, L":%u", WN2H(Port)); + + if (*AddressStringLength > Length) + { + *AddressStringLength = Length + 1; + wcscpy(AddressString, Buffer); + return STATUS_SUCCESS; + } + + *AddressStringLength = Length + 1; + return STATUS_INVALID_PARAMETER; } /*

1 0

[fireball] 54741: - Misc changes, mostly involving the change in NDK path happened many many revisions ago. I commit this change since the compilability of arwinss branch itself is already broken (...
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 18:15:17 2011 New Revision: 54741 URL: http://svn.reactos.org/svn/reactos?rev=54741&view=rev Log: - Misc changes, mostly involving the change in NDK path happened many many revisions ago. I commit this change since the compilability of arwinss branch itself is already broken (it's supposed to compile in trunk now). Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -684,7 +684,6 @@ PALETTE_ShareUnlockPalette(ppalSrc); } - VOID NTAPI EXLATEOBJ_vInitBrushXlate( Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -1,7 +1,7 @@ #ifndef _WIN32K_KBD_H #define _WIN32K_KBD_H -#include <internal/kbd.h> +#include <ndk/kbd.h> typedef struct _KBL { Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -11,11 +11,13 @@ #define _NO_COM /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h> /* Win32 Headers */ /* FIXME: Defines in winbase.h that we need... */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -129,7 +129,7 @@ ModBits |= GetShiftBit( pkKT, VK_MENU ); /* Handle Alt+Gr */ - if (pkKT->fLocalFlags & 0x1) + if (pkKT->fLocaleFlags & 0x1) if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) & KEY_DOWN_BIT) ModBits |= GetShiftBit( pkKT, VK_CONTROL ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Dec 23 18:15:17 2011 @@ -20,7 +20,7 @@ <library>ntoskrnl</library> <library>hal</library> - <library>freetype</library> + <library>freetype_s</library> <library>libcntpr</library> <library>pseh</library> @@ -156,4 +156,8 @@ </directory> <file>win32k.rc</file> </module> +<module name="win32ksys" type="staticlibrary"> + <include base="ReactOS">include/reactos</include> + <file>sys-stubs.S</file> +</module> </group>

1 0

[fireball] 54740: - Misc trunk 547xx-compatibility fixes.
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 17:01:24 2011 New Revision: 54740 URL: http://svn.reactos.org/svn/reactos?rev=54740&view=rev Log: - Misc trunk 547xx-compatibility fixes. Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/user32/user_private.h Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -729,7 +729,7 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) @ stub UnregisterMessagePumpHook -@ stub UnregisterUserApiHook +@ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @ stdcall UpdatePerUserSystemParameters(long long) Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -368,3 +368,7 @@ return TRUE; } +BOOL WINAPI UnregisterUserApiHook(VOID) +{ + return TRUE; +} Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Fri Dec 23 17:01:24 2011 @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include <windowsx.h> #include "winternl.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) @@ -34,8 +35,8 @@ #ifndef __REACTOS__ #define WM_SYSTIMER 0x0118 +#define WM_POPUPSYSTEMMENU 0x0313 #endif -#define WM_POPUPSYSTEMMENU 0x0313 /* internal messages codes */ enum wine_internal_message

1 0

[fireball] 54739: - Misc trunk 547xx-compatibility fixes.
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 17:00:51 2011 New Revision: 54739 URL: http://svn.reactos.org/svn/reactos?rev=54739&view=rev Log: - Misc trunk 547xx-compatibility fixes. Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] Fri Dec 23 17:00:51 2011 @@ -108,12 +108,12 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -static __inline unsigned short get_char_typeW( WCHAR ch ) +/*static __inline unsigned short get_char_typeW( WCHAR ch ) { WORD CharType; GetStringTypeW(CT_CTYPE1, &ch, 1, &CharType); return CharType; -} +}*/ /* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount)

1 0

[cgutman] 54738: [FASTFAT] - Revert r54731
by cgutman＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: cgutman Date: Fri Dec 23 15:56:25 2011 New Revision: 54738 URL: http://svn.reactos.org/svn/reactos?rev=54738&view=rev Log: [FASTFAT] - Revert r54731 Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Dec 23 15:56:25 2011 @@ -558,6 +558,17 @@ Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + if (Fcb->Flags & FCB_IS_PAGE_FILE) + { + PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; + IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; + IoSkipCurrentIrpStackLocation(IrpContext->Irp); + DPRINT("Read from page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart); + Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); + VfatFreeIrpContext(IrpContext); + return Status; + } + DPRINT("<%wZ>\n", &Fcb->PathNameU); ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; @@ -759,6 +770,17 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + if (Fcb->Flags & FCB_IS_PAGE_FILE) + { + PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; + IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; + IoSkipCurrentIrpStackLocation(IrpContext->Irp); + DPRINT("Write to page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart); + Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); + VfatFreeIrpContext(IrpContext); + return Status; + } DPRINT("<%wZ>\n", &Fcb->PathNameU);

1 0

[janderwald] 54737: - Fix function declaration - add missing constant
by janderwald＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: janderwald Date: Fri Dec 23 15:21:28 2011 New Revision: 54737 URL: http://svn.reactos.org/svn/reactos?rev=54737&view=rev Log: - Fix function declaration - add missing constant Modified: branches/usb-bringup/include/ddk/hidclass.h branches/usb-bringup/include/ddk/hidpddi.h Modified: branches/usb-bringup/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidclas… ============================================================================== --- branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] Fri Dec 23 15:21:28 2011 @@ -73,6 +73,7 @@ #define IOCTL_HID_GET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(100) #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) +#define IOCTL_HID_GET_INDEXED_STRING HID_OUT_CTL_CODE(120) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) /* FIXME: these values are wrong! */ Modified: branches/usb-bringup/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidpddi… ============================================================================== --- branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] Fri Dec 23 15:21:28 2011 @@ -43,6 +43,7 @@ }HIDP_DEVICE_DESC, *PHIDP_DEVICE_DESC; NTSTATUS +NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, IN ULONG DescLength,

1 0

[janderwald] 54736: [USBEHCI] - Implement URB_FUNCTION_ISOCH_TRANSFER, URB_FUNCTION_CLASS_ENDPOINT, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE
by janderwald＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: janderwald Date: Fri Dec 23 15:20:00 2011 New Revision: 54736 URL: http://svn.reactos.org/svn/reactos?rev=54736&view=rev Log: [USBEHCI] - Implement URB_FUNCTION_ISOCH_TRANSFER, URB_FUNCTION_CLASS_ENDPOINT, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Dec 23 15:20:00 2011 @@ -60,13 +60,16 @@ VOID SetNotification(PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); // internal ioctl routines NTSTATUS HandleGetDescriptor(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleGetDescriptorFromInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleGetStatusFromDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -756,6 +759,47 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleIsochronousTransfer( + IN OUT PIRP Irp, + PURB Urb) +{ + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndPointDesc = NULL; + + // + // Check PipeHandle to determine if this is a Bulk or Interrupt Transfer Request + // + EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbIsochronousTransfer.PipeHandle; + + if (!EndPointDesc) + { + DPRINT1("No EndpointDesc\n"); + Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE; + return STATUS_INVALID_PARAMETER; + } + + // + // sanity checks + // + ASSERT(EndPointDesc); + ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + return UsbDevice->SubmitIrp(Irp); +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleBulkOrInterruptTransfer( @@ -794,22 +838,11 @@ // EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; - switch(EndPointDesc->bmAttributes & 0x0F) - { - case USB_ENDPOINT_TYPE_CONTROL: - DPRINT1("Control Transfer is not expected!!!\n"); - return STATUS_INVALID_DEVICE_REQUEST; - case USB_ENDPOINT_TYPE_BULK: - DPRINT("Initiating Bulk Transfer\n"); - break; - case USB_ENDPOINT_TYPE_ISOCHRONOUS: - case USB_ENDPOINT_TYPE_INTERRUPT: - DPRINT1("Not Supported\n"); - break; - default: - DPRINT1("Unknown EndPoint Type!\n"); - break; - } + // + // sanity checks + // + ASSERT(EndPointDesc); + ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK || (EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); // // check if this is a valid usb device handle @@ -1086,7 +1119,10 @@ IN OUT PIRP Irp, PURB Urb) { - PUSHORT Status; + PUSHORT DeviceStatus; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; // // sanity checks @@ -1094,22 +1130,54 @@ PC_ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBufferLength >= sizeof(USHORT)); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBuffer); - PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); // // get status buffer // - Status = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; - - // - // FIXME need more flags ? - // - *Status = USB_PORT_STATUS_CONNECT; + DeviceStatus = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; + + + if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + { + // + // FIXME need more flags ? + // + *DeviceStatus = USB_PORT_STATUS_CONNECT; + return STATUS_SUCCESS; + } + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = 0; + CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x80; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done // - return STATUS_SUCCESS; + return Status; } //----------------------------------------------------------------------------------------- @@ -1122,6 +1190,8 @@ PUSB_HUB_DESCRIPTOR UsbHubDescriptor; ULONG PortCount, Dummy2; USHORT Dummy1; + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); @@ -1130,6 +1200,36 @@ // switch(Urb->UrbControlVendorClassRequest.Request) { + case USB_REQUEST_GET_STATUS: + { + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0xA0; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + break; + } case USB_REQUEST_GET_DESCRIPTOR: { switch (Urb->UrbControlVendorClassRequest.Value >> 8) @@ -1191,6 +1291,55 @@ return Status; } + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleGetDescriptorFromInterface( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + + // + // sanity check + // + ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength); + ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + CtrlSetup.wLength = (USHORT)Urb->UrbControlDescriptorRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x81; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + + // + // done + // + return Status; +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleGetDescriptor( @@ -1300,8 +1449,6 @@ } else { - DPRINT1("Length %u\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); - // // check if this is a valid usb device handle // @@ -1392,6 +1539,70 @@ //----------------------------------------------------------------------------------------- NTSTATUS +CHubController::HandleClassEndpoint( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + + // + // sanity check + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + DPRINT1("URB_FUNCTION_CLASS_ENDPOINT\n"); + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlVendorClassRequest.TransferBuffer); + DPRINT1("TransferBufferMDL %x\n", Urb->UrbControlVendorClassRequest.TransferBufferMDL); + DPRINT1("RequestTypeReservedBits %x\n", Urb->UrbControlVendorClassRequest.RequestTypeReservedBits); + DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0xa2; //FIXME: Const. + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + + // + // assert on failure + // + PC_ASSERT(NT_SUCCESS(Status)); + + + // + // done + // + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS CHubController::HandleClassInterface( IN OUT PIRP Irp, IN OUT PURB Urb) @@ -1403,8 +1614,8 @@ // // sanity check // - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer || Urb->UrbControlVendorClassRequest.TransferBufferMDL); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); // @@ -1490,6 +1701,9 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: + Status = HandleGetDescriptorFromInterface(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: Status = HandleGetDescriptor(Irp, Urb); break; @@ -1511,8 +1725,14 @@ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: Status = HandleBulkOrInterruptTransfer(Irp, Urb); break; + case URB_FUNCTION_ISOCH_TRANSFER: + Status = HandleIsochronousTransfer(Irp, Urb); + break; case URB_FUNCTION_CLASS_INTERFACE: Status = HandleClassInterface(Irp, Urb); + break; + case URB_FUNCTION_CLASS_ENDPOINT: + Status = HandleClassEndpoint(Irp, Urb); break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); @@ -2301,11 +2521,7 @@ PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice)); DPRINT1("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); - - DPRINT1("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); - - PC_ASSERT(FALSE); // // remove old device handle

1 0

[rharabien] 54735: [CRT] - Fix splitpath when called with filename without path
by rharabien＠svn.reactos.org 22 Dec '11

22 Dec '11

Author: rharabien Date: Thu Dec 22 23:52:51 2011 New Revision: 54735 URL: http://svn.reactos.org/svn/reactos?rev=54735&view=rev Log: [CRT] - Fix splitpath when called with filename without path Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Thu Dec 22 23:52:51 2011 @@ -63,8 +63,10 @@ } /* Check if we got a file name / extension */ - if (!file_start) file_start = path; - if (!ext_start || ext_start < file_start) ext_start = path; + if (!file_start) + file_start = dir_start; + if (!ext_start || ext_start < file_start) + ext_start = path; if (dir) {

1 0

[tfaber] 54734: [EXPLORER][ADVAPI32][SETUPAPI][SYSSETUP] - Fix some issues found by cppcheck. Patch by Vincenzo Cotugno
by tfaber＠svn.reactos.org 21 Dec '11

21 Dec '11

Author: tfaber Date: Wed Dec 21 21:49:22 2011 New Revision: 54734 URL: http://svn.reactos.org/svn/reactos?rev=54734&view=rev Log: [EXPLORER][ADVAPI32][SETUPAPI][SYSSETUP] - Fix some issues found by cppcheck. Patch by Vincenzo Cotugno Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -234,7 +234,7 @@ CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); _hsidebar = CreateWindowEx(WS_EX_STATICEDGE, WC_TREEVIEW, TEXT("Sidebar"), - WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_HASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, + WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/TVS_HASLINES|TVS_HASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_Globals._hInstance, 0); _himl_old = TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -4029,8 +4029,8 @@ RtlInitAnsiString( &nameA, name ); if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) { + ClosePredefKey(hkey); return RtlNtStatusToDosError(status); - ClosePredefKey(hkey); } status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -1195,8 +1195,6 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL)) SetLastError(ERROR_INVALID_PARAMETER); - else if (!PropertySheetHeader) - SetLastError(ERROR_INVALID_PARAMETER); else if (PropertySheetType != DIGCDP_FLAG_ADVANCED && PropertySheetType != DIGCDP_FLAG_BASIC && PropertySheetType != DIGCDP_FLAG_REMOTE_ADVANCED Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -743,7 +743,6 @@ MessageBoxW(hwndDlg, WrongPassword, Title, MB_ICONERROR | MB_OK); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; - break; } Password++; }

1 0

[spetreolle] 54733: [KERNEL32] Silence BaseComputeProcessSearchPath.
by spetreolle＠svn.reactos.org 21 Dec '11

21 Dec '11

Author: spetreolle Date: Wed Dec 21 20:54:14 2011 New Revision: 54733 URL: http://svn.reactos.org/svn/reactos?rev=54733&view=rev Log: [KERNEL32] Silence BaseComputeProcessSearchPath. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Wed Dec 21 20:54:14 2011 @@ -391,7 +391,7 @@ WINAPI BaseComputeProcessSearchPath(VOID) { - DPRINT1("Computing Process Search path\n"); + DPRINT("Computing Process Search path\n"); /* Compute the path using default process order */ return BasepComputeProcessPath(BaseProcessOrder, NULL, NULL);

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