Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55137: [CLASS2] - Add back an accidentally removed line
by cgutman＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: cgutman Date: Tue Jan 24 03:33:45 2012 New Revision: 55137 URL: http://svn.reactos.org/svn/reactos?rev=55137&view=rev Log: [CLASS2] - Add back an accidentally removed line Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Jan 24 03:33:45 2012 @@ -373,6 +373,9 @@ /* Assign a drive letter */ ScsiClassAssignDriveLetter(DeviceInfo); + + /* Move to the next port number */ + DriverExtension->PortNumber++; } else {

1 0

[cgutman] 55136: [CLASS2] - Add more black magic to remove symbolic links when a drive is removed
by cgutman＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: cgutman Date: Tue Jan 24 03:25:52 2012 New Revision: 55136 URL: http://svn.reactos.org/svn/reactos?rev=55136&view=rev Log: [CLASS2] - Add more black magic to remove symbolic links when a drive is removed Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Jan 24 03:25:52 2012 @@ -130,38 +130,57 @@ return STATUS_SUCCESS; } +/* The following hack to assign drive letters with a non-PnP storage stack */ + +typedef struct _CLASS_DEVICE_INFO { + ULONG Partitions; + ULONG DeviceNumber; + ULONG DriveNumber; + PDEVICE_OBJECT LowerDevice; +} CLASS_DEVICE_INFO, *PCLASS_DEVICE_INFO; + +typedef struct _CLASS_DRIVER_EXTENSION { + ULONG PortNumber; + CLASS_INIT_DATA InitializationData; +} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; + +VOID +NTAPI +ScsiClassRemoveDriveLetter(PCLASS_DEVICE_INFO DeviceInfo) +{ + WCHAR Buffer1[100]; + UNICODE_STRING DriveLetterU; + ULONG Index; + + DriveLetterU.Buffer = Buffer1; + DriveLetterU.MaximumLength = sizeof(Buffer1); + + /* Delete the symbolic link to PhysicalDriveX */ + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DeviceInfo->DriveNumber) * sizeof(WCHAR); + IoDeleteSymbolicLink(&DriveLetterU); + + DbgPrint("HACK: Deleted symbolic link %wZ\n", &DriveLetterU); + + for (Index = 0; Index < sizeof(ULONG) * 8; Index++) + { + if (DeviceInfo->Partitions & (1 << Index)) + { + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + Index)) * sizeof(WCHAR); + IoDeleteSymbolicLink(&DriveLetterU); + DbgPrint("HACK: Deleted symbolic link %wZ\n", &DriveLetterU); + } + } +} + NTSTATUS NTAPI -ScsiClassPlugPlay( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - - if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) - { - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else - { - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; - } -} - -/* This is a hack to assign drive letters with a non-PnP storage stack */ -NTSTATUS -NTAPI -ScsiClassAssignDriveLetter(VOID) +ScsiClassAssignDriveLetter(PCLASS_DEVICE_INFO DeviceInfo) { WCHAR Buffer1[100]; WCHAR Buffer2[100]; UNICODE_STRING DriveLetterU, PartitionU; NTSTATUS Status; - ULONG Index, PartitionNumber, DeviceNumber; + ULONG Index, PartitionNumber, DeviceNumber, DriveNumber; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK Iosb; HANDLE PartitionHandle; @@ -170,6 +189,7 @@ Index = 0; DeviceNumber = 0; + DriveNumber = 0; PartitionNumber = 1; DriveLetterU.Buffer = Buffer1; DriveLetterU.MaximumLength = sizeof(Buffer1); @@ -204,9 +224,32 @@ } } while (Status == STATUS_SUCCESS); + /* Determine the correct drive number */ + do + { + /* Check that the drive exists */ + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenFile(&PartitionHandle, + FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status)) + { + ZwClose(PartitionHandle); + DriveNumber++; + } + } while (Status == STATUS_SUCCESS); + /* Create the symbolic link to PhysicalDriveX */ PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DeviceNumber) * sizeof(WCHAR); + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); if (!NT_SUCCESS(Status)) @@ -248,18 +291,52 @@ Index++; } while (Status != STATUS_SUCCESS); + DeviceInfo->Partitions |= (1 << (Index - 1)); + DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); PartitionNumber++; } } + DeviceInfo->DeviceNumber = DeviceNumber; + DeviceInfo->DriveNumber = DriveNumber; + return STATUS_SUCCESS; } -typedef struct _CLASS_DRIVER_EXTENSION { - ULONG PortNumber; - CLASS_INIT_DATA InitializationData; -} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; +NTSTATUS +NTAPI +ScsiClassPlugPlay( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) + { + IoSkipCurrentIrpStackLocation(Irp); + return STATUS_SUCCESS; + } + else if (IrpSp->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; + + ScsiClassRemoveDriveLetter(DeviceInfo); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + IoDetachDevice(DeviceInfo->LowerDevice); + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; + } + else + { + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } +} NTSTATUS NTAPI @@ -268,15 +345,34 @@ IN PDEVICE_OBJECT PhysicalDeviceObject) { PCLASS_DRIVER_EXTENSION DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + PCLASS_DEVICE_INFO DeviceInfo; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; if (DriverExtension->InitializationData.ClassFindDevices(DriverObject, NULL, &DriverExtension->InitializationData, PhysicalDeviceObject, DriverExtension->PortNumber)) { + /* Create a device object */ + Status = IoCreateDevice(DriverObject, + sizeof(CLASS_DEVICE_INFO), + NULL, + FILE_DEVICE_DISK, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceInfo = DeviceObject->DeviceExtension; + RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO)); + + /* Attach it to the PDO */ + DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + /* Assign a drive letter */ - ScsiClassAssignDriveLetter(); - - /* Increment the port number */ - DriverExtension->PortNumber++; + ScsiClassAssignDriveLetter(DeviceInfo); } else { @@ -286,6 +382,7 @@ return STATUS_SUCCESS; } +/* ---- End hack ---- */

1 0

[janderwald] 55135: [USBHUB] - Add more checks for detecting composite device
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 23:41:40 2012 New Revision: 55135 URL: http://svn.reactos.org/svn/reactos?rev=55135&view=rev Log: [USBHUB] - Add more checks for detecting composite device Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 23 23:41:40 2012 @@ -806,8 +806,25 @@ ULONG IsCompositeDevice( - PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) + IN PUSB_DEVICE_DESCRIPTOR DeviceDescriptor, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) { + if (DeviceDescriptor->bNumConfigurations != 1) + { + // + // composite device must have only one configuration + // + return FALSE; + } + + if (ConfigurationDescriptor->bNumInterfaces < 2) + { + // + // composite device must have multiple interfaces + // + return FALSE; + } + if (DeviceDescriptor->bDeviceClass == 0) { // @@ -877,7 +894,7 @@ // // Construct the CompatibleIds // - if (IsCompositeDevice(DeviceDescriptor)) + if (IsCompositeDevice(DeviceDescriptor, UsbChildExtension->FullConfigDesc)) { Index += swprintf(&BufferPtr[Index], L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x",

1 0

[janderwald] 55134: [USBHUB] - Check if the device is a composite device - Report USB\COMPOSITE as compatible id when a usb compsite device is detected
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 23:29:54 2012 New Revision: 55134 URL: http://svn.reactos.org/svn/reactos?rev=55134&view=rev Log: [USBHUB] - Check if the device is a composite device - Report USB\COMPOSITE as compatible id when a usb compsite device is detected Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 23 23:29:54 2012 @@ -804,6 +804,34 @@ return STATUS_SUCCESS; } +ULONG +IsCompositeDevice( + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + if (DeviceDescriptor->bDeviceClass == 0) + { + // + // composite device + // + return TRUE; + } + + if (DeviceDescriptor->bDeviceClass == 0xEF && + DeviceDescriptor->bDeviceSubClass == 0x02 && + DeviceDescriptor->bDeviceProtocol == 0x01) + { + // + // USB-IF association descriptor + // + return TRUE; + } + + // + // not a composite device + // + return FALSE; +} + NTSTATUS CreateDeviceIds( PDEVICE_OBJECT UsbChildDeviceObject) @@ -813,15 +841,22 @@ PWCHAR BufferPtr; WCHAR Buffer[100]; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; - + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; + + // + // get child device extension + // UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; // // Initialize the CompatibleIds String // - UsbChildExtension->usCompatibleIds.Length = 144; + UsbChildExtension->usCompatibleIds.Length = 144; //FIXME UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; + // + // allocate mem for compatible id string + // BufferPtr = ExAllocatePoolWithTag(NonPagedPool, UsbChildExtension->usCompatibleIds.Length, USB_HUB_TAG); @@ -832,39 +867,43 @@ } RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length); - Index = 0; + + // + // get device descriptor + // + DeviceDescriptor = &UsbChildExtension->DeviceDesc; + // // Construct the CompatibleIds // - if (UsbChildExtension->DeviceDesc.bDeviceClass == 0) - { - PUSB_INTERFACE_DESCRIPTOR InterDesc = (PUSB_INTERFACE_DESCRIPTOR) - ((ULONG_PTR)UsbChildExtension->FullConfigDesc + sizeof(USB_CONFIGURATION_DESCRIPTOR)); - + if (IsCompositeDevice(DeviceDescriptor)) + { + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x&SubClass_%02x", + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x", + DeviceDescriptor->bDeviceClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\COMPOSITE") + 1; + } + else + { Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass,InterDesc->bInterfaceProtocol) + 1; + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x&SubClass_%02x", - InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass) + 1; + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x", - InterDesc->bInterfaceClass) + 1; - } - else - { - PUSB_DEVICE_DESCRIPTOR DevDesc = &UsbChildExtension->DeviceDesc; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - DevDesc->bDeviceClass,DevDesc->bDeviceSubClass,DevDesc->bDeviceProtocol) + 1; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x&SubClass_%02x", - DevDesc->bDeviceClass,DevDesc->bDeviceSubClass) + 1; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x", - DevDesc->bDeviceClass) + 1; - } + DeviceDescriptor->bDeviceClass) + 1; + } + BufferPtr[Index] = UNICODE_NULL; UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds);

1 0

[akhaldi] 55133: [PSDK] * Update dwmapi.h from Wine.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 22:30:15 2012 New Revision: 55133 URL: http://svn.reactos.org/svn/reactos?rev=55133&view=rev Log: [PSDK] * Update dwmapi.h from Wine. Modified: trunk/reactos/include/psdk/dwmapi.h Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Mon Jan 23 22:30:15 2012 @@ -30,6 +30,7 @@ #endif DECLARE_HANDLE(HTHUMBNAIL); +typedef HTHUMBNAIL *PHTHUMBNAIL; typedef struct _MilMatrix3x2D { @@ -53,12 +54,14 @@ BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

[akhaldi] 55132: [MSI] * Add some registration that was missing from the sync.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 21:40:37 2012 New Revision: 55132 URL: http://svn.reactos.org/svn/reactos?rev=55132&view=rev Log: [MSI] * Add some registration that was missing from the sync. Added: trunk/reactos/dll/win32/msi/msi.rgs (with props) Modified: trunk/reactos/dll/win32/msi/msi.rc Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Mon Jan 23 21:40:37 2012 @@ -69,6 +69,8 @@ /* @makedep: msiserver.rgs */ 2 WINE_REGISTRY msiserver.rgs +3 WINE_REGISTRY msi.rgs + /* @makedep: instadvert.bmp */ 0x1001 BITMAP instadvert.bmp Added: trunk/reactos/dll/win32/msi/msi.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rgs?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rgs (added) +++ trunk/reactos/dll/win32/msi/msi.rgs [iso-8859-1] Mon Jan 23 21:40:37 2012 @@ -1,0 +1,83 @@ +HKCR +{ + NoRemove Interface + { + '{7BDE2046-D03B-4FFC-B84C-A098F38CFF0B}' = s 'IWineMsiRemoteDatabase' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{902B3592-9D08-4DFD-A593-D07C52546421}' = s 'IWineMsiRemotePackage' + { + NumMethods = s 25 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{56D58B64-8780-4C22-A8BC-8B0B29E4A9F8}' = s 'IWineMsiRemoteCustomAction' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{000C101C-0000-0000-C000-000000000046}' = s 'IMsiServer' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{000C101D-0000-0000-C000-000000000046}' = s 'IMsiMessage' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{000C1025-0000-0000-C000-000000000046}' = s 'IMsiCustomAction' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + '{000C1033-0000-0000-C000-000000000046}' = s 'IMsiRemoteAPI' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{000C103E-0000-0000-C000-000000000046}' + } + } + NoRemove CLSID + { + '{000C101C-0000-0000-C000-000000000046}' = s 'Msi install server' + { + ProgId = s 'IMsiServer' + } + '{000C101D-0000-0000-C000-000000000046}' = s 'Microsoft Windows Installer Message RPC' + { + ProgId = s 'WindowsInstaller.Message' + } + '{000C103E-0000-0000-C000-000000000046}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{000C1082-0000-0000-C000-000000000046}' = s 'MsiTransform' + { + } + '{000C1084-0000-0000-C000-000000000046}' = s 'MsiDatabase' + { + } + '{000C1086-0000-0000-C000-000000000046}' = s 'MsiPatch' + { + } + '{000C1094-0000-0000-C000-000000000046}' = s 'MsiServerX3' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{BA26E6FA-4F27-4F56-953A-3F90272018AA}' = s 'WineMsiRemoteCustomAction' + { + } + '{902B3592-9D08-4DFD-A593-D07C52546421}' = s 'WineMsiRemotePackage' + { + } + } + 'IMsiServer' = s 'Msi install server' + { + CLSID = s '{000C101C-0000-0000-C000-000000000046}' + } + 'WindowsInstaller.Message' = s 'Microsoft Windows Installer Message RPC' + { + CLSID = s '{000C101D-0000-0000-C000-000000000046}' + } +} Propchange: trunk/reactos/dll/win32/msi/msi.rgs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 55131: [MSI/BOOTDATA] * Improve and correct registering the CLISDs for MSI (they match Wine and Windows now). This reverts r55052.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 20:59:35 2012 New Revision: 55131 URL: http://svn.reactos.org/svn/reactos?rev=55131&view=rev Log: [MSI/BOOTDATA] * Improve and correct registering the CLISDs for MSI (they match Wine and Windows now). This reverts r55052. Added: trunk/reactos/dll/win32/msi/msiserver.rgs (with props) Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/dll/win32/msi/msi.rc Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Mon Jan 23 20:59:35 2012 @@ -280,10 +280,6 @@ HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" HKCR,"CLSID",,0x00000012 - -; For msi.dll -HKCR, "CLSID\{000C101D-0000-0000-C000-000000000046}", "DllVersion", "3.1.4000" -HKCR, "CLSID\{000C1090-0000-0000-C000-000000000046}", "InProcHandler32", "ole32.dll" ; For Shell32.dll HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder" Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Mon Jan 23 20:59:35 2012 @@ -66,6 +66,9 @@ /* @makedep: msiserver.tlb */ 1 TYPELIB msiserver.tlb +/* @makedep: msiserver.rgs */ +2 WINE_REGISTRY msiserver.rgs + /* @makedep: instadvert.bmp */ 0x1001 BITMAP instadvert.bmp Added: trunk/reactos/dll/win32/msi/msiserver.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.rg… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver.rgs (added) +++ trunk/reactos/dll/win32/msi/msiserver.rgs [iso-8859-1] Mon Jan 23 20:59:35 2012 @@ -1,0 +1,8 @@ +HKCR +{ + NoRemove CLSID + { + '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } + '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' } + } +} Propchange: trunk/reactos/dll/win32/msi/msiserver.rgs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rharabien] 55130: [NTOSKRNL] - Fix returning uninitialized status (CID 15086)
by rharabien＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: rharabien Date: Mon Jan 23 20:49:08 2012 New Revision: 55130 URL: http://svn.reactos.org/svn/reactos?rev=55130&view=rev Log: [NTOSKRNL] - Fix returning uninitialized status (CID 15086) Modified: trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=5513… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Mon Jan 23 20:49:08 2012 @@ -266,7 +266,6 @@ { ULONG SidSize = 0; PISID NewSid, Sid = (PISID)InputSid; - NTSTATUS Status; PAGED_CODE(); @@ -274,14 +273,9 @@ { _SEH2_TRY { - ProbeForRead(Sid, - FIELD_OFFSET(SID, - SubAuthority), - sizeof(UCHAR)); + ProbeForRead(Sid, FIELD_OFFSET(SID, SubAuthority), sizeof(UCHAR)); SidSize = RtlLengthRequiredSid(Sid->SubAuthorityCount); - ProbeForRead(Sid, - SidSize, - sizeof(UCHAR)); + ProbeForRead(Sid, SidSize, sizeof(UCHAR)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -291,58 +285,43 @@ _SEH2_END; /* allocate a SID and copy it */ - NewSid = ExAllocatePool(PoolType, - SidSize); - if (NewSid != NULL) + NewSid = ExAllocatePool(PoolType, SidSize); + if (!NewSid) + return STATUS_INSUFFICIENT_RESOURCES; + + _SEH2_TRY { - _SEH2_TRY - { - RtlCopyMemory(NewSid, - Sid, - SidSize); - - *CapturedSid = NewSid; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Free the SID and return the exception code */ - ExFreePoolWithTag(NewSid, TAG_SID); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - else if (!CaptureIfKernel) - { - *CapturedSid = InputSid; - return STATUS_SUCCESS; - } - else - { - SidSize = RtlLengthRequiredSid(Sid->SubAuthorityCount); - - /* allocate a SID and copy it */ - NewSid = ExAllocatePool(PoolType, - SidSize); - if (NewSid != NULL) - { - RtlCopyMemory(NewSid, - Sid, - SidSize); + RtlCopyMemory(NewSid, Sid, SidSize); *CapturedSid = NewSid; } - else + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = STATUS_INSUFFICIENT_RESOURCES; + /* Free the SID and return the exception code */ + ExFreePoolWithTag(NewSid, TAG_SID); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } - } - - return Status; + _SEH2_END; + } + else if (!CaptureIfKernel) + { + *CapturedSid = InputSid; + } + else + { + SidSize = RtlLengthRequiredSid(Sid->SubAuthorityCount); + + /* allocate a SID and copy it */ + NewSid = ExAllocatePool(PoolType, SidSize); + if (NewSid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(NewSid, Sid, SidSize); + + *CapturedSid = NewSid; + } + + return STATUS_SUCCESS; } VOID

1 0

[tfaber] 55129: [DDK/XDK] - Disable VS11 warning about cast between different function classes (IO_DPC_ROUTINE to KDEFERRED_ROUTINE) where needed
by tfaber＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: tfaber Date: Mon Jan 23 19:58:06 2012 New Revision: 55129 URL: http://svn.reactos.org/svn/reactos?rev=55129&view=rev Log: [DDK/XDK] - Disable VS11 warning about cast between different function classes (IO_DPC_ROUTINE to KDEFERRED_ROUTINE) where needed Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/iofuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5512… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Jan 23 19:58:06 2012 @@ -13763,9 +13763,16 @@ _In_ PDEVICE_OBJECT DeviceObject, _In_ PIO_DPC_ROUTINE DpcRoutine) { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28024) +#endif KeInitializeDpc(&DeviceObject->Dpc, (PKDEFERRED_ROUTINE) DpcRoutine, DeviceObject); +#ifdef _MSC_VER +#pragma warning(pop) +#endif } #define DEVICE_INTERFACE_INCLUDE_NONACTIVE 0x00000001 @@ -13821,6 +13828,7 @@ { #ifdef _MSC_VER #pragma warning(push) +#pragma warning(disable:28024) #pragma warning(disable:28128) #endif KeInitializeThreadedDpc(&DeviceObject->Dpc, Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] Mon Jan 23 19:58:06 2012 @@ -2793,9 +2793,16 @@ _In_ PDEVICE_OBJECT DeviceObject, _In_ PIO_DPC_ROUTINE DpcRoutine) { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28024) +#endif KeInitializeDpc(&DeviceObject->Dpc, (PKDEFERRED_ROUTINE) DpcRoutine, DeviceObject); +#ifdef _MSC_VER +#pragma warning(pop) +#endif } #define DEVICE_INTERFACE_INCLUDE_NONACTIVE 0x00000001 @@ -2851,6 +2858,7 @@ { #ifdef _MSC_VER #pragma warning(push) +#pragma warning(disable:28024) #pragma warning(disable:28128) #endif KeInitializeThreadedDpc(&DeviceObject->Dpc,

1 0

[tfaber] 55128: [NTOSKRNL/IO] - Always use interlocked operations on DeviceObject->ReferenceCount
by tfaber＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: tfaber Date: Mon Jan 23 19:48:18 2012 New Revision: 55128 URL: http://svn.reactos.org/svn/reactos?rev=55128&view=rev Log: [NTOSKRNL/IO] - Always use interlocked operations on DeviceObject->ReferenceCount Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Mon Jan 23 19:48:18 2012 @@ -486,7 +486,7 @@ ASSERT(DeviceObject->ReferenceCount); /* Dereference the device */ - DeviceObject->ReferenceCount--; + InterlockedDecrement(&DeviceObject->ReferenceCount); /* * Check if we can unload it and it's safe to unload (or if we're forcing Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Jan 23 19:48:18 2012 @@ -157,7 +157,7 @@ else { /* Increase reference count */ - DeviceObject->ReferenceCount++; + InterlockedIncrement(&DeviceObject->ReferenceCount); return STATUS_SUCCESS; } }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012