Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CLASS2] Drop the drive letter hack
by Pierre Schweitzer 11 Nov '19

11 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=887200703ccd580b69492… commit 887200703ccd580b694929e961357b0f55f1f24d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Nov 11 18:18:12 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 11 18:18:32 2019 +0100 [CLASS2] Drop the drive letter hack --- drivers/storage/class/class2/class2.c | 329 +--------------------------------- 1 file changed, 7 insertions(+), 322 deletions(-) diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index bf67de960fd..5639f072949 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -13,10 +13,6 @@ #include <include/class2.h> #include <stdio.h> -/* Part of the drive letter hack */ -#include <ntifs.h> -#include <ketypes.h> - //#define NDEBUG #include <debug.h> @@ -135,315 +131,28 @@ DriverEntry( return STATUS_SUCCESS; } -/* The following hack to assign drive letters with a non-PnP storage stack */ - -typedef struct _CLASS_DEVICE_INFO { - ULONG Signature; - ULONG DeviceType; - ULONG Partitions; - ULONG DeviceNumber; - ULONG DriveNumber; - PDEVICE_OBJECT LowerDevice; -} CLASS_DEVICE_INFO, *PCLASS_DEVICE_INFO; - -typedef struct _CLASS_DRIVER_EXTENSION { - ULONG PortNumber; - UNICODE_STRING RegistryPath; - 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 -ScsiClassAssignDriveLetter(PCLASS_DEVICE_INFO DeviceInfo) -{ - WCHAR Buffer1[100]; - WCHAR Buffer2[100]; - UNICODE_STRING DriveLetterU, PartitionU; - NTSTATUS Status; - ULONG Index, PartitionNumber, DeviceNumber, DriveNumber; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK Iosb; - HANDLE PartitionHandle; - - /* We assume this device does not current have a drive letter */ - - Index = 0; - DeviceNumber = 0; - DriveNumber = 0; - PartitionNumber = 1; - DriveLetterU.Buffer = Buffer1; - DriveLetterU.MaximumLength = sizeof(Buffer1); - PartitionU.Buffer = Buffer2; - PartitionU.MaximumLength = sizeof(Buffer2); - - /* Determine the correct disk number */ - do - { - /* Check that the disk exists */ - if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\HardDisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); - } - else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\CdRom%d", DeviceNumber) * 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)) - { - /* Return the last one that worked */ - DeviceNumber--; - } - else - { - ZwClose(PartitionHandle); - DeviceNumber++; - } - } while (Status == STATUS_SUCCESS); - - /* Determine the correct drive number */ - do - { - /* Check that the drive exists */ - if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); - } - else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\%C:", ('C' + 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); - - if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); - } - else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) - { - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\CdRom%d", DeviceNumber) * sizeof(WCHAR); - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + DriveNumber)) * sizeof(WCHAR); - } - - /* Create the symbolic link to PhysicalDriveX */ - Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); - if (!NT_SUCCESS(Status)) - { - /* Failed to create symbolic link */ - DbgPrint("Failed to create symbolic link %wZ -> %wZ with %lx\n", &PartitionU, &DriveLetterU, Status); - return Status; - } - - DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); - - DeviceInfo->DeviceNumber = DeviceNumber; - DeviceInfo->DriveNumber = DriveNumber; - - if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) - { - /* done for cdroms */ - return STATUS_SUCCESS; - } - - while (TRUE) - { - /* Check that the disk exists */ - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition%d", DeviceNumber, PartitionNumber) * 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)) - break; - else - { - ZwClose(PartitionHandle); - - /* Assign it a drive letter */ - do - { - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + Index)) * sizeof(WCHAR); - - Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); - - Index++; - } while (Status != STATUS_SUCCESS); - - DeviceInfo->Partitions |= (1 << (Index - 1)); - - DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); - PartitionNumber++; - } - } - - return STATUS_SUCCESS; -} - NTSTATUS NTAPI ScsiClassPlugPlay( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) { - ASSERT(DeviceInfo->Signature == '2slc'); - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(DeviceInfo->LowerDevice, Irp); - } - else if (IrpSp->MinorFunction == IRP_MN_REMOVE_DEVICE) - { - ASSERT(DeviceInfo->Signature == '2slc'); - ScsiClassRemoveDriveLetter(DeviceInfo); - - IoForwardIrpSynchronously(DeviceInfo->LowerDevice, Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - - IoDetachDevice(DeviceInfo->LowerDevice); - IoDeleteDevice(DeviceObject); return STATUS_SUCCESS; } else { - if (DeviceInfo->Signature == '2slc') - { - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(DeviceInfo->LowerDevice, Irp); - } - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; } } -NTSTATUS -NTAPI -ScsiClassAddDevice( - IN PDRIVER_OBJECT DriverObject, - 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, &DriverExtension->RegistryPath, &DriverExtension->InitializationData, - PhysicalDeviceObject, DriverExtension->PortNumber)) - { - /* Create a device object */ - Status = IoCreateDevice(DriverObject, - sizeof(CLASS_DEVICE_INFO), - NULL, - DriverExtension->InitializationData.DeviceType, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DeviceInfo = DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO)); - DeviceInfo->Signature = '2slc'; - - /* Attach it to the PDO */ - DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); - DeviceInfo->DeviceType = DriverExtension->InitializationData.DeviceType; - - /* Check that the kernel has already assigned drive letters */ - if (KeLoaderBlock == NULL) - { - /* Assign a drive letter */ - ScsiClassAssignDriveLetter(DeviceInfo); - } - else - { - /* The kernel will handle it */ - } - - /* Move to the next port number */ - DriverExtension->PortNumber++; - } - else - { - /* Failed to find device */ - DbgPrint("FAILED TO FIND DEVICE!\n"); - } - - return STATUS_SUCCESS; -} -/* ---- End hack ---- */ - ULONG @@ -477,15 +186,14 @@ Return Value: PDRIVER_OBJECT DriverObject = Argument1; + ULONG portNumber = 0; PDEVICE_OBJECT portDeviceObject; NTSTATUS status; STRING deviceNameString; UNICODE_STRING unicodeDeviceName; PFILE_OBJECT fileObject; CCHAR deviceNameBuffer[256]; - /* BOOLEAN deviceFound = FALSE; See note at the end */ - PCLASS_DRIVER_EXTENSION DriverExtension; - PUNICODE_STRING RegistryPath = Argument2; + BOOLEAN deviceFound = FALSE; DebugPrint((3,"\n\nSCSI Class Driver\n")); @@ -516,27 +224,6 @@ Return Value: return (ULONG) STATUS_REVISION_MISMATCH; } - status = IoAllocateDriverObjectExtension(DriverObject, - DriverObject, - sizeof(CLASS_DRIVER_EXTENSION), - (PVOID *)&DriverExtension); - if (!NT_SUCCESS(status)) - return status; - - RtlCopyMemory(&DriverExtension->InitializationData, InitializationData, sizeof(CLASS_INIT_DATA)); - DriverExtension->PortNumber = 0; - - DriverExtension->RegistryPath.Buffer = ExAllocatePool(PagedPool, RegistryPath->MaximumLength); - if (!DriverExtension->RegistryPath.Buffer) - return STATUS_NO_MEMORY; - - DriverExtension->RegistryPath.Length = RegistryPath->Length; - DriverExtension->RegistryPath.MaximumLength = RegistryPath->MaximumLength; - - RtlCopyMemory(DriverExtension->RegistryPath.Buffer, - RegistryPath->Buffer, - RegistryPath->Length); - // // Update driver object with entry points. // @@ -550,7 +237,6 @@ Return Value: DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScsiClassDeviceControlDispatch; DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = ScsiClassShutdownFlush; DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = ScsiClassShutdownFlush; - DriverObject->DriverExtension->AddDevice = ScsiClassAddDevice; if (InitializationData->ClassStartIo) { DriverObject->DriverStartIo = InitializationData->ClassStartIo; @@ -562,7 +248,7 @@ Return Value: do { - sprintf(deviceNameBuffer, "\\Device\\ScsiPort%lu", DriverExtension->PortNumber); + sprintf(deviceNameBuffer, "\\Device\\ScsiPort%lu", portNumber); DebugPrint((2, "ScsiClassInitialize: Open Port %s\n", deviceNameBuffer)); @@ -588,9 +274,9 @@ Return Value: // if (InitializationData->ClassFindDevices(DriverObject, Argument2, InitializationData, - portDeviceObject, DriverExtension->PortNumber)) { + portDeviceObject, portNumber)) { - /* deviceFound = TRUE; See note at the end */ + deviceFound = TRUE; } } @@ -598,12 +284,11 @@ Return Value: // Check next SCSI adapter. // - DriverExtension->PortNumber++; + portNumber++; } while(NT_SUCCESS(status)); - /* We don't want to fail init just because we don't have devices right now */ - return STATUS_SUCCESS; /*deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE;*/ + return deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE; }

1 0

[reactos] 01/01: [NETSHELL] Fix checkboxes in the network adapter properties
by Eric Kohl 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b39b42a0aeff2b503849… commit 2b39b42a0aeff2b503849882dfc67e14c219f933 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Nov 11 00:13:40 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Nov 11 00:15:06 2019 +0100 [NETSHELL] Fix checkboxes in the network adapter properties - Use AUTOCHECKBOX instead of BS_AUTOCHECKBOX - Use multiline checkboxes (BS_MULTILINE | BS_TOP) in order to display long text CORE-15248 --- dll/shellext/netshell/lang/bg-BG.rc | 4 ++-- dll/shellext/netshell/lang/cs-CZ.rc | 4 ++-- dll/shellext/netshell/lang/da-DK.rc | 4 ++-- dll/shellext/netshell/lang/de-DE.rc | 4 ++-- dll/shellext/netshell/lang/el-GR.rc | 4 ++-- dll/shellext/netshell/lang/en-US.rc | 4 ++-- dll/shellext/netshell/lang/es-ES.rc | 4 ++-- dll/shellext/netshell/lang/fr-FR.rc | 4 ++-- dll/shellext/netshell/lang/he-IL.rc | 4 ++-- dll/shellext/netshell/lang/hi-IN.rc | 4 ++-- dll/shellext/netshell/lang/hu-HU.rc | 4 ++-- dll/shellext/netshell/lang/id-ID.rc | 4 ++-- dll/shellext/netshell/lang/it-IT.rc | 4 ++-- dll/shellext/netshell/lang/ja-JP.rc | 4 ++-- dll/shellext/netshell/lang/nl-NL.rc | 4 ++-- dll/shellext/netshell/lang/no-NO.rc | 4 ++-- dll/shellext/netshell/lang/pl-PL.rc | 4 ++-- dll/shellext/netshell/lang/pt-PT.rc | 4 ++-- dll/shellext/netshell/lang/ro-RO.rc | 4 ++-- dll/shellext/netshell/lang/ru-RU.rc | 4 ++-- dll/shellext/netshell/lang/sk-SK.rc | 4 ++-- dll/shellext/netshell/lang/sq-AL.rc | 4 ++-- dll/shellext/netshell/lang/sv-SE.rc | 4 ++-- dll/shellext/netshell/lang/tr-TR.rc | 4 ++-- dll/shellext/netshell/lang/uk-UA.rc | 4 ++-- dll/shellext/netshell/lang/zh-CN.rc | 4 ++-- dll/shellext/netshell/lang/zh-TW.rc | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dll/shellext/netshell/lang/bg-BG.rc b/dll/shellext/netshell/lang/bg-BG.rc index 473a7a56ab2..25ca77bd4c6 100644 --- a/dll/shellext/netshell/lang/bg-BG.rc +++ b/dll/shellext/netshell/lang/bg-BG.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Свойства", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Описание", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Показване на значе в задачната лента при свързаност", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Уведомяване при ограничена или липсваща свързаност", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Показване на значе в задачната лента при свързаност", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Уведомяване при ограничена или липсваща свързаност", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 180 diff --git a/dll/shellext/netshell/lang/cs-CZ.rc b/dll/shellext/netshell/lang/cs-CZ.rc index 31f3cfc44c3..6f4519ebadb 100644 --- a/dll/shellext/netshell/lang/cs-CZ.rc +++ b/dll/shellext/netshell/lang/cs-CZ.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Popis", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Tak tady bude popis komponenty...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Po připojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Upozornit při omezeném nebo žádném připojení", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Po připojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Upozornit při omezeném nebo žádném připojení", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, WS_TABSTOP | BS_TOP | BS_MULTILINE END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/da-DK.rc b/dll/shellext/netshell/lang/da-DK.rc index 2d180ca61c2..3bee8cd4ec4 100644 --- a/dll/shellext/netshell/lang/da-DK.rc +++ b/dll/shellext/netshell/lang/da-DK.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 GROUPBOX "Beskrivelse", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Komponent Beskrivelse Her...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Vis Ikon i System Tray ved forbindelse.", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Vis Ikon i System Tray ved forbindelse.", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/de-DE.rc b/dll/shellext/netshell/lang/de-DE.rc index ef7390b0962..4bbaba05391 100644 --- a/dll/shellext/netshell/lang/de-DE.rc +++ b/dll/shellext/netshell/lang/de-DE.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Benachrichtigen bei eingeschränkter oder keiner Konnektivität", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Benachrichtigen bei eingeschränkter oder keiner Konnektivität", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/el-GR.rc b/dll/shellext/netshell/lang/el-GR.rc index c72f05a28c6..a2ce460c6c7 100644 --- a/dll/shellext/netshell/lang/el-GR.rc +++ b/dll/shellext/netshell/lang/el-GR.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Ιδιότητες", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Περιγραφή", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Εμφάνιση εικονιδίου στην taskbar όταν είναι συνδεδεμένο", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Εμφάνιση εικονιδίου στην taskbar όταν είναι συνδεδεμένο", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/en-US.rc b/dll/shellext/netshell/lang/en-US.rc index 5274f06ca37..77bcaa5706e 100644 --- a/dll/shellext/netshell/lang/en-US.rc +++ b/dll/shellext/netshell/lang/en-US.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index a30d5e9cbf1..8122b0e68a6 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -23,8 +23,8 @@ BEGIN PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Descripción ", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "La descripción de los componentes va aquí...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/fr-FR.rc b/dll/shellext/netshell/lang/fr-FR.rc index 9634e222a46..c652ddae1e0 100644 --- a/dll/shellext/netshell/lang/fr-FR.rc +++ b/dll/shellext/netshell/lang/fr-FR.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Afficher l'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Me &notifier quand cette connexion n'a pas de connectivité ou une limitée", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Afficher l'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Me &notifier quand cette connexion n'a pas de connectivité ou une limitée", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/he-IL.rc b/dll/shellext/netshell/lang/he-IL.rc index d921e5a6766..f778c41aa41 100644 --- a/dll/shellext/netshell/lang/he-IL.rc +++ b/dll/shellext/netshell/lang/he-IL.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "מאפיינים", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "תיאור", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/hi-IN.rc b/dll/shellext/netshell/lang/hi-IN.rc index 87fdb464400..081d2fad84f 100644 --- a/dll/shellext/netshell/lang/hi-IN.rc +++ b/dll/shellext/netshell/lang/hi-IN.rc @@ -22,8 +22,8 @@ BEGIN PUSHBUTTON "&गुण", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "विवरण", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "कम्पोनन्ट विवरण यहाँ जाता है...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "कनेक्ट होने पर टास्कबार में आइकन &दिखाएं", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "मुझे &सूचित करें जब यह कनेक्शन सीमित है या कोई कनेक्टिविटी नहीं है", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "कनेक्ट होने पर टास्कबार में आइकन &दिखाएं", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "मुझे &सूचित करें जब यह कनेक्शन सीमित है या कोई कनेक्टिविटी नहीं है", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/hu-HU.rc b/dll/shellext/netshell/lang/hu-HU.rc index 4584e91e6cc..35dfc3f61b7 100644 --- a/dll/shellext/netshell/lang/hu-HU.rc +++ b/dll/shellext/netshell/lang/hu-HU.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Leírás", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Alkotóelem leírása ide kerül...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Ikon megjelenítése a tálcán a kapcsolat ideje alatt", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Ikon megjelenítése a tálcán a kapcsolat ideje alatt", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/id-ID.rc b/dll/shellext/netshell/lang/id-ID.rc index be7e2dca0bb..bdef50bbf67 100644 --- a/dll/shellext/netshell/lang/id-ID.rc +++ b/dll/shellext/netshell/lang/id-ID.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Properti", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Deskripsi", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Deskripsi Komponen di sini...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Tampilkan Ikon di taskbar saat tersambung", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Tampilkan Ikon di taskbar saat tersambung", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/it-IT.rc b/dll/shellext/netshell/lang/it-IT.rc index 4c8f169f68f..4e8804c3d0b 100644 --- a/dll/shellext/netshell/lang/it-IT.rc +++ b/dll/shellext/netshell/lang/it-IT.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Proprietà", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Descrizione", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Visualizzare l'icona nella barra dei task durante la connessione", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Notificare quando la connessione è limitata o non attiva", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Visualizzare l'icona nella barra dei task durante la connessione", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Notificare quando la connessione è limitata o non attiva", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/ja-JP.rc b/dll/shellext/netshell/lang/ja-JP.rc index 3b083c17598..5488b152e47 100644 --- a/dll/shellext/netshell/lang/ja-JP.rc +++ b/dll/shellext/netshell/lang/ja-JP.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "プロパティ(&P)", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "説明", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "ここにコンポーネントの説明が表示されます...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "接続時にタスクバーにアイコンを表示する", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "この接続が制限されているか接続なしの場合に通知する(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "接続時にタスクバーにアイコンを表示する", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "この接続が制限されているか接続なしの場合に通知する(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/nl-NL.rc b/dll/shellext/netshell/lang/nl-NL.rc index 0e37d9ee98c..f1f8956d752 100644 --- a/dll/shellext/netshell/lang/nl-NL.rc +++ b/dll/shellext/netshell/lang/nl-NL.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Beschrijving", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Component Beschrijving gaat hier...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Toon Pictogram in taskbar wanneer verbonden", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Breng me op de hoogte wanneer deze verbinding geen of beperkte connectiviteit heeft", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Toon Pictogram in taskbar wanneer verbonden", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Breng me op de hoogte wanneer deze verbinding geen of beperkte connectiviteit heeft", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/no-NO.rc b/dll/shellext/netshell/lang/no-NO.rc index 70fff3bd874..cf700c6a00a 100644 --- a/dll/shellext/netshell/lang/no-NO.rc +++ b/dll/shellext/netshell/lang/no-NO.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Beskrivelse", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Komponent beskrivelse kommer her...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Vis ikon i oppgavelinjen når tilkoblet", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Gi beskjed hvis denne tilkoblingen har begrenset eller ingen tilkobling", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Vis ikon i oppgavelinjen når tilkoblet", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Gi beskjed hvis denne tilkoblingen har begrenset eller ingen tilkobling", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/pl-PL.rc b/dll/shellext/netshell/lang/pl-PL.rc index 3a09786f9e8..b0bba7baad0 100644 --- a/dll/shellext/netshell/lang/pl-PL.rc +++ b/dll/shellext/netshell/lang/pl-PL.rc @@ -17,8 +17,8 @@ BEGIN PUSHBUTTON "&Właściwości", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Opis", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Tutaj pojawi się opis składnika...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Pokazuj ikonę w obszarze powiadomień podczas połączenia", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Powiadom mnie, gdy to połączenie ma ograniczoną łączność lub całkowity brak łączności", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE + AUTOCHECKBOX "Pokazuj ikonę w obszarze powiadomień podczas połączenia", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Powiadom mnie, gdy to połączenie ma ograniczoną łączność lub całkowity brak łączności", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index f53537effec..1010c3d853e 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Descrição ", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "A descrição dos componentes...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Notificar-me quando a conectividade esta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Notificar-me quando a conectividade esta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/ro-RO.rc b/dll/shellext/netshell/lang/ro-RO.rc index ff4e3feb11d..dd7b729c287 100644 --- a/dll/shellext/netshell/lang/ro-RO.rc +++ b/dll/shellext/netshell/lang/ro-RO.rc @@ -20,8 +20,8 @@ BEGIN PUSHBUTTON "&Proprietăți…", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Descriere", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Descrierea componentelor…", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Afișează pictogramă în zona de notificare", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "N&otifică problemele de conectivitate", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Afișează pictogramă în zona de notificare", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "N&otifică problemele de conectivitate", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/ru-RU.rc b/dll/shellext/netshell/lang/ru-RU.rc index 55f564d0bcb..f7917a6a827 100644 --- a/dll/shellext/netshell/lang/ru-RU.rc +++ b/dll/shellext/netshell/lang/ru-RU.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Свойства", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Описание", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Свойства компонента перечислены ниже...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Отображать значок в трее при установленном соединении", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Оповещать в случае разрыва соединения", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Отображать значок в трее при установленном соединении", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Оповещать в случае разрыва соединения", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/sk-SK.rc b/dll/shellext/netshell/lang/sk-SK.rc index 496dcae96c0..a6204b1139f 100644 --- a/dll/shellext/netshell/lang/sk-SK.rc +++ b/dll/shellext/netshell/lang/sk-SK.rc @@ -20,8 +20,8 @@ BEGIN PUSHBUTTON "Vl&astnosti", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Popis", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Popis komponentu príde sem ...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/sq-AL.rc b/dll/shellext/netshell/lang/sq-AL.rc index 7b48694a140..06ef2b49797 100644 --- a/dll/shellext/netshell/lang/sq-AL.rc +++ b/dll/shellext/netshell/lang/sq-AL.rc @@ -19,8 +19,8 @@ BEGIN PUSHBUTTON "&Karaktiristsikat", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Përshkrimi", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Përshkrimi Komponenteve shkon këtu...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Shfaq Ikonat në tabelen e punës gjatë lidhjes", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Më njofto kur kjo linjë ka kufizim ose ska lidhje", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Shfaq Ikonat në tabelen e punës gjatë lidhjes", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Më njofto kur kjo linjë ka kufizim ose ska lidhje", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/sv-SE.rc b/dll/shellext/netshell/lang/sv-SE.rc index 9d54a045b94..f5dede34d3a 100644 --- a/dll/shellext/netshell/lang/sv-SE.rc +++ b/dll/shellext/netshell/lang/sv-SE.rc @@ -15,8 +15,8 @@ BEGIN PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Beskrivning", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Komponentens beskrivning visas här...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Visa ikon i meddelandefältet när jag är ansluten", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP - CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Visa ikon i meddelandefältet när jag är ansluten", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/tr-TR.rc b/dll/shellext/netshell/lang/tr-TR.rc index eeb20f50f41..3273cf373b4 100644 --- a/dll/shellext/netshell/lang/tr-TR.rc +++ b/dll/shellext/netshell/lang/tr-TR.rc @@ -17,8 +17,8 @@ BEGIN PUSHBUTTON "&Özellikler", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Tanım", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Bileşen tanımı buraya gelecek.", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Bağlandığında Görev Çubuğunda Simge Göster", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "B&u Bağlantının, Kısıtlı Bağlanabilirliği Varsa ya da Bağlanabilirliği Yoksa Beni Uyar", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "&Bağlandığında Görev Çubuğunda Simge Göster", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "B&u Bağlantının, Kısıtlı Bağlanabilirliği Varsa ya da Bağlanabilirliği Yoksa Beni Uyar", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/uk-UA.rc b/dll/shellext/netshell/lang/uk-UA.rc index 25dcf9dc07a..7c1a77c42b9 100644 --- a/dll/shellext/netshell/lang/uk-UA.rc +++ b/dll/shellext/netshell/lang/uk-UA.rc @@ -23,8 +23,8 @@ BEGIN PUSHBUTTON "&Властивості", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Опис", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Опис компонентів...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Вивести значок підключення на панель завдань", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Сповіщати мене, якщо це підключення обмежене чи відсутнє", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "Вивести значок підключення на панель завдань", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "Сповіщати мене, якщо це підключення обмежене чи відсутнє", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/zh-CN.rc b/dll/shellext/netshell/lang/zh-CN.rc index 34db5a2d0ba..c69c268f09d 100644 --- a/dll/shellext/netshell/lang/zh-CN.rc +++ b/dll/shellext/netshell/lang/zh-CN.rc @@ -24,8 +24,8 @@ BEGIN PUSHBUTTON "属性(&P)", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "描述", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "这里是组件描述...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "连接后在通知区域显示图标", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "通知我当此连接受限制或无连接(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "连接后在通知区域显示图标", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "通知我当此连接受限制或无连接(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc index 1b1c772befd..82e6caafe18 100644 --- a/dll/shellext/netshell/lang/zh-TW.rc +++ b/dll/shellext/netshell/lang/zh-TW.rc @@ -23,8 +23,8 @@ BEGIN PUSHBUTTON "屬性(&P)", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "描述", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "元件描述在此處...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "連接後在通知區域顯示圖示", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "在連接通知我時此連接受限制或無連接(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + AUTOCHECKBOX "連接後在通知區域顯示圖示", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "在連接通知我時此連接受限制或無連接(&N)", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280

1 0

[reactos] 01/01: [USETUP] Hungarian translation fix (#2026)
by Tibor Lajos Füzi 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3398a8e8084d7648f206… commit a3398a8e8084d7648f20668c75f46d2a46cd467c Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Sun Nov 10 23:36:51 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 10 23:36:51 2019 +0100 [USETUP] Hungarian translation fix (#2026) --- base/setup/usetup/lang/hu-HU.h | 64 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 7ffe272a260..5062ec72f4c 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -106,7 +106,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 6, 12, - "a sz\240m\241t\242g\202pedre \202s el\213k\202sz\241ti a telep\241t\202s m\240sodik szakasz\240t.", + "a sz\240m\241t\242g\202pre \202s el\213k\202sz\241ti a telep\241t\202s m\240sodik szakasz\240t.", TEXT_STYLE_NORMAL }, { @@ -130,7 +130,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 8, 21, - "\x07 Nyomj F3-mat a telep\241t\202s megszak\241t\240s\240hoz.", + "\x07 Nyomj F3-at a telep\241t\202s megszak\241t\240s\240hoz.", TEXT_STYLE_NORMAL }, { @@ -142,7 +142,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org -ra.", + "http://www.reactos.org weboldalra.", TEXT_STYLE_HIGHLIGHT }, { @@ -212,7 +212,7 @@ static MUI_ENTRY huHUIntroPageEntries[] = { 8, 21, - "\x07 Nyomj F3-mat a telep\241t\202s megszak\241t\240s\240hoz.", + "\x07 Nyomj F3-at a telep\241t\202s megszak\241t\240s\240hoz.", TEXT_STYLE_NORMAL }, { @@ -246,13 +246,13 @@ static MUI_ENTRY huHULicensePageEntries[] = { 8, 8, - "A ReactOS rendszer GNU GPL licenc alatt lett k\224zreadva,", + "A ReactOS rendszer GNU GPL licenc alatt lett k\224zreadva", TEXT_STYLE_NORMAL }, { 8, 9, - "olyan r\202szekkel amik m\240s kompatibilis lincenc\373 k\242dokat", + "olyan r\202szekkel, amelyek m\240s kompatibilis lincenc\373 k\242dokat", TEXT_STYLE_NORMAL }, { @@ -270,7 +270,7 @@ static MUI_ENTRY huHULicensePageEntries[] = { 8, 12, - "a GNU GPL alatt ker\201l kiad\240sra, az eredeti licenc fenntart\240sa", + "a GNU GPL alatt ker\201l kiad\240sra az eredeti licenc fenntart\240sa", TEXT_STYLE_NORMAL }, { @@ -300,13 +300,13 @@ static MUI_ENTRY huHULicensePageEntries[] = { 8, 18, - "terjeszt\202sekre vonatkozik. Ha valamilyen okb\242l nem kapta meg", + "terjeszt\202sekre vonatkozik. Ha valamilyen okb\242l nem kaptad meg", TEXT_STYLE_NORMAL }, { 8, 19, - "a GNU General Public License egy p\202ld\240ny\240t, k\202rj\201k l\240togasson el", + "a GNU General Public License egy p\202ld\240ny\240t, k\202rj\201k l\240togass el", TEXT_STYLE_NORMAL }, { @@ -534,7 +534,7 @@ static MUI_ENTRY huHUUpgradePageEntries[] = { 6, 10, - "a telep\241t\213 megpr\242b\240lhatja kijav\241tani azt.", + "megpr\242b\240lhatja kijav\241tani azt.", TEXT_STYLE_NORMAL }, { @@ -564,7 +564,7 @@ static MUI_ENTRY huHUUpgradePageEntries[] = { 8, 21, - "\x07 Nyomj F3-mat a telep\241t\202s megszak\241t\240s\240hoz.", + "\x07 Nyomj F3-at a telep\241t\202s megszak\241t\240s\240hoz.", TEXT_STYLE_NORMAL }, { @@ -833,13 +833,13 @@ static MUI_ENTRY huHUBootPageEntries[] = { 6, 8, - "A telep\241t\213 nem tudja install\240lni a rendszerbet\224lt\213t", + "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t", TEXT_STYLE_NORMAL }, { 6, 9, - "a sz\240m\241t\242g\202ped merevlemez\202re.", + "a sz\240m\241t\242g\202p merevlemez\202re.", TEXT_STYLE_NORMAL }, { @@ -851,7 +851,7 @@ static MUI_ENTRY huHUBootPageEntries[] = { 6, 14, - "az A: meghajt\242ba, majd nyomj ENTER-t,", + "az A: meghajt\242ba, majd nyomj ENTER-t.", TEXT_STYLE_NORMAL, }, { @@ -962,13 +962,13 @@ static MUI_ENTRY huHUConfirmDeleteSystemPartitionEntries[] = { 6, 11, - "konfigur\240l\242 programok, programok amik egy oper\240ci\242s rendszert", + "konfigur\240l\242 programok, programok, melyek egy oper\240ci\242s rendszert", TEXT_STYLE_NORMAL }, { 6, 12, - "(pl. ReactOS) ind\241tanak vagy egy\202b szoftverek amiket", + "(pl. ReactOS) ind\241tanak vagy egy\202b szoftverek, melyeket", TEXT_STYLE_NORMAL }, { @@ -1028,7 +1028,7 @@ static MUI_ENTRY huHUConfirmDeleteSystemPartitionEntries[] = { 0, 0, - "ENTER=Folytat\240s ESC=M\202gse", + "ENTER = Folytat\240s ESC = M\202gse", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1339,7 +1339,7 @@ static MUI_ENTRY huHUPrepareCopyEntries[] = { 6, 8, - "A telep\241t\213 el\213k\202sz\241ti a sz\240m\241t\242g\202pedet a ReactOS f\240jlok m\240sol\240s\240ra.", + "A telep\241t\213 el\213k\202sz\241ti a sz\240m\241t\242g\202pet a ReactOS f\240jlok m\240sol\240s\240ra.", TEXT_STYLE_NORMAL }, { @@ -1486,12 +1486,12 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_NOT_INSTALLED - "A ReactOS nincs teljesen telep\241tve a sz\240m\241t\242g\202pedre.\n" + "A ReactOS nincs teljesen telep\241tve a sz\240m\241t\242g\202pre.\n" "Ha most kil\202psz a telep\241t\213b\213l, \243jra futtatnod kell azt\n" "a ReactOS telep\241t\202s\202hez.\n" "\n" " \x07 Nyomj ENTER-t a telep\241t\202s folytat\240s\240hoz.\n" - " \x07 Nyomj F3-mat a kil\202p\202shez.\n", + " \x07 Nyomj F3-at a kil\202p\202shez.\n", "F3 = Kil\202p\202s ENTER = Folytat\240s" }, { @@ -1531,7 +1531,7 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_SIGNATURE_TXTSETUPSIF, - "A telep\241t\213 egy \202rv\202nytelen al\240\241r\240st tal\240lt a TXTSETUP.SIF-ben.\n", + "A telep\241t\213 egy \202rv\202nytelen al\240\241r\240st tal\240lt a TXTSETUP.SIF f\240jlban.\n", "ENTER = Sz\240m\241t\242g\202p \243jraind\241t\240sa" }, { @@ -1566,12 +1566,12 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_WARN_PARTITION, - "A telep\241t\213 legal\240bb egy olyan merevlemezt tal\240lt ami nem kompatibilis\n" - "part\241ci\242s t\240bl\240t tartalmaz, amit nem tud rendesen kezelni!\n" + "A telep\241t\213 legal\240bb egy olyan merevlemezt tal\240lt amely nem kompatibilis\n" + "part\241ci\242s t\240bl\240t tartalmaz, amelyet nem tud rendesen kezelni!\n" "\n" "Part\241ci\242k l\202trehoz\240sa vagy t\224rl\202se t\224nkreteheti a part\241ci\242s t\240bl\240t.\n" "\n" - " \x07 Nyomj F3-mat a telep\241t\213b\213l val\242 kil\202p\202shez.\n" + " \x07 Nyomj F3-at a telep\241t\213b\213l val\242 kil\202p\202shez.\n" " \x07 Nyomj ENTER-t a folytat\240shoz.", "F3 = Kil\202p\202s ENTER = Folytat\240s" }, @@ -1585,7 +1585,7 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_DELETE_SPACE, - "Nem tudsz t\224r\224lni part\241cion\240latlan lemezter\201letet!\n" + "Nem tudsz t\224r\224lni particion\240latlan lemezter\201letet!\n" "\n" " * Nyomj meg egy gombot a folytat\240shoz.", NULL @@ -1642,7 +1642,7 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_CABINET_SCRIPT, - "A kabinetf\240jlban nincs telep\241t\213 szkript.\n", + "A kabinetf\240jlban nincs telep\241t\213 parancsf\240jl.\n", "ENTER = Sz\240m\241t\242g\202p \243jraind\241t\240sa" }, { @@ -1689,7 +1689,7 @@ MUI_ERROR huHUErrorEntries[] = }, { // ERROR_ADDING_KBLAYOUTS, - "Nem siker\201lt a billenyt\373zet kioszt\240sok hozz\240ad\240sa\n" + "Nem siker\201lt a billenyt\373zetkioszt\240sok hozz\240ad\240sa\n" "a regisztr\240ci\242s adatb\240zishoz.\n" "ENTER = Sz\240m\241t\242g\202p \243jraind\241t\240sa" }, @@ -1707,7 +1707,7 @@ MUI_ERROR huHUErrorEntries[] = { // ERROR_INSUFFICIENT_PARTITION_SIZE, "A kijel\224lt part\241ci\242 nem el\202g nagy a ReactOS telep\241t\202s\202hez.\n" - "A telep\241\202si part\241ci\242nak legal\240bb %lu MB-nak kell lennie.\n" + "A telep\241t\202si part\241ci\242nak legal\240bb %lu MB-nak kell lennie.\n" "\n" " * Nyomj meg egy gombot a folytat\240shoz.", NULL @@ -1919,7 +1919,7 @@ MUI_STRING huHUStrings[] = {STRING_REBOOTCOMPUTER2, " ENTER = Sz\240m\241t\242g\202p \243jraind\241t\240sa"}, {STRING_REBOOTPROGRESSBAR, - " A sz\240m\241t\242g\202ped %li m\240sodperc m\243lva \243jraindul... "}, + " A sz\240m\241t\242g\202p %li m\240sodperc m\243lva \243jraindul... "}, {STRING_CONSOLEFAIL1, "Nem lehet megnyitni a konzolt\r\n\r\n"}, {STRING_CONSOLEFAIL2, @@ -1927,9 +1927,9 @@ MUI_STRING huHUStrings[] = {STRING_CONSOLEFAIL3, "Az USB-s billenty\373zetek m\202g nincsenek teljesen t\240mogatva\r\n"}, {STRING_FORMATTINGDISK, - "A telep\241t\213 form\240zza a merevlemezedet"}, + "A telep\241t\213 form\240zza a merevlemezt"}, {STRING_CHECKINGDISK, - "A telep\241t\213 ellen\213rzni a merevlemezedet"}, + "A telep\241t\213 ellen\213rzni a merevlemezt"}, {STRING_FORMATDISK1, " Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel (gyorsform\240z\240s) "}, {STRING_FORMATDISK2, @@ -1961,7 +1961,7 @@ MUI_STRING huHUStrings[] = {STRING_NEWPARTITION, "A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"}, {STRING_UNPSPACE, - " %sNem part\241cion\240lt ter\201let%s %6lu %s"}, + " %sNem particion\240lt ter\201let%s %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_EXTENDED_PARTITION,

1 0

[reactos] 01/01: [IDL][DNSRSLVR] Use the stdcall calling convention for remote functions
by Eric Kohl 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e92ad7f30950e63735102… commit e92ad7f30950e63735102aa2c4f8686d948bd8dc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 10 17:12:20 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 10 17:16:17 2019 +0100 [IDL][DNSRSLVR] Use the stdcall calling convention for remote functions --- base/services/dnsrslvr/rpcserver.c | 2 ++ sdk/include/reactos/idl/dnsrslvr.idl | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/base/services/dnsrslvr/rpcserver.c b/base/services/dnsrslvr/rpcserver.c index 96e398c9b52..913d2b32a78 100644 --- a/base/services/dnsrslvr/rpcserver.c +++ b/base/services/dnsrslvr/rpcserver.c @@ -42,6 +42,7 @@ RpcThreadRoutine(LPVOID lpParameter) } DWORD +__stdcall R_ResolverFlushCache( DNSRSLVR_HANDLE pwszServerName) { @@ -53,6 +54,7 @@ R_ResolverFlushCache( } DWORD +__stdcall R_ResolverQuery( DNSRSLVR_HANDLE pszServerName, LPCWSTR pszName, diff --git a/sdk/include/reactos/idl/dnsrslvr.idl b/sdk/include/reactos/idl/dnsrslvr.idl index ce0514557a6..2c0bf7b787d 100644 --- a/sdk/include/reactos/idl/dnsrslvr.idl +++ b/sdk/include/reactos/idl/dnsrslvr.idl @@ -37,8 +37,10 @@ interface DnsResolver /* R_ResolverGetConfig */ /* Function: 0x04 */ - DWORD R_ResolverFlushCache( - [in][unique][string] DNSRSLVR_HANDLE pwszServerName); + DWORD + __stdcall + R_ResolverFlushCache( + [in, unique, string] DNSRSLVR_HANDLE pwszServerName); /* Function: 0x05 */ /* R_ResolverFlushCacheEntry */ @@ -47,12 +49,14 @@ interface DnsResolver /* R_ResolverRegisterCluster */ /* Function: 0x07 */ - DWORD R_ResolverQuery( - [in][unique][string] DNSRSLVR_HANDLE pwszServerName, - [in][unique][string] LPCWSTR pwsName, + DWORD + __stdcall + R_ResolverQuery( + [in, unique, string] DNSRSLVR_HANDLE pwszServerName, + [in, unique, string] LPCWSTR pwsName, [in] WORD wType, [in] DWORD Flags, - [in][out] DWORD *dwRecords, + [in, out] DWORD *dwRecords, [out] DNS_RECORDW **ppResultRecords); /* Function: 0x08 */

1 0

[reactos] 01/01: [SHELL32] Follow up of #2021 (#2022)
by Katayama Hirofumi MZ 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b2ead064f823d871e714… commit 3b2ead064f823d871e714ca3c464896b9deb3a89 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 11 00:37:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 11 00:37:23 2019 +0900 [SHELL32] Follow up of #2021 (#2022) - Delete IObjectWithSite interface. - Use PIDLIST_ABSOLUTE and PITEMID_CHILD rather than LPITEMIDLIST. - Move CLSID_SendToMenu to shlguid_undoc.h. - Delete unnecessary codes. CORE-12562 --- dll/win32/shell32/CSendToMenu.cpp | 319 +++++++++++++----------------------- dll/win32/shell32/CSendToMenu.h | 39 +++-- sdk/include/reactos/shlguid_undoc.h | 1 + 3 files changed, 139 insertions(+), 220 deletions(-) diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 4b0dcab1348..6c67707534e 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -19,23 +19,21 @@ */ #include "precomp.h" -#define INITGUID -#include <guiddef.h> - -#define MAX_ITEM_COUNT 64 WINE_DEFAULT_DEBUG_CHANNEL(shell); -DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, - 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); - CSendToMenu::CSendToMenu() : m_hSubMenu(NULL) , m_pItems(NULL) , m_idCmdFirst(0) { - SHGetDesktopFolder(&m_pDesktop); - m_pSendTo = GetSpecialFolder(NULL, CSIDL_SENDTO); + HRESULT hr = SHGetDesktopFolder(&m_pDesktop); + if (FAILED(hr)) + { + ERR("SHGetDesktopFolder: %08lX\n", hr); + } + + GetSpecialFolder(NULL, &m_pSendTo, CSIDL_SENDTO); } CSendToMenu::~CSendToMenu() @@ -68,100 +66,82 @@ HRESULT CSendToMenu::DoDrop(IDataObject *pDataObject, IDropTarget *pDropTarget) POINTL ptl = { 0, 0 }; HRESULT hr = pDropTarget->DragEnter(pDataObject, dwKeyState, ptl, &dwEffect); - if (SUCCEEDED(hr) && dwEffect != DROPEFFECT_NONE) + if (FAILED_UNEXPECTEDLY(hr)) { - // THIS CODE IS NOT HUMAN-FRIENDLY. SORRY. - // (We have to translate a SendTo action to a Drop action) - if (bShift && bCtrl) - dwEffect = DROPEFFECT_LINK; - else if (!bShift) - dwEffect = DROPEFFECT_MOVE; - else - dwEffect = DROPEFFECT_COPY; - - hr = pDropTarget->Drop(pDataObject, dwKeyState, ptl, &dwEffect); + pDropTarget->DragLeave(); + return hr; } - else + + if (dwEffect == DROPEFFECT_NONE) { - ERR("DragEnter: %08lX\n", hr); + ERR("DROPEFFECT_NONE\n"); pDropTarget->DragLeave(); + return E_FAIL; } + // THIS CODE IS NOT HUMAN-FRIENDLY. SORRY. + // (We have to translate a SendTo action to a Drop action) + if (bShift && bCtrl) + dwEffect = DROPEFFECT_LINK; + else if (!bShift) + dwEffect = DROPEFFECT_MOVE; + else + dwEffect = DROPEFFECT_COPY; + + hr = pDropTarget->Drop(pDataObject, dwKeyState, ptl, &dwEffect); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return hr; } // get an IShellFolder from CSIDL -IShellFolder * -CSendToMenu::GetSpecialFolder(HWND hwnd, int csidl, LPITEMIDLIST *ppidl) +HRESULT +CSendToMenu::GetSpecialFolder(HWND hwnd, IShellFolder **ppFolder, + int csidl, PIDLIST_ABSOLUTE *ppidl) { + if (!ppFolder) + return E_POINTER; + *ppFolder = NULL; + if (ppidl) *ppidl = NULL; - if (!m_pDesktop) - { - SHGetDesktopFolder(&m_pDesktop); - if (!m_pDesktop) - { - ERR("SHGetDesktopFolder\n"); - return NULL; - } - } - - LPITEMIDLIST pidl = NULL; + CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl; HRESULT hr = SHGetSpecialFolderLocation(hwnd, csidl, &pidl); - if (FAILED(hr)) - { - ERR("SHGetSpecialFolderLocation: %08lX\n", hr); - return NULL; - } + if (FAILED_UNEXPECTEDLY(hr)) + return hr; IShellFolder *pFolder = NULL; hr = m_pDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); if (ppidl) - *ppidl = pidl; - else - CoTaskMemFree(pidl); + *ppidl = pidl.Detach(); - if (SUCCEEDED(hr)) - return pFolder; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - ERR("BindToObject: %08lX\n", hr); - return NULL; + *ppFolder = pFolder; + return hr; } // get a UI object from PIDL -HRESULT CSendToMenu::GetUIObjectFromPidl(HWND hwnd, LPITEMIDLIST pidl, +HRESULT CSendToMenu::GetUIObjectFromPidl(HWND hwnd, PIDLIST_ABSOLUTE pidl, REFIID riid, LPVOID *ppvOut) { *ppvOut = NULL; - LPCITEMIDLIST pidlLast; + PCITEMID_CHILD pidlLast; CComPtr<IShellFolder> pFolder; HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &pFolder), &pidlLast); - if (FAILED(hr)) - { - ERR("SHBindToParent: %08lX\n", hr); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - } hr = pFolder->GetUIObjectOf(hwnd, 1, &pidlLast, riid, NULL, ppvOut); - if (FAILED(hr)) - { - ERR("GetUIObjectOf: %08lX\n", hr); - } - return hr; -} - -void CSendToMenu::UnloadItem(SENDTO_ITEM *pItem) -{ - if (!pItem) - return; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CoTaskMemFree(pItem->pidlChild); - CoTaskMemFree(pItem->pszText); - DestroyIcon(pItem->hIcon); - HeapFree(GetProcessHeap(), 0, pItem); + return hr; } void CSendToMenu::UnloadAllItems() @@ -172,118 +152,77 @@ void CSendToMenu::UnloadAllItems() { SENDTO_ITEM *pCurItem = pItems; pItems = pItems->pNext; - UnloadItem(pCurItem); + delete pCurItem; } } -BOOL CSendToMenu::LoadAllItems(HWND hwnd) +HRESULT CSendToMenu::LoadAllItems(HWND hwnd) { UnloadAllItems(); - LPITEMIDLIST pidlSendTo; - m_pSendTo = GetSpecialFolder(hwnd, CSIDL_SENDTO, &pidlSendTo); - if (!m_pSendTo) - { - ERR("GetSpecialFolder\n"); - return FALSE; - } + CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidlSendTo; + + m_pSendTo.Release(); + HRESULT hr = GetSpecialFolder(hwnd, &m_pSendTo, CSIDL_SENDTO, &pidlSendTo); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - HRESULT hr; CComPtr<IEnumIDList> pEnumIDList; hr = m_pSendTo->EnumObjects(hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &pEnumIDList); - if (FAILED(hr)) - { - ERR("EnumObjects: %08lX\n", hr); - ILFree(pidlSendTo); - return FALSE; - } + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - BOOL bOK = TRUE; - LPITEMIDLIST pidlChild; - UINT nCount = 0; - while (pEnumIDList->Next(1, &pidlChild, NULL) == S_OK) + hr = S_OK; + PITEMID_CHILD child; + while (pEnumIDList->Next(1, &child, NULL) == S_OK) { - SENDTO_ITEM *pNewItem = (SENDTO_ITEM *)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SENDTO_ITEM)); - if (!pNewItem) - { - ERR("HeapAlloc\n"); - bOK = FALSE; - CoTaskMemFree(pidlChild); - break; - } + CComHeapPtr<ITEMID_CHILD> pidlChild(child); STRRET strret; hr = m_pSendTo->GetDisplayNameOf(pidlChild, SHGDN_NORMAL, &strret); - if (SUCCEEDED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) + continue; + + CComHeapPtr<WCHAR> pszText; + hr = StrRetToStrW(&strret, pidlChild, &pszText); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + + CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidlAbsolute; + pidlAbsolute.Attach(ILCombine(pidlSendTo, pidlChild)); + + SHFILEINFOW fi = { NULL }; + const UINT uFlags = SHGFI_PIDL | SHGFI_TYPENAME | + SHGFI_ICON | SHGFI_SMALLICON; + SHGetFileInfoW(reinterpret_cast<LPWSTR>(static_cast<PIDLIST_ABSOLUTE>(pidlAbsolute)), 0, + &fi, sizeof(fi), uFlags); + + SENDTO_ITEM *pNewItem = + new SENDTO_ITEM(pidlChild.Detach(), pszText.Detach(), fi.hIcon); + if (m_pItems) { - LPWSTR pszText = NULL; - hr = StrRetToStrW(&strret, pidlChild, &pszText); - if (SUCCEEDED(hr)) - { - LPITEMIDLIST pidlAbsolute = ILCombine(pidlSendTo, pidlChild); - - SHFILEINFOW fi = { NULL }; - const UINT uFlags = SHGFI_PIDL | SHGFI_TYPENAME | - SHGFI_ICON | SHGFI_SMALLICON; - SHGetFileInfoW((LPCWSTR)pidlAbsolute, 0, &fi, sizeof(fi), uFlags); - - ILFree(pidlAbsolute); - - pNewItem->pidlChild = pidlChild; - pNewItem->pszText = pszText; - pNewItem->hIcon = fi.hIcon; - if (m_pItems) - { - pNewItem->pNext = m_pItems; - } - m_pItems = pNewItem; - - // successful - ++nCount; - if (nCount >= MAX_ITEM_COUNT) - { - break; - } - continue; - } - else - { - ERR("StrRetToStrW: %08lX\n", hr); - } + pNewItem->pNext = m_pItems; } - else - { - ERR("GetDisplayNameOf: %08lX\n", hr); - } - - UnloadItem(pNewItem); - CoTaskMemFree(pidlChild); + m_pItems = pNewItem; } - ILFree(pidlSendTo); - - return bOK; + return hr; } UINT CSendToMenu::InsertSendToItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { if (m_pItems == NULL) { - if (!LoadAllItems(NULL)) - { - ERR("LoadAllItems\n"); + HRESULT hr = LoadAllItems(NULL); + if (FAILED_UNEXPECTEDLY(hr)) return 0; - } } m_idCmdFirst = idCmdFirst; UINT idCmd = idCmdFirst; - UINT nCount = 0; for (SENDTO_ITEM *pCurItem = m_pItems; pCurItem; pCurItem = pCurItem->pNext) { const UINT uFlags = MF_BYPOSITION | MF_STRING | MF_ENABLED; @@ -292,26 +231,19 @@ UINT CSendToMenu::InsertSendToItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) MENUITEMINFOW mii; mii.cbSize = sizeof(mii); mii.fMask = MIIM_DATA | MIIM_BITMAP; - mii.dwItemData = (ULONG_PTR)pCurItem; + mii.dwItemData = reinterpret_cast<ULONG_PTR>(pCurItem); mii.hbmpItem = HBMMENU_CALLBACK; SetMenuItemInfoW(hMenu, idCmd, FALSE, &mii); ++idCmd; // successful - ++nCount; - if (nCount >= MAX_ITEM_COUNT) - { - break; - } } } if (idCmd == idCmdFirst) { - WCHAR szNone[64] = L"(None)"; - LoadStringW(shell32_hInstance, IDS_NONE, szNone, _countof(szNone)); - - AppendMenuW(hMenu, MF_GRAYED | MF_DISABLED | MF_STRING, idCmd, szNone); + CStringW strNone(MAKEINTRESOURCEW(IDS_NONE)); + AppendMenuW(hMenu, MF_GRAYED | MF_DISABLED | MF_STRING, idCmd, strNone); } return idCmd - idCmdFirst; @@ -324,9 +256,9 @@ CSendToMenu::SENDTO_ITEM *CSendToMenu::FindItemFromIdOffset(UINT IdOffset) MENUITEMINFOW mii = { sizeof(mii) }; mii.fMask = MIIM_DATA; if (GetMenuItemInfoW(m_hSubMenu, idCmd, FALSE, &mii)) - return (SENDTO_ITEM *)mii.dwItemData; + return reinterpret_cast<SENDTO_ITEM *>(mii.dwItemData); - ERR("GetMenuItemInfoW\n"); + ERR("GetMenuItemInfoW: %ld\n", GetLastError()); return NULL; } @@ -340,33 +272,16 @@ HRESULT CSendToMenu::DoSendToItem(SENDTO_ITEM *pItem, LPCMINVOKECOMMANDINFO lpic HRESULT hr; CComPtr<IDropTarget> pDropTarget; - LPITEMIDLIST pidlChild = pItem->pidlChild; - hr = m_pSendTo->GetUIObjectOf(NULL, 1, &pidlChild, IID_IDropTarget, + hr = m_pSendTo->GetUIObjectOf(NULL, 1, &pItem->pidlChild, IID_IDropTarget, NULL, (LPVOID *)&pDropTarget); - if (SUCCEEDED(hr)) - { - hr = DoDrop(m_pDataObject, pDropTarget); - } - else - { - ERR("GetUIObjectOf: %08lX\n", hr); - } - - return hr; -} - -STDMETHODIMP CSendToMenu::SetSite(IUnknown *pUnkSite) -{ - m_pSite = pUnkSite; - return S_OK; -} + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -STDMETHODIMP CSendToMenu::GetSite(REFIID riid, void **ppvSite) -{ - if (!m_pSite) - return E_FAIL; + hr = DoDrop(m_pDataObject, pDropTarget); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - return m_pSite->QueryInterface(riid, ppvSite); + return hr; } STDMETHODIMP @@ -379,36 +294,28 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - WCHAR wszSendTo[64]; - if (!LoadStringW(shell32_hInstance, IDS_SENDTO, - wszSendTo, _countof(wszSendTo))) - { - ERR("IDS_SENDTO\n"); - return E_FAIL; - } - HMENU hSubMenu = CreateMenu(); if (!hSubMenu) { - ERR("CreateMenu\n"); + ERR("CreateMenu: %ld\n", GetLastError()); return E_FAIL; } UINT cItems = InsertSendToItems(hSubMenu, idCmdFirst, 0); - MENUITEMINFOW mii; - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); + CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO)); + + MENUITEMINFOW mii = { sizeof(mii) }; mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; mii.fType = MFT_STRING; mii.wID = -1; - mii.dwTypeData = wszSendTo; + mii.dwTypeData = strSendTo.GetBuffer(); mii.cch = wcslen(mii.dwTypeData); mii.fState = MFS_ENABLED; mii.hSubMenu = hSubMenu; if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) { - ERR("InsertMenuItemW\n"); + ERR("InsertMenuItemW: %ld\n", GetLastError()); return E_FAIL; } @@ -432,10 +339,6 @@ CSendToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { hr = DoSendToItem(pItem, lpici); } - else - { - ERR("FindItemFromIdOffset\n"); - } TRACE("CSendToMenu::InvokeCommand %x\n", hr); return hr; @@ -491,17 +394,19 @@ CSendToMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, if (!lpdis || lpdis->CtlType != ODT_MENU) break; - SENDTO_ITEM *pItem = (SENDTO_ITEM *)lpdis->itemData; + SENDTO_ITEM *pItem = reinterpret_cast<SENDTO_ITEM *>(lpdis->itemData); HICON hIcon = NULL; if (pItem) hIcon = pItem->hIcon; if (!hIcon) break; - RECT rcItem = lpdis->rcItem; - DrawIconEx(lpdis->hDC, 2, - lpdis->rcItem.top + (rcItem.bottom - rcItem.top - 16) / 2, - hIcon, cxSmall, cySmall, 0, NULL, DI_NORMAL); + const RECT& rcItem = lpdis->rcItem; + INT x = 4; + INT y = lpdis->rcItem.top; + y += (rcItem.bottom - rcItem.top - cySmall) / 2; + DrawIconEx(lpdis->hDC, x, y, hIcon, cxSmall, cySmall, + 0, NULL, DI_NORMAL); if (plResult) *plResult = TRUE; diff --git a/dll/win32/shell32/CSendToMenu.h b/dll/win32/shell32/CSendToMenu.h index b8a455e6630..2f59319921e 100644 --- a/dll/win32/shell32/CSendToMenu.h +++ b/dll/win32/shell32/CSendToMenu.h @@ -26,30 +26,47 @@ extern "C" const GUID CLSID_SendToMenu; class CSendToMenu : public CComCoClass<CSendToMenu, &CLSID_SendToMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IObjectWithSite, public IContextMenu3, public IShellExtInit { private: struct SENDTO_ITEM { - LPITEMIDLIST pidlChild; + SENDTO_ITEM *pNext; + PITEMID_CHILD pidlChild; LPWSTR pszText; HICON hIcon; - SENDTO_ITEM *pNext; + + SENDTO_ITEM(PITEMID_CHILD child, LPWSTR text, HICON icon) + : pNext(NULL) + , pidlChild(child) + , pszText(text) + , hIcon(icon) + { + } + + ~SENDTO_ITEM() + { + CoTaskMemFree(pidlChild); + CoTaskMemFree(pszText); + DestroyIcon(hIcon); + } + + private: + SENDTO_ITEM(); + SENDTO_ITEM(const SENDTO_ITEM&); + SENDTO_ITEM& operator=(const SENDTO_ITEM&); }; HMENU m_hSubMenu; SENDTO_ITEM *m_pItems; UINT m_idCmdFirst; - CComPtr<IUnknown> m_pSite; CComPtr<IShellFolder> m_pDesktop; CComPtr<IShellFolder> m_pSendTo; CComPtr<IDataObject> m_pDataObject; - BOOL LoadAllItems(HWND hwnd); - void UnloadItem(SENDTO_ITEM *pItem); + HRESULT LoadAllItems(HWND hwnd); void UnloadAllItems(); UINT InsertSendToItems(HMENU hMenu, UINT idFirst, UINT idMenu); @@ -58,17 +75,14 @@ private: HRESULT DoSendToItem(SENDTO_ITEM *pItem, LPCMINVOKECOMMANDINFO lpici); HRESULT DoDrop(IDataObject *pDataObject, IDropTarget *pDropTarget); - IShellFolder *GetSpecialFolder(HWND hwnd, int csidl, LPITEMIDLIST *ppidl = NULL); - HRESULT GetUIObjectFromPidl(HWND hwnd, LPITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); + HRESULT GetSpecialFolder(HWND hwnd, IShellFolder **ppFolder, int csidl, + PIDLIST_ABSOLUTE *ppidl = NULL); + HRESULT GetUIObjectFromPidl(HWND hwnd, PIDLIST_ABSOLUTE pidl, REFIID riid, LPVOID *ppvOut); public: CSendToMenu(); ~CSendToMenu(); - // IObjectWithSite - STDMETHODIMP SetSite(IUnknown *pUnkSite); - STDMETHODIMP GetSite(REFIID riid, void **ppvSite); - // IContextMenu STDMETHODIMP QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); STDMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); @@ -88,7 +102,6 @@ public: DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CSendToMenu) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index b29fc467bc9..07b2c5f36f3 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -137,6 +137,7 @@ DEFINE_GUID(CLSID_SysTray, 0x35CEC8A3, 0x2BE6, 0x11D2, 0x87, 0x7 DEFINE_GUID(CLSID_BackgroundTaskScheduler, 0x603D3800, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); DEFINE_GUID(CLSID_SharedTaskScheduler, 0x603D3801, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); +DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); /* The following list of interfaces was taken from here: http://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/index… */ DEFINE_GUID(IID_IAggregateFilterCondition, 0x86228AA3, 0xA736, 0x4733, 0xBD, 0x8A, 0x10, 0xA8, 0x3C, 0x69, 0xBF, 0x84);

1 0

[reactos] 01/01: [SMSS] When determining page file size, keep more free disk space. CORE-6839
by Thomas Faber 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d85d534e0a54bb5b263a… commit 5d85d534e0a54bb5b263adee98c7d2d2b3b5a1b5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 10 16:13:45 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 10 16:28:38 2019 +0100 [SMSS] When determining page file size, keep more free disk space. CORE-6839 64 MB used to be enough to at least finish 2nd stage, but that does not always seem to be the case anymore. Leaving this little free space does not make for a good user experience either way. 256 MB is still not much, but at least provides slightly more usability. --- base/system/smss/pagefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index 6af9b214951..51429a18867 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -23,7 +23,7 @@ #define MEGABYTE 0x100000UL #define MAXIMUM_PAGEFILE_SIZE (4095 * MEGABYTE) /* This should be 32 MB, but we need more than that for 2nd stage setup */ -#define MINIMUM_TO_KEEP_FREE (64 * MEGABYTE) +#define MINIMUM_TO_KEEP_FREE (256 * MEGABYTE) #define FUZZ_FACTOR (16 * MEGABYTE) //

1 0

[reactos] 01/01: [DNSRSLVR][DNSAPI] Enable the DNS resolver cache
by Eric Kohl 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=305035be7d4983eebd769… commit 305035be7d4983eebd7691b3092e232d497626a4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 10 15:28:42 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 10 15:28:42 2019 +0100 [DNSRSLVR][DNSAPI] Enable the DNS resolver cache - Fix the IDL file to return DNS records properly - Reroute the DNS query call path: DNSQuery->R_ResolverQuery->Query_Main DNS records get cached and 'ipconfig /flushdns' works as expected. CORE-12159 --- base/services/dnsrslvr/precomp.h | 1 + base/services/dnsrslvr/rpcserver.c | 64 +++++++++++++++++------------------- dll/win32/dnsapi/dnsapi.spec | 3 +- dll/win32/dnsapi/dnsapi/query.c | 43 +++++++++++++++++++++--- sdk/include/reactos/idl/dnsrslvr.idl | 2 +- sdk/include/reactos/windns_undoc.h | 8 +++++ 6 files changed, 80 insertions(+), 41 deletions(-) diff --git a/base/services/dnsrslvr/precomp.h b/base/services/dnsrslvr/precomp.h index 0a11db5ee62..3983d3100a3 100644 --- a/base/services/dnsrslvr/precomp.h +++ b/base/services/dnsrslvr/precomp.h @@ -11,6 +11,7 @@ #include <winbase.h> #include <winsvc.h> #include <windns.h> +#include <windns_undoc.h> #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> diff --git a/base/services/dnsrslvr/rpcserver.c b/base/services/dnsrslvr/rpcserver.c index 0cb5c1f8b59..96e398c9b52 100644 --- a/base/services/dnsrslvr/rpcserver.c +++ b/base/services/dnsrslvr/rpcserver.c @@ -45,6 +45,8 @@ DWORD R_ResolverFlushCache( DNSRSLVR_HANDLE pwszServerName) { + DPRINT("R_ResolverFlushCache()\n"); + // FIXME Should store (and flush) entries by server handle DnsIntCacheFlush(); return 0; @@ -52,65 +54,61 @@ R_ResolverFlushCache( DWORD R_ResolverQuery( - DNSRSLVR_HANDLE pwszServerName, - LPCWSTR pwsName, + DNSRSLVR_HANDLE pszServerName, + LPCWSTR pszName, WORD wType, - DWORD Flags, + DWORD dwFlags, DWORD *dwRecords, DNS_RECORDW **ppResultRecords) { -#if 0 - DNS_QUERY_REQUEST QueryRequest = { 0 }; - DNS_QUERY_RESULT QueryResults = { 0 }; -#endif - DNS_STATUS Status; - PDNS_RECORDW Record; + PDNS_RECORDW Record; + DNS_STATUS Status; + + DPRINT("R_ResolverQuery(%S %S %x %lx %p %p)\n", + pszServerName, pszName, wType, dwFlags, dwRecords, ppResultRecords); - DPRINT1("R_ResolverQuery %p %p %x %lx %p %p\n", - pwszServerName, pwsName, wType, Flags, dwRecords, ppResultRecords); + if (pszName == NULL || wType == 0 || ppResultRecords == NULL) + return ERROR_INVALID_PARAMETER; - if (!pwszServerName || !pwsName || !wType || !ppResultRecords) + if ((dwFlags & DNS_QUERY_WIRE_ONLY) != 0 && (dwFlags & DNS_QUERY_NO_WIRE_QUERY) != 0) return ERROR_INVALID_PARAMETER; - // FIXME Should lookup entries by server handle - if (DnsIntCacheGetEntryFromName(pwsName, ppResultRecords)) + if (DnsIntCacheGetEntryFromName(pszName, ppResultRecords)) { + DPRINT("DNS cache query successful!\n"); Status = ERROR_SUCCESS; } else { -#if 0 - QueryRequest.Version = DNS_QUERY_REQUEST_VERSION1; - QueryRequest.QueryType = wType; - QueryRequest.QueryName = pwsName; - QueryRequest.QueryOptions = Flags; - QueryResults.Version = DNS_QUERY_REQUEST_VERSION1; - - Status = DnsQueryEx(&QueryRequest, &QueryResults, NULL); + DPRINT("DNS query!\n"); + Status = Query_Main(pszName, + wType, + dwFlags, + ppResultRecords); if (Status == ERROR_SUCCESS) { - // FIXME Should store (and flush) entries by server handle - DnsIntCacheAddEntry(QueryResults.pQueryRecords); - *ppResultRecords = QueryResults.pQueryRecords; + DPRINT("DNS query successful!\n"); + DnsIntCacheAddEntry(*ppResultRecords); } -#endif } if (dwRecords) + { *dwRecords = 0; - if (Status == ERROR_SUCCESS) - { - Record = *ppResultRecords; - while (Record) + if (Status == ERROR_SUCCESS) { - if (dwRecords) + Record = *ppResultRecords; + while (Record) + { + DPRINT("Record: %S\n", Record->pName); (*dwRecords)++; - Record = Record->pNext; + Record = Record->pNext; + } } } - DPRINT1("R_ResolverQuery result %ld %ld\n", Status, *dwRecords); + DPRINT("R_ResolverQuery result %ld %ld\n", Status, *dwRecords); return Status; } diff --git a/dll/win32/dnsapi/dnsapi.spec b/dll/win32/dnsapi/dnsapi.spec index bb69e12d333..afc309e83bc 100644 --- a/dll/win32/dnsapi/dnsapi.spec +++ b/dll/win32/dnsapi/dnsapi.spec @@ -82,7 +82,6 @@ @ stdcall DnsNameCompareEx_W() @ stdcall DnsNameCompare_A(str str) @ stdcall DnsNameCompare_W(wstr wstr) - @ stdcall DnsNameCopy() @ stdcall DnsNameCopyAllocate() @ stdcall DnsNotifyResolver() @@ -188,5 +187,5 @@ @ stub NetInfo_IsForUpdate @ stub NetInfo_ResetServerPriorities @ stub QueryDirectEx -@ stub Query_Main +@ stdcall Query_Main(wstr long long ptr) @ stub Reg_ReadGlobalsEx diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/dnsapi/query.c index bc89c8d8ad8..d830e26f4a0 100644 --- a/dll/win32/dnsapi/dnsapi/query.c +++ b/dll/win32/dnsapi/dnsapi/query.c @@ -164,7 +164,7 @@ DnsQuery_CodePage(UINT CodePage, PWCHAR Buffer; DNS_STATUS Status; PDNS_RECORD QueryResultWide; - PDNS_RECORD ConvertedRecord = NULL, LastRecord = NULL; + PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; if (Name == NULL) return ERROR_INVALID_PARAMETER; @@ -309,7 +309,7 @@ DnsQuery_CodePage(UINT CodePage, } if (LastRecord) - LastRecord->pNext = NULL; + LastRecord->pNext = 0; /* The name */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); @@ -729,6 +729,41 @@ DnsQuery_W(LPCWSTR Name, PVOID Extra, PDNS_RECORD *QueryResultSet, PVOID *Reserved) +{ + DWORD dwRecords = 0; + DNS_STATUS Status = ERROR_SUCCESS; + + DPRINT("DnsQuery_W()\n"); + + *QueryResultSet = NULL; + + RpcTryExcept + { + Status = R_ResolverQuery(NULL, + Name, + Type, + Options, + &dwRecords, + (DNS_RECORDW **)QueryResultSet); + DPRINT("R_ResolverQuery() returned %lu\n", Status); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = RpcExceptionCode(); + DPRINT("Exception returned %lu\n", Status); + } + RpcEndExcept; + + return Status; +} + + +DNS_STATUS +WINAPI +Query_Main(LPCWSTR Name, + WORD Type, + DWORD Options, + PDNS_RECORD *QueryResultSet) { adns_state astate; int quflags = (Options & DNS_QUERY_NO_RECURSION) == 0 ? adns_qf_search : 0; @@ -750,10 +785,8 @@ DnsQuery_W(LPCWSTR Name, return ERROR_INVALID_PARAMETER; if (QueryResultSet == NULL) return ERROR_INVALID_PARAMETER; - if ((Options & DNS_QUERY_WIRE_ONLY) != 0 && (Options & DNS_QUERY_NO_WIRE_QUERY) != 0) - return ERROR_INVALID_PARAMETER; - *QueryResultSet = 0; + *QueryResultSet = NULL; switch (Type) { diff --git a/sdk/include/reactos/idl/dnsrslvr.idl b/sdk/include/reactos/idl/dnsrslvr.idl index 787e5c71267..ce0514557a6 100644 --- a/sdk/include/reactos/idl/dnsrslvr.idl +++ b/sdk/include/reactos/idl/dnsrslvr.idl @@ -53,7 +53,7 @@ interface DnsResolver [in] WORD wType, [in] DWORD Flags, [in][out] DWORD *dwRecords, - [out][ref] DNS_RECORDW** ppResultRecords); + [out] DNS_RECORDW **ppResultRecords); /* Function: 0x08 */ /* R_ResolverEnumCache */ diff --git a/sdk/include/reactos/windns_undoc.h b/sdk/include/reactos/windns_undoc.h index cb2e5abdbe4..56cc56d205c 100644 --- a/sdk/include/reactos/windns_undoc.h +++ b/sdk/include/reactos/windns_undoc.h @@ -31,6 +31,14 @@ DNS_STATUS WINAPI GetCurrentTimeInSeconds(VOID); +DNS_STATUS +WINAPI +Query_Main( + LPCWSTR Name, + WORD Type, + DWORD Options, + PDNS_RECORD *QueryResultSet); + #endif /* __WIDL__ */ #ifdef __cplusplus

1 0

[reactos] 01/01: [OLE32_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc6e4ed57615eead1c9dc… commit fc6e4ed57615eead1c9dc6941ca90396749a6b66 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 10 14:11:19 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Nov 10 14:11:19 2019 +0100 [OLE32_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/ole32/clipboard.c | 2 +- modules/rostests/winetests/ole32/compobj.c | 210 +++++++++++++++++-------- modules/rostests/winetests/ole32/marshal.c | 14 +- modules/rostests/winetests/ole32/ole_server.c | 2 +- modules/rostests/winetests/ole32/propvariant.c | 124 ++++++++++++--- 5 files changed, 264 insertions(+), 88 deletions(-) diff --git a/modules/rostests/winetests/ole32/clipboard.c b/modules/rostests/winetests/ole32/clipboard.c index d7f18ef2458..e3e1b27fb5e 100644 --- a/modules/rostests/winetests/ole32/clipboard.c +++ b/modules/rostests/winetests/ole32/clipboard.c @@ -46,7 +46,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) { static char buf[100]; - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", + sprintf(buf, "cf %04x ptd %p aspect %x lindex %d tymed %x", fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); return buf; } diff --git a/modules/rostests/winetests/ole32/compobj.c b/modules/rostests/winetests/ole32/compobj.c index 33a75853653..49faabdece3 100644 --- a/modules/rostests/winetests/ole32/compobj.c +++ b/modules/rostests/winetests/ole32/compobj.c @@ -39,7 +39,7 @@ #include "initguid.h" #define DEFINE_EXPECT(func) \ - static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + static BOOL expect_ ## func = FALSE; static unsigned int called_ ## func = 0 #define SET_EXPECT(func) \ expect_ ## func = TRUE @@ -47,7 +47,7 @@ #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + called_ ## func++; \ }while(0) #define CHECK_EXPECT(func) \ @@ -56,13 +56,18 @@ expect_ ## func = FALSE; \ }while(0) -#define CHECK_CALLED(func) \ +#define CHECK_CALLED(func, n) \ do { \ - ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ + ok(called_ ## func == n, "expected " #func " called %u times, got %u\n", n, called_ ## func); \ + expect_ ## func = FALSE; \ + called_ ## func = 0; \ }while(0) DEFINE_EXPECT(CreateStub); +DEFINE_EXPECT(PreInitialize); +DEFINE_EXPECT(PostInitialize); +DEFINE_EXPECT(PreUninitialize); +DEFINE_EXPECT(PostUninitialize); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -788,7 +793,7 @@ static HRESULT WINAPI MessageFilter_QueryInterface(IMessageFilter *iface, REFIID if (ppvObj == NULL) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) + IsEqualGUID(riid, &IID_IMessageFilter)) { *ppvObj = iface; IMessageFilter_AddRef(iface); @@ -1031,7 +1036,7 @@ static HRESULT WINAPI PSFactoryBuffer_CreateStub( { CHECK_EXPECT(CreateStub); - ok(pUnkServer == (IUnknown*)&Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); + ok(pUnkServer == &Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); if(!ps_factory_buffer) return E_NOTIMPL; @@ -1120,7 +1125,7 @@ static void test_CoRegisterPSClsid(void) SET_EXPECT(CreateStub); hr = CoMarshalInterface(stream, &IID_IWineTest, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == E_NOTIMPL, "CoMarshalInterface should have returned E_NOTIMPL instead of 0x%08x\n", hr); - CHECK_CALLED(CreateStub); + CHECK_CALLED(CreateStub, 1); hr = CoGetPSClsid(&IID_IEnumOLEVERB, &clsid); ok_ole_success(hr, "CoGetPSClsid"); @@ -1134,7 +1139,7 @@ static void test_CoRegisterPSClsid(void) SET_EXPECT(CreateStub); hr = CoMarshalInterface(stream, &IID_IEnumOLEVERB, (IUnknown*)&EnumOLEVERB, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); - CHECK_CALLED(CreateStub); + CHECK_CALLED(CreateStub, 1); hr = CoMarshalInterface(stream, &IID_IEnumOLEVERB, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -3306,27 +3311,47 @@ static ULONG WINAPI testinitialize_Release(IInitializeSpy *iface) return 1; } +static DWORD expected_coinit_flags; +static ULARGE_INTEGER init_cookies[3]; +static BOOL revoke_spies_on_uninit; + static HRESULT WINAPI testinitialize_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(PreInitialize); + ok(coinit == expected_coinit_flags, "Unexpected init flags %#x, expected %#x.\n", coinit, expected_coinit_flags); + return S_OK; } static HRESULT WINAPI testinitialize_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(PostInitialize); + ok(coinit == expected_coinit_flags, "Unexpected init flags %#x, expected %#x.\n", coinit, expected_coinit_flags); + return hr; } static HRESULT WINAPI testinitialize_PreUninitialize(IInitializeSpy *iface, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + HRESULT hr; + CHECK_EXPECT2(PreUninitialize); + if (revoke_spies_on_uninit) + { + hr = CoRevokeInitializeSpy(init_cookies[0]); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(init_cookies[1]); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(init_cookies[2]); + ok(hr == S_OK, "got 0x%08x\n", hr); + + revoke_spies_on_uninit = FALSE; + } + return S_OK; } static HRESULT WINAPI testinitialize_PostUninitialize(IInitializeSpy *iface, DWORD aptrefs) { - ok(0, "unexpected call\n"); + CHECK_EXPECT2(PostUninitialize); return E_NOTIMPL; } @@ -3343,76 +3368,134 @@ static const IInitializeSpyVtbl testinitializevtbl = static IInitializeSpy testinitialize = { &testinitializevtbl }; -static void test_IInitializeSpy(void) +static DWORD WINAPI test_init_spies_proc(void *arg) +{ + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + + hr = CoRevokeInitializeSpy(init_cookies[2]); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + CoUninitialize(); + return 0; +} + +static void test_IInitializeSpy(BOOL mt) { - ULARGE_INTEGER cookie, cookie1, cookie2; HRESULT hr; + if (mt) + { + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "CoInitializeEx failed: %#x\n", hr); + } + hr = CoRegisterInitializeSpy(NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - cookie.QuadPart = 1; - hr = CoRegisterInitializeSpy(NULL, &cookie); + init_cookies[0].QuadPart = 1; + hr = CoRegisterInitializeSpy(NULL, &init_cookies[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - ok(cookie.QuadPart == 1, "got wrong cookie\n"); + ok(init_cookies[0].QuadPart == 1, "got wrong cookie\n"); hr = CoRegisterInitializeSpy(&testinitialize, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - cookie.HighPart = 0; - cookie.LowPart = 1; - hr = CoRegisterInitializeSpy(&testinitialize, &cookie); + init_cookies[0].HighPart = 0; + init_cookies[0].LowPart = 1; + hr = CoRegisterInitializeSpy(&testinitialize, &init_cookies[0]); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { - ok(cookie.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie.HighPart, + ok(init_cookies[0].HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", init_cookies[0].HighPart, GetCurrentThreadId()); - ok(cookie.LowPart == 0, "got wrong low part 0x%x\n", cookie.LowPart); -} + if (!mt) ok(init_cookies[0].LowPart == 0, "got wrong low part 0x%x\n", init_cookies[0].LowPart); + /* register same instance one more time */ - cookie1.HighPart = 0; - cookie1.LowPart = 0; - hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); -todo_wine { + init_cookies[1].HighPart = 0; + init_cookies[1].LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &init_cookies[1]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + ok(init_cookies[1].HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", init_cookies[1].HighPart, GetCurrentThreadId()); - ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); -} - cookie2.HighPart = 0; - cookie2.LowPart = 0; - hr = CoRegisterInitializeSpy(&testinitialize, &cookie2); -todo_wine { + if (!mt) ok(init_cookies[1].LowPart == 1, "got wrong low part 0x%x\n", init_cookies[1].LowPart); + + init_cookies[2].HighPart = 0; + init_cookies[2].LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &init_cookies[2]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie2.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie2.HighPart, + ok(init_cookies[2].HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", init_cookies[2].HighPart, GetCurrentThreadId()); - ok(cookie2.LowPart == 2, "got wrong low part 0x%x\n", cookie2.LowPart); -} - hr = CoRevokeInitializeSpy(cookie1); -todo_wine + if (!mt) ok(init_cookies[2].LowPart == 2, "got wrong low part 0x%x\n", init_cookies[2].LowPart); + + hr = CoRevokeInitializeSpy(init_cookies[1]); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = CoRevokeInitializeSpy(cookie1); + hr = CoRevokeInitializeSpy(init_cookies[1]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - cookie1.HighPart = 0; - cookie1.LowPart = 0; - hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); -todo_wine { + init_cookies[1].HighPart = 0; + init_cookies[1].LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &init_cookies[1]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + ok(init_cookies[1].HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", init_cookies[1].HighPart, GetCurrentThreadId()); - ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); -} - hr = CoRevokeInitializeSpy(cookie); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (!mt) ok(init_cookies[1].LowPart == 1, "got wrong low part 0x%x\n", init_cookies[1].LowPart); - hr = CoRevokeInitializeSpy(cookie1); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); + SET_EXPECT(PreInitialize); + SET_EXPECT(PostInitialize); + hr = CoInitializeEx(NULL, expected_coinit_flags = ((mt ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED) | COINIT_DISABLE_OLE1DDE)); + ok(hr == (mt ? S_FALSE : S_OK), "Failed to initialize COM, hr %#x.\n", hr); + CHECK_CALLED(PreInitialize, 3); + CHECK_CALLED(PostInitialize, 3); - hr = CoRevokeInitializeSpy(cookie2); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); + if (mt) + { + HANDLE thread; + thread = CreateThread(NULL, 0, test_init_spies_proc, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed: %u\n", GetLastError()); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + } + + SET_EXPECT(PreInitialize); + SET_EXPECT(PostInitialize); + hr = CoInitializeEx(NULL, expected_coinit_flags = ((mt ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED) | COINIT_DISABLE_OLE1DDE)); + ok(hr == S_FALSE, "Failed to initialize COM, hr %#x.\n", hr); + CHECK_CALLED(PreInitialize, 3); + CHECK_CALLED(PostInitialize, 3); + + SET_EXPECT(PreUninitialize); + SET_EXPECT(PostUninitialize); + CoUninitialize(); + CHECK_CALLED(PreUninitialize, 3); + CHECK_CALLED(PostUninitialize, 3); + + SET_EXPECT(PreUninitialize); + SET_EXPECT(PostUninitialize); + CoUninitialize(); + CHECK_CALLED(PreUninitialize, 3); + CHECK_CALLED(PostUninitialize, 3); + + if (mt) + { + SET_EXPECT(PreUninitialize); + SET_EXPECT(PostUninitialize); + CoUninitialize(); + CHECK_CALLED(PreUninitialize, 3); + CHECK_CALLED(PostUninitialize, 3); + } + + SET_EXPECT(PreInitialize); + SET_EXPECT(PostInitialize); + hr = CoInitializeEx(NULL, expected_coinit_flags = ((mt ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED) | COINIT_DISABLE_OLE1DDE)); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + CHECK_CALLED(PreInitialize, 3); + CHECK_CALLED(PostInitialize, 3); + + SET_EXPECT(PreUninitialize); + revoke_spies_on_uninit = TRUE; + CoUninitialize(); + CHECK_CALLED(PreUninitialize, 1); } static HRESULT g_persistfile_qi_ret; @@ -3755,10 +3838,10 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoRegisterMessageFilter(NULL, NULL); ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); - hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + hr = CoLockObjectExternal(&Test_Unknown, TRUE, TRUE); ok_ole_success(hr, "CoLockObjectExternal"); - hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + hr = CoDisconnectObject(&Test_Unknown, 0); ok_ole_success(hr, "CoDisconnectObject"); return 0; @@ -3824,7 +3907,8 @@ START_TEST(compobj) test_CoGetApartmentType(); test_IMallocSpy(); test_CoGetCurrentLogicalThreadId(); - test_IInitializeSpy(); + test_IInitializeSpy(FALSE); + test_IInitializeSpy(TRUE); test_CoGetInstanceFromFile(); test_GlobalOptions(); test_implicit_mta(); diff --git a/modules/rostests/winetests/ole32/marshal.c b/modules/rostests/winetests/ole32/marshal.c index 22a67960120..881eddde70c 100644 --- a/modules/rostests/winetests/ole32/marshal.c +++ b/modules/rostests/winetests/ole32/marshal.c @@ -329,7 +329,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - return IUnknown_QueryInterface((IUnknown*)&Test_Unknown, riid, ppvObj); + return IUnknown_QueryInterface(&Test_Unknown, riid, ppvObj); } static HRESULT WINAPI Test_IClassFactory_LockServer( @@ -1205,7 +1205,9 @@ static void test_marshal_proxy_apartment_shutdown(void) { HRESULT hr; IStream *pStream = NULL; - IUnknown *pProxy = NULL; + IClassFactory *proxy; + IUnknown *unk; + ULONG ref; DWORD tid; HANDLE thread; @@ -1220,7 +1222,7 @@ static void test_marshal_proxy_apartment_shutdown(void) ok_non_zero_external_conn(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&proxy); ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); @@ -1233,7 +1235,11 @@ static void test_marshal_proxy_apartment_shutdown(void) ok_zero_external_conn(); ok_last_release_closes(TRUE); - IUnknown_Release(pProxy); + hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&unk); + ok(hr == CO_E_OBJNOTCONNECTED, "got %#x\n", hr); + + ref = IClassFactory_Release(proxy); + ok(!ref, "got %d refs\n", ref); ok_no_locks(); diff --git a/modules/rostests/winetests/ole32/ole_server.c b/modules/rostests/winetests/ole32/ole_server.c index 2f5a3ca5ea7..83f7c660dbb 100644 --- a/modules/rostests/winetests/ole32/ole_server.c +++ b/modules/rostests/winetests/ole32/ole_server.c @@ -244,7 +244,7 @@ static void ole_server(void) if (hr == S_OK) { trace("server: registering class object\n"); - hr = CoRegisterClassObject(&CLSID_WineTestObject, (IUnknown *)&factory, + hr = CoRegisterClassObject(&CLSID_WineTestObject, (IUnknown *)&factory.IClassFactory_iface, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &key); if (hr == S_OK) { diff --git a/modules/rostests/winetests/ole32/propvariant.c b/modules/rostests/winetests/ole32/propvariant.c index 97c4eec4cac..b1ec76dfc91 100644 --- a/modules/rostests/winetests/ole32/propvariant.c +++ b/modules/rostests/winetests/ole32/propvariant.c @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#ifdef __REACTOS__ +#define CONST_VTABLE +#endif + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -44,28 +49,28 @@ static const struct valid_mapping { { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_EMPTY */ { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_NULL */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ + { PROP_V1 | PROP_TODO , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ + { PROP_V1 , PROP_V1, PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ + { PROP_V1 , PROP_V1 , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */ @@ -298,12 +303,60 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + LONG saindex; HRESULT hr; propvarSrc.vt = VT_BSTR; @@ -334,6 +387,39 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); + + sabound.lLbound = 0; + sabound.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sabound); + saindex = 0; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + saindex = 1; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + propvarSrc.vt = VT_ARRAY | VT_UNKNOWN; + U(propvarSrc).parray = sa; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 5, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarSrc); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable {

1 0

[reactos] 01/01: [OLE32] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f5d91b750c854d34f69a… commit 0f5d91b750c854d34f69af03faab0209fcb152ee Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 10 14:10:55 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Nov 10 14:10:55 2019 +0100 [OLE32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/ole32/bindctx.c | 2 +- dll/win32/ole32/classmoniker.c | 5 +- dll/win32/ole32/clipboard.c | 4 +- dll/win32/ole32/comcat.c | 9 +- dll/win32/ole32/compobj.c | 209 ++++++++++++++++++++++++++++--------- dll/win32/ole32/compobj_private.h | 18 +++- dll/win32/ole32/compositemoniker.c | 19 ++-- dll/win32/ole32/datacache.c | 3 +- dll/win32/ole32/defaulthandler.c | 5 +- dll/win32/ole32/errorinfo.c | 3 +- dll/win32/ole32/filelockbytes.c | 5 +- dll/win32/ole32/filemoniker.c | 49 +++++---- dll/win32/ole32/ftmarshal.c | 2 - dll/win32/ole32/hglobalstream.c | 2 - dll/win32/ole32/ifs.c | 2 - dll/win32/ole32/itemmoniker.c | 9 +- dll/win32/ole32/marshal.c | 1 - dll/win32/ole32/memlockbytes.c | 2 - dll/win32/ole32/moniker.c | 12 +-- dll/win32/ole32/ole2.c | 47 ++++++--- dll/win32/ole32/ole2stubs.c | 2 - dll/win32/ole32/ole32.spec | 4 +- dll/win32/ole32/ole32_main.c | 3 - dll/win32/ole32/oleobj.c | 7 +- dll/win32/ole32/oleproxy.c | 2 - dll/win32/ole32/precomp.h | 3 - dll/win32/ole32/rpc.c | 8 +- dll/win32/ole32/stg_prop.c | 15 +-- dll/win32/ole32/storage32.c | 17 ++- dll/win32/ole32/usrmarshal.c | 11 +- media/doc/README.WINE | 2 +- 31 files changed, 295 insertions(+), 187 deletions(-) diff --git a/dll/win32/ole32/bindctx.c b/dll/win32/ole32/bindctx.c index 8be88a64c0d..1951100b0bb 100644 --- a/dll/win32/ole32/bindctx.c +++ b/dll/win32/ole32/bindctx.c @@ -446,7 +446,7 @@ static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl* This, if ( ( (This->bindCtxTable[i].pkeyObj==NULL) && (pszkey==NULL) ) || ( (This->bindCtxTable[i].pkeyObj!=NULL) && (pszkey!=NULL) && - (lstrcmpW(This->bindCtxTable[i].pkeyObj,pszkey)==0) + (wcscmp(This->bindCtxTable[i].pkeyObj,pszkey)==0) ) ) diff --git a/dll/win32/ole32/classmoniker.c b/dll/win32/ole32/classmoniker.c index 30a24d23e5e..3837a1f74c1 100644 --- a/dll/win32/ole32/classmoniker.c +++ b/dll/win32/ole32/classmoniker.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "wine/debug.h" #include "ole2.h" -#include "wine/unicode.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -402,7 +401,7 @@ static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker* iface,IMoniker* pmkOtherMon if(SUCCEEDED ((res = CreateBindCtx(0,&bind)))) { if(SUCCEEDED (IMoniker_GetDisplayName(iface,bind,NULL,&dispName1))) { if(SUCCEEDED (IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2))) { - if(lstrcmpW(dispName1,dispName2)==0) res = S_OK; + if(wcscmp(dispName1,dispName2)==0) res = S_OK; CoTaskMemFree(dispName2); } CoTaskMemFree(dispName1); @@ -727,7 +726,7 @@ HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LP IMoniker **ppmk) { HRESULT hr; - LPCWSTR s = strchrW(szDisplayName, ':'); + LPCWSTR s = wcschr(szDisplayName, ':'); LPCWSTR end; CLSID clsid; BYTE table[256]; diff --git a/dll/win32/ole32/clipboard.c b/dll/win32/ole32/clipboard.c index f3e9a6bc56a..a43f104ba80 100644 --- a/dll/win32/ole32/clipboard.c +++ b/dll/win32/ole32/clipboard.c @@ -1363,7 +1363,7 @@ static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const D str1 = (const WCHAR*)((const char*)t1 + off1); str2 = (const WCHAR*)((const char*)t2 + off2); - return !lstrcmpW(str1, str2); + return !wcscmp(str1, str2); } static inline BOOL td_equal(const DVTARGETDEVICE *t1, const DVTARGETDEVICE *t2) @@ -1602,7 +1602,7 @@ end: */ static HRESULT WINAPI snapshot_QueryGetData(IDataObject *iface, FORMATETC *fmt) { - FIXME("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); + TRACE("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); if (!fmt) return E_INVALIDARG; diff --git a/dll/win32/ole32/comcat.c b/dll/win32/ole32/comcat.c index d43c3afc0d4..467724c5ba3 100644 --- a/dll/win32/ole32/comcat.c +++ b/dll/win32/ole32/comcat.c @@ -33,7 +33,6 @@ #include "comcat.h" #include "compobj_private.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -267,7 +266,7 @@ static HRESULT COMCAT_IsClassOfCategories( if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; if (size != CHARS_IN_GUID-1) continue; /* bogus catid in registry */ for (string = req_strings; *string; string += CHARS_IN_GUID) - if (!strcmpiW(string, keyname)) break; + if (!wcsicmp(string, keyname)) break; if (!*string) { RegCloseKey(subkey); return S_FALSE; @@ -1279,9 +1278,9 @@ static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGU This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; This->ref = 1; - strcpyW(keyname, prefixW); - strcatW(keyname, clsidW); - strcatW(keyname, postfix); + lstrcpyW(keyname, prefixW); + lstrcatW(keyname, clsidW); + lstrcatW(keyname, postfix); open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); diff --git a/dll/win32/ole32/compobj.c b/dll/win32/ole32/compobj.c index eae39335fbb..e0c1b0b745f 100644 --- a/dll/win32/ole32/compobj.c +++ b/dll/win32/ole32/compobj.c @@ -36,8 +36,6 @@ * */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -67,7 +65,6 @@ #include "compobj_private.h" #include "moniker.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -496,7 +493,7 @@ static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name) EnterCriticalSection(&csOpenDllList); LIST_FOR_EACH_ENTRY(ptr, &openDllList, OpenDll, entry) { - if (!strcmpiW(library_name, ptr->library_name) && + if (!wcsicmp(library_name, ptr->library_name) && (InterlockedIncrement(&ptr->refs) != 1) /* entry is being destroy if == 1 */) { ret = ptr; @@ -554,7 +551,7 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) } else { - len = strlenW(library_name); + len = lstrlenW(library_name); entry = HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll)); if (entry) entry->library_name = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); @@ -1349,7 +1346,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, BOOL found = FALSE; struct apartment_loaded_dll *apartment_loaded_dll; - if (!strcmpiW(dllpath, wszOle32)) + if (!wcsicmp(dllpath, wszOle32)) { /* we don't need to control the lifetime of this dll, so use the local * implementation of DllGetClassObject directly */ @@ -1365,7 +1362,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, EnterCriticalSection(&apt->cs); LIST_FOR_EACH_ENTRY(apartment_loaded_dll, &apt->loaded_dlls, struct apartment_loaded_dll, entry) - if (!strcmpiW(dllpath, apartment_loaded_dll->dll->library_name)) + if (!wcsicmp(dllpath, apartment_loaded_dll->dll->library_name)) { TRACE("found %s already loaded\n", debugstr_w(dllpath)); found = TRUE; @@ -1428,9 +1425,9 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA; } else { const WCHAR *quote_start; - quote_start = strchrW(src, '\"'); + quote_start = wcschr(src, '\"'); if (quote_start) { - const WCHAR *quote_end = strchrW(quote_start + 1, '\"'); + const WCHAR *quote_end = wcschr(quote_start + 1, '\"'); if (quote_end) { memmove(src, quote_start + 1, (quote_end - quote_start - 1) * sizeof(WCHAR)); @@ -1744,11 +1741,21 @@ static void COM_TlsDestroy(void) struct oletls *info = NtCurrentTeb()->ReservedForOle; if (info) { + struct init_spy *cursor, *cursor2; + if (info->apt) apartment_release(info->apt); if (info->errorinfo) IErrorInfo_Release(info->errorinfo); if (info->state) IUnknown_Release(info->state); - if (info->spy) IInitializeSpy_Release(info->spy); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &info->spies, struct init_spy, entry) + { + list_remove(&cursor->entry); + if (cursor->spy) IInitializeSpy_Release(cursor->spy); + heap_free(cursor); + } + if (info->context_token) IObjContext_Release(info->context_token); + HeapFree(GetProcessHeap(), 0, info); NtCurrentTeb()->ReservedForOle = NULL; } @@ -1770,6 +1777,42 @@ DWORD WINAPI CoBuildVersion(void) return (rmm<<16)+rup; } +static struct init_spy *get_spy_entry(struct oletls *info, unsigned int id) +{ + struct init_spy *spy; + + LIST_FOR_EACH_ENTRY(spy, &info->spies, struct init_spy, entry) + { + if (id == spy->id && spy->spy) + return spy; + } + + return NULL; +} + +/* + * When locked, don't modify list (unless we add a new head), so that it's + * safe to iterate it. Freeing of list entries is delayed and done on unlock. + */ +static inline void lock_init_spies(struct oletls *info) +{ + info->spies_lock++; +} + +static void unlock_init_spies(struct oletls *info) +{ + struct init_spy *spy, *next; + + if (--info->spies_lock) return; + + LIST_FOR_EACH_ENTRY_SAFE(spy, next, &info->spies, struct init_spy, entry) + { + if (spy->spy) continue; + list_remove(&spy->entry); + heap_free(spy); + } +} + /****************************************************************************** * CoRegisterInitializeSpy [OLE32.@] * @@ -1789,6 +1832,8 @@ DWORD WINAPI CoBuildVersion(void) HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cookie) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *entry; + unsigned int id; HRESULT hr; TRACE("(%p, %p)\n", spy, cookie); @@ -1800,19 +1845,32 @@ HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cook return E_INVALIDARG; } - if (info->spy) + hr = IInitializeSpy_QueryInterface(spy, &IID_IInitializeSpy, (void **)&spy); + if (FAILED(hr)) + return hr; + + entry = heap_alloc(sizeof(*entry)); + if (!entry) { - FIXME("Already registered?\n"); - return E_UNEXPECTED; + IInitializeSpy_Release(spy); + return E_OUTOFMEMORY; } - hr = IInitializeSpy_QueryInterface(spy, &IID_IInitializeSpy, (void **) &info->spy); - if (SUCCEEDED(hr)) + entry->spy = spy; + + id = 0; + while (get_spy_entry(info, id) != NULL) { - cookie->QuadPart = (DWORD_PTR)spy; - return S_OK; + id++; } - return hr; + + entry->id = id; + list_add_head(&info->spies, &entry->entry); + + cookie->s.HighPart = GetCurrentThreadId(); + cookie->s.LowPart = entry->id; + + return S_OK; } /****************************************************************************** @@ -1833,13 +1891,22 @@ HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cook HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *spy; + TRACE("(%s)\n", wine_dbgstr_longlong(cookie.QuadPart)); - if (!info || !info->spy || cookie.QuadPart != (DWORD_PTR)info->spy) + if (!info || cookie.s.HighPart != GetCurrentThreadId()) return E_INVALIDARG; - IInitializeSpy_Release(info->spy); - info->spy = NULL; + if (!(spy = get_spy_entry(info, cookie.s.LowPart))) return E_INVALIDARG; + + IInitializeSpy_Release(spy->spy); + spy->spy = NULL; + if (!info->spies_lock) + { + list_remove(&spy->entry); + heap_free(spy); + } return S_OK; } @@ -1935,6 +2002,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *cursor; HRESULT hr; TRACE("(%p, %x)\n", lpReserved, (int)dwCoInit); @@ -1961,13 +2029,21 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni RunningObjectTableImpl_Initialize(); } - if (info->spy) - IInitializeSpy_PreInitialize(info->spy, dwCoInit, info->inits); + lock_init_spies(info); + LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) + { + if (cursor->spy) IInitializeSpy_PreInitialize(cursor->spy, dwCoInit, info->inits); + } + unlock_init_spies(info); hr = enter_apartment( info, dwCoInit ); - if (info->spy) - IInitializeSpy_PostInitialize(info->spy, hr, dwCoInit, info->inits); + lock_init_spies(info); + LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) + { + if (cursor->spy) hr = IInitializeSpy_PostInitialize(cursor->spy, hr, dwCoInit, info->inits); + } + unlock_init_spies(info); return hr; } @@ -1991,6 +2067,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); + struct init_spy *cursor, *next; LONG lCOMRefCnt; TRACE("()\n"); @@ -1998,17 +2075,26 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) /* will only happen on OOM */ if (!info) return; - if (info->spy) - IInitializeSpy_PreUninitialize(info->spy, info->inits); + lock_init_spies(info); + LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &info->spies, struct init_spy, entry) + { + if (cursor->spy) IInitializeSpy_PreUninitialize(cursor->spy, info->inits); + } + unlock_init_spies(info); /* sanity check */ if (!info->inits) { - ERR("Mismatched CoUninitialize\n"); + ERR("Mismatched CoUninitialize\n"); + + lock_init_spies(info); + LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &info->spies, struct init_spy, entry) + { + if (cursor->spy) IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + } + unlock_init_spies(info); - if (info->spy) - IInitializeSpy_PostUninitialize(info->spy, info->inits); - return; + return; } leave_apartment( info ); @@ -2030,8 +2116,13 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) ERR( "CoUninitialize() - not CoInitialized.\n" ); InterlockedExchangeAdd(&s_COMLockCount,1); /* restore the lock count. */ } - if (info->spy) - IInitializeSpy_PostUninitialize(info->spy, info->inits); + + lock_init_spies(info); + LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) + { + if (cursor->spy) IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + } + unlock_init_spies(info); } /****************************************************************************** @@ -2205,10 +2296,10 @@ static HRESULT clsid_from_string_reg(LPCOLESTR progid, CLSID *clsid) WCHAR *buf; memset(clsid, 0, sizeof(*clsid)); - buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); + buf = HeapAlloc( GetProcessHeap(),0,(lstrlenW(progid)+8) * sizeof(WCHAR) ); if (!buf) return E_OUTOFMEMORY; - strcpyW( buf, progid ); - strcatW( buf, clsidW ); + lstrcpyW( buf, progid ); + lstrcatW( buf, clsidW ); if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) { HeapFree(GetProcessHeap(),0,buf); @@ -2291,7 +2382,7 @@ HRESULT WINAPI IIDFromString(LPCOLESTR s, IID *iid) } /* length mismatch is a special case */ - if (strlenW(s) + 1 != CHARS_IN_GUID) + if (lstrlenW(s) + 1 != CHARS_IN_GUID) return E_INVALIDARG; if (s[0] != '{') @@ -2347,7 +2438,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', '%','0','2','X','%','0','2','X','}',0 }; if (!id || cmax < CHARS_IN_GUID) return 0; - sprintfW( str, formatW, id->Data1, id->Data2, id->Data3, + swprintf( str, formatW, id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); return CHARS_IN_GUID; @@ -2361,8 +2452,8 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY LONG res; HKEY key; - strcpyW(path, wszCLSIDSlash); - StringFromGUID2(clsid, path + strlenW(wszCLSIDSlash), CHARS_IN_GUID); + lstrcpyW(path, wszCLSIDSlash); + StringFromGUID2(clsid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key); if (res == ERROR_FILE_NOT_FOUND) return REGDB_E_CLASSNOTREG; @@ -2411,8 +2502,8 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey else if (res != ERROR_SUCCESS || type!=REG_SZ) return REGDB_E_READREGDB; - strcpyW(keyname, szAppIdKey); - strcatW(keyname, buf); + lstrcpyW(keyname, szAppIdKey); + lstrcatW(keyname, buf); res = open_classes_key(HKEY_CLASSES_ROOT, keyname, access, subkey); if (res == ERROR_FILE_NOT_FOUND) return REGDB_E_KEYMISSING; @@ -2642,9 +2733,9 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) } /* Interface\\{string form of riid}\\ProxyStubClsid32 */ - strcpyW(path, wszInterface); + lstrcpyW(path, wszInterface); StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); - strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); + lstrcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); hr = get_ps_clsid_from_registry(path, 0, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || @@ -2911,7 +3002,7 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; static const WCHAR wszFree[] = {'F','r','e','e',0}; static const WCHAR wszBoth[] = {'B','o','t','h',0}; - WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; + WCHAR threading_model[10 /* lstrlenW(L"apartment")+1 */]; DWORD dwLength = sizeof(threading_model); DWORD keytype; DWORD ret; @@ -2920,9 +3011,9 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d if ((ret != ERROR_SUCCESS) || (keytype != REG_SZ)) threading_model[0] = '\0'; - if (!strcmpiW(threading_model, wszApartment)) return ThreadingModel_Apartment; - if (!strcmpiW(threading_model, wszFree)) return ThreadingModel_Free; - if (!strcmpiW(threading_model, wszBoth)) return ThreadingModel_Both; + if (!wcsicmp(threading_model, wszApartment)) return ThreadingModel_Apartment; + if (!wcsicmp(threading_model, wszFree)) return ThreadingModel_Free; + if (!wcsicmp(threading_model, wszBoth)) return ThreadingModel_Both; /* there's not specific handling for this case */ if (threading_model[0]) return ThreadingModel_Neutral; @@ -5091,7 +5182,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) if (get_object_dll_path(&regdata, dllpath, ARRAY_SIZE(dllpath))) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; - if (!strcmpiW(dllpath, wszOle32)) + if (!wcsicmp(dllpath, wszOle32)) { RegCloseKey(hkey); return HandlerCF_Create(rclsid, riid, ppv); @@ -5142,6 +5233,26 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoDisableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoDisableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoEnableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoEnableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + /*********************************************************************** * CoRegisterSurrogate [OLE32.@] */ diff --git a/dll/win32/ole32/compobj_private.h b/dll/win32/ole32/compobj_private.h index 1e564a3de11..bda1c6bff2a 100644 --- a/dll/win32/ole32/compobj_private.h +++ b/dll/win32/ole32/compobj_private.h @@ -153,6 +153,13 @@ struct apartment BOOL main; /* is this a main-threaded-apartment? (RO) */ }; +struct init_spy +{ + struct list entry; + IInitializeSpy *spy; + unsigned int id; +}; + /* this is what is stored in TEB->ReservedForOle */ struct oletls { @@ -160,7 +167,7 @@ struct oletls IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ DWORD apt_mask; /* apartment mask (+0Ch on x86) */ - IInitializeSpy *spy; /* The "SPY" from CoInitializeSpy */ + void *unknown0; DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ @@ -171,6 +178,8 @@ struct oletls IUnknown *call_state; /* current call context (+3Ch on x86) */ DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + struct list spies; /* Spies installed with CoRegisterInitializeSpy */ + DWORD spies_lock; }; @@ -262,7 +271,12 @@ APARTMENT *apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); + { + struct oletls *oletls = heap_alloc_zero(sizeof(*oletls)); + if (oletls) + list_init(&oletls->spies); + NtCurrentTeb()->ReservedForOle = oletls; + } return NtCurrentTeb()->ReservedForOle; } diff --git a/dll/win32/ole32/compositemoniker.c b/dll/win32/ole32/compositemoniker.c index 75d97fa7e30..5f5c8c7deb1 100644 --- a/dll/win32/ole32/compositemoniker.c +++ b/dll/win32/ole32/compositemoniker.c @@ -29,7 +29,6 @@ #include "winuser.h" #include "winerror.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "ole2.h" #include "moniker.h" @@ -433,6 +432,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { + HRESULT res; IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; IEnumMoniker *enumMoniker; @@ -453,7 +453,11 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + res = IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); + + return res; } else if (*ppmkToLeft==NULL) @@ -473,13 +477,16 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ /* of the reduced components */ if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && - IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) - ) + IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ){ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); - + } else{ /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); IMoniker_AddRef(iface); @@ -1133,7 +1140,7 @@ CompositeMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, if (*ppszDisplayName==NULL) return E_OUTOFMEMORY; - strcatW(*ppszDisplayName,tempStr); + lstrcatW(*ppszDisplayName,tempStr); CoTaskMemFree(tempStr); IMoniker_Release(tempMk); diff --git a/dll/win32/ole32/datacache.c b/dll/win32/ole32/datacache.c index 3eff56908d5..4e4f264860a 100644 --- a/dll/win32/ole32/datacache.c +++ b/dll/win32/ole32/datacache.c @@ -57,7 +57,6 @@ #include "winerror.h" #include "ole2.h" #include "compobj_private.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" @@ -1003,7 +1002,7 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + for (check = (WORD *)&meta_place_rec; check != &meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); if (hr == S_OK && data_size) diff --git a/dll/win32/ole32/defaulthandler.c b/dll/win32/ole32/defaulthandler.c index e6c52cd0933..c1045c15466 100644 --- a/dll/win32/ole32/defaulthandler.c +++ b/dll/win32/ole32/defaulthandler.c @@ -60,7 +60,6 @@ #include "compobj_private.h" #include "storage32.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -449,14 +448,14 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( { if ((This->containerApp = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(szContainerApp) + 1) * sizeof(WCHAR) ))) - strcpyW( This->containerApp, szContainerApp ); + lstrcpyW( This->containerApp, szContainerApp ); } if (szContainerObj) { if ((This->containerObj = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(szContainerObj) + 1) * sizeof(WCHAR) ))) - strcpyW( This->containerObj, szContainerObj ); + lstrcpyW( This->containerObj, szContainerObj ); } return S_OK; } diff --git a/dll/win32/ole32/errorinfo.c b/dll/win32/ole32/errorinfo.c index d5ec17207af..6aa3a336b8d 100644 --- a/dll/win32/ole32/errorinfo.c +++ b/dll/win32/ole32/errorinfo.c @@ -34,7 +34,6 @@ #include "oleauto.h" #include "winerror.h" -#include "wine/unicode.h" #include "compobj_private.h" #include "wine/debug.h" @@ -48,7 +47,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) if(str) { size_t size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); diff --git a/dll/win32/ole32/filelockbytes.c b/dll/win32/ole32/filelockbytes.c index c5cb45f77fc..e9699c01650 100644 --- a/dll/win32/ole32/filelockbytes.c +++ b/dll/win32/ole32/filelockbytes.c @@ -41,7 +41,6 @@ #include "storage32.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); @@ -117,7 +116,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - strcpyW(This->pwcsName, fullpath); + lstrcpyW(This->pwcsName, fullpath); } else This->pwcsName = NULL; @@ -376,7 +375,7 @@ static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface, pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->pwcsName)+1)*sizeof(WCHAR)); - strcpyW(pstatstg->pwcsName, This->pwcsName); + lstrcpyW(pstatstg->pwcsName, This->pwcsName); } else pstatstg->pwcsName = NULL; diff --git a/dll/win32/ole32/filemoniker.c b/dll/win32/ole32/filemoniker.c index 271e5bb8a8b..1e945f9a5f5 100644 --- a/dll/win32/ole32/filemoniker.c +++ b/dll/win32/ole32/filemoniker.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "objbase.h" #include "moniker.h" @@ -693,14 +692,14 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, lastIdx1=FileMonikerImpl_DecomposePath(str1,&strDec1)-1; lastIdx2=FileMonikerImpl_DecomposePath(str2,&strDec2)-1; - if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && lstrcmpW(strDec1[0],twoPoint)==0)) + if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && wcscmp(strDec1[0],twoPoint)==0)) res = MK_E_SYNTAX; else{ - if(lstrcmpW(strDec1[lastIdx1],bkSlash)==0) + if(wcscmp(strDec1[lastIdx1],bkSlash)==0) lastIdx1--; /* for each "..\" in the left of str2 remove the right element from str1 */ - for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (lstrcmpW(strDec2[i],twoPoint)==0) ); i+=2){ + for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (wcscmp(strDec2[i],twoPoint)==0) ); i+=2){ lastIdx1-=2; } @@ -711,13 +710,13 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, if (newStr){ /* new path is the concatenation of the rest of str1 and str2 */ for(*newStr=0,j=0;j<=lastIdx1;j++) - strcatW(newStr,strDec1[j]); + lstrcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) - strcatW(newStr,bkSlash); + if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || wcscmp(strDec2[i],bkSlash)!=0) + lstrcatW(newStr,bkSlash); for(j=i;j<=lastIdx2;j++) - strcatW(newStr,strDec2[j]); + lstrcatW(newStr,strDec2[j]); /* create a new moniker with the new string */ res=CreateFileMoniker(newStr,ppmkComposite); @@ -1003,7 +1002,7 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p else { for (i = 0; i < sameIdx; i++) - strcatW(commonPath,stringTable1[i]); + lstrcatW(commonPath,stringTable1[i]); ret = CreateFileMoniker(commonPath, ppmkPrefix); } @@ -1057,7 +1056,7 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) goto lend; } - strcpyW(strgtable[tabIndex++],bSlash); + lstrcpyW(strgtable[tabIndex++],bSlash); i++; @@ -1077,7 +1076,7 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) goto lend; } - strcpyW(strgtable[tabIndex++],word); + lstrcpyW(strgtable[tabIndex++],word); } } strgtable[tabIndex]=NULL; @@ -1157,11 +1156,11 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm if (len2>0 && !(len1==1 && len2==1 && sameIdx==0)) for(j=sameIdx;(tabStr1[j] != NULL); j++) if (*tabStr1[j]!='\\') - strcatW(relPath,back); + lstrcatW(relPath,back); /* add items of the second path (similar items with the first path are not included) to the relativePath */ for(j=sameIdx;tabStr2[j]!=NULL;j++) - strcatW(relPath,tabStr2[j]); + lstrcatW(relPath,tabStr2[j]); res=CreateFileMoniker(relPath,ppmkRelPath); @@ -1199,7 +1198,7 @@ FileMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, if (*ppszDisplayName==NULL) return E_OUTOFMEMORY; - strcpyW(*ppszDisplayName,This->filePathName); + lstrcpyW(*ppszDisplayName,This->filePathName); TRACE("-- %s\n", debugstr_w(*ppszDisplayName)); @@ -1281,7 +1280,7 @@ FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, ULONG cbMax, ULONG* pcbData) { FileMonikerImpl *This = impl_from_IROTData(iface); - int len = strlenW(This->filePathName)+1; + int len = lstrlenW(This->filePathName)+1; int i; LPWSTR pszFileName; @@ -1294,7 +1293,7 @@ FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, memcpy(pbData, &CLSID_FileMoniker, sizeof(CLSID)); pszFileName = (LPWSTR)(pbData+sizeof(CLSID)); for (i = 0; i < len; i++) - pszFileName[i] = toupperW(This->filePathName[i]); + pszFileName[i] = towupper(This->filePathName[i]); return S_OK; } @@ -1364,25 +1363,25 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa if (This->filePathName==NULL) return E_OUTOFMEMORY; - strcpyW(This->filePathName,lpszPathName); + lstrcpyW(This->filePathName,lpszPathName); nb=FileMonikerImpl_DecomposePath(This->filePathName,&tabStr); if (nb > 0 ){ addBkSlash = TRUE; - if (lstrcmpW(tabStr[0],twoPoint)!=0) + if (wcscmp(tabStr[0],twoPoint)!=0) addBkSlash = FALSE; else for(i=0;i<nb;i++){ - if ( (lstrcmpW(tabStr[i],twoPoint)!=0) && (lstrcmpW(tabStr[i],bkSlash)!=0) ){ + if ( (wcscmp(tabStr[i],twoPoint)!=0) && (wcscmp(tabStr[i],bkSlash)!=0) ){ addBkSlash = FALSE; break; } else - if (lstrcmpW(tabStr[i],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i+1],bkSlash)==0){ + if (wcscmp(tabStr[i],bkSlash)==0 && i<nb-1 && wcscmp(tabStr[i+1],bkSlash)==0){ *tabStr[i]=0; sizeStr--; addBkSlash = FALSE; @@ -1390,7 +1389,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa } } - if (lstrcmpW(tabStr[nb-1],bkSlash)==0) + if (wcscmp(tabStr[nb-1],bkSlash)==0) addBkSlash = FALSE; This->filePathName=HeapReAlloc(GetProcessHeap(),0,This->filePathName,(sizeStr+1)*sizeof(WCHAR)); @@ -1398,10 +1397,10 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa *This->filePathName=0; for(i=0;tabStr[i]!=NULL;i++) - strcatW(This->filePathName,tabStr[i]); + lstrcatW(This->filePathName,tabStr[i]); if (addBkSlash) - strcatW(This->filePathName,bkSlash); + lstrcatW(This->filePathName,bkSlash); } free_stringtable(tabStr); @@ -1446,7 +1445,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, IMoniker **ppmk) static inline WCHAR *memrpbrkW(const WCHAR *ptr, size_t n, const WCHAR *accept) { const WCHAR *end, *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (strchrW(accept, *ptr)) ret = ptr; + for (end = ptr + n; ptr < end; ptr++) if (wcschr(accept, *ptr)) ret = ptr; return (WCHAR *)ret; } @@ -1456,7 +1455,7 @@ HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPCWSTR end; static const WCHAR wszSeparators[] = {':','\\','/','!',0}; - for (end = szDisplayName + strlenW(szDisplayName); + for (end = szDisplayName + lstrlenW(szDisplayName); end && (end != szDisplayName); end = memrpbrkW(szDisplayName, end - szDisplayName, wszSeparators)) { diff --git a/dll/win32/ole32/ftmarshal.c b/dll/win32/ole32/ftmarshal.c index c36f5f61697..851810df42a 100644 --- a/dll/win32/ole32/ftmarshal.c +++ b/dll/win32/ole32/ftmarshal.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dll/win32/ole32/hglobalstream.c b/dll/win32/ole32/hglobalstream.c index 2c08710b054..c9ec529d52f 100644 --- a/dll/win32/ole32/hglobalstream.c +++ b/dll/win32/ole32/hglobalstream.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdlib.h> #include <stdarg.h> diff --git a/dll/win32/ole32/ifs.c b/dll/win32/ole32/ifs.c index c9e5625e910..ea03e9b0a28 100644 --- a/dll/win32/ole32/ifs.c +++ b/dll/win32/ole32/ifs.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <ctype.h> #include <stdarg.h> #include <stdlib.h> diff --git a/dll/win32/ole32/itemmoniker.c b/dll/win32/ole32/itemmoniker.c index 14beadadee4..3bf12013629 100644 --- a/dll/win32/ole32/itemmoniker.c +++ b/dll/win32/ole32/itemmoniker.c @@ -32,7 +32,6 @@ #include "winnls.h" #include "wine/debug.h" #include "ole2.h" -#include "wine/unicode.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -487,7 +486,7 @@ static HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOther if(SUCCEEDED ((res = CreateBindCtx(0,&bind)))) { if(SUCCEEDED (IMoniker_GetDisplayName(iface,bind,NULL,&dispName1))) { if(SUCCEEDED (IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2))) { - if(lstrcmpW(dispName1,dispName2)==0) res = S_OK; + if(wcscmp(dispName1,dispName2)==0) res = S_OK; CoTaskMemFree(dispName2); } CoTaskMemFree(dispName1); @@ -514,7 +513,7 @@ static HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) len = lstrlenW(val); for (i = len ; i > 0; i--) - h = (h * 3) ^ toupperW(val[off++]); + h = (h * 3) ^ towupper(val[off++]); *pdwHash=h; @@ -813,7 +812,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData* iface, ULONG* pcbData) { ItemMonikerImpl *This = impl_from_IROTData(iface); - int len = (strlenW(This->itemName)+1); + int len = (lstrlenW(This->itemName)+1); int i; LPWSTR pszItemName; LPWSTR pszItemDelimiter; @@ -832,7 +831,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData* iface, /* write name */ pszItemName = pszItemDelimiter + 1; for (i = 0; i < len; i++) - pszItemName[i] = toupperW(This->itemName[i]); + pszItemName[i] = towupper(This->itemName[i]); return S_OK; } diff --git a/dll/win32/ole32/marshal.c b/dll/win32/ole32/marshal.c index b12082cc9fe..4b8945db6f9 100644 --- a/dll/win32/ole32/marshal.c +++ b/dll/win32/ole32/marshal.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "ole2.h" #include "winerror.h" -#include "wine/unicode.h" #include "compobj_private.h" diff --git a/dll/win32/ole32/memlockbytes.c b/dll/win32/ole32/memlockbytes.c index b2fc5b4f4db..2d7d4572584 100644 --- a/dll/win32/ole32/memlockbytes.c +++ b/dll/win32/ole32/memlockbytes.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dll/win32/ole32/moniker.c b/dll/win32/ole32/moniker.c index c1312d1e1e3..23ce0326d66 100644 --- a/dll/win32/ole32/moniker.c +++ b/dll/win32/ole32/moniker.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <string.h> @@ -39,7 +36,6 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/exception.h" #include "compobj_private.h" @@ -282,7 +278,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison return hr; } - len = strlenW(pszDisplayName); + len = lstrlenW(pszDisplayName); *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); if (!*moniker_data) @@ -1152,7 +1148,7 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, *pchEaten = 0; *ppmk = NULL; - if (!strncmpiW(szDisplayName, wszClsidColon, ARRAY_SIZE(wszClsidColon))) + if (!_wcsnicmp(szDisplayName, wszClsidColon, ARRAY_SIZE(wszClsidColon))) { hr = ClassMoniker_CreateFromDisplayName(pbc, szDisplayName, &chEaten, &moniker); if (FAILED(hr) && (hr != MK_E_SYNTAX)) @@ -1269,7 +1265,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) absFile=pathDec[nbElm-1]; /* failed if the path represents a directory and not an absolute file name*/ - if (!lstrcmpW(absFile, bkslashW)) { + if (!wcscmp(absFile, bkslashW)) { CoTaskMemFree(pathDec); return MK_E_INVALIDEXTENSION; } @@ -1280,7 +1276,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) for(i = length-1; (i >= 0) && *(extension = &absFile[i]) != '.'; i--) /* nothing */; - if (!extension || !lstrcmpW(extension, dotW)) { + if (!extension || !wcscmp(extension, dotW)) { CoTaskMemFree(pathDec); return MK_E_INVALIDEXTENSION; } diff --git a/dll/win32/ole32/ole2.c b/dll/win32/ole32/ole2.c index f1459829951..0ab5f37df5d 100644 --- a/dll/win32/ole32/ole2.c +++ b/dll/win32/ole32/ole2.c @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdlib.h> #include <stdarg.h> @@ -44,7 +42,6 @@ #include "ole2.h" #include "ole2ver.h" -#include "wine/unicode.h" #include "compobj_private.h" #include "olestd.h" #include "wine/list.h" @@ -706,7 +703,7 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype) { HKEY auxkey; - sprintfW(auxkeynameW, auxusertypeW, form); + swprintf(auxkeynameW, auxusertypeW, form); if (COM_OpenKeyForCLSID(clsid, auxkeynameW, KEY_READ, &auxkey) == S_OK) { if (!RegQueryValueExW(auxkey, emptyW, NULL, &valuetype, NULL, &valuelen) && valuelen) @@ -895,7 +892,7 @@ HRESULT WINAPI OleRegGetMiscStatus( /* * Open the key specific to the requested aspect. */ - sprintfW(keyName, dfmtW, dwAspect); + swprintf(keyName, dfmtW, dwAspect); result = open_classes_key(miscStatusKey, keyName, KEY_READ, &aspectKey); if (result == ERROR_SUCCESS) @@ -1014,7 +1011,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( } TRACE("verb string: %s\n", debugstr_w(pwszOLEVERB)); - pwszMenuFlags = strchrW(pwszOLEVERB, ','); + pwszMenuFlags = wcschr(pwszOLEVERB, ','); if (!pwszMenuFlags) { hr = OLEOBJ_E_INVALIDVERB; @@ -1024,7 +1021,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( /* nul terminate the name string and advance to first character */ *pwszMenuFlags = '\0'; pwszMenuFlags++; - pwszAttribs = strchrW(pwszMenuFlags, ','); + pwszAttribs = wcschr(pwszMenuFlags, ','); if (!pwszAttribs) { hr = OLEOBJ_E_INVALIDVERB; @@ -1036,10 +1033,10 @@ static HRESULT WINAPI EnumOLEVERB_Next( pwszAttribs++; /* fill out structure for this verb */ - rgelt->lVerb = atolW(wszSubKey); + rgelt->lVerb = wcstol(wszSubKey, NULL, 10); rgelt->lpszVerbName = pwszOLEVERB; /* user should free */ - rgelt->fuFlags = atolW(pwszMenuFlags); - rgelt->grfAttribs = atolW(pwszAttribs); + rgelt->fuFlags = wcstol(pwszMenuFlags, NULL, 10); + rgelt->grfAttribs = wcstol(pwszAttribs, NULL, 10); if (pceltFetched) (*pceltFetched)++; @@ -2552,7 +2549,7 @@ static void OLEUTL_ReadRegistryDWORDValue( case REG_EXPAND_SZ: case REG_MULTI_SZ: case REG_SZ: - *pdwValue = (DWORD)strtoulW(buffer, NULL, 10); + *pdwValue = wcstoul(buffer, NULL, 10); break; } } @@ -2744,7 +2741,7 @@ HRESULT WINAPI OleSetAutoConvert(REFCLSID clsidOld, REFCLSID clsidNew) if (FAILED(res)) goto done; StringFromGUID2(clsidNew, szClsidNew, CHARS_IN_GUID); - if (RegSetValueW(hkey, wszAutoConvertTo, REG_SZ, szClsidNew, (strlenW(szClsidNew)+1) * sizeof(WCHAR))) + if (RegSetValueW(hkey, wszAutoConvertTo, REG_SZ, szClsidNew, (lstrlenW(szClsidNew)+1) * sizeof(WCHAR))) { res = REGDB_E_WRITEREGDB; goto done; @@ -2940,6 +2937,25 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_FILETIME|VT_VECTOR: case VT_CF|VT_VECTOR: case VT_CLSID|VT_VECTOR: + case VT_ARRAY|VT_I1: + case VT_ARRAY|VT_UI1: + case VT_ARRAY|VT_I2: + case VT_ARRAY|VT_UI2: + case VT_ARRAY|VT_I4: + case VT_ARRAY|VT_UI4: + case VT_ARRAY|VT_INT: + case VT_ARRAY|VT_UINT: + case VT_ARRAY|VT_R4: + case VT_ARRAY|VT_R8: + case VT_ARRAY|VT_CY: + case VT_ARRAY|VT_DATE: + case VT_ARRAY|VT_BSTR: + case VT_ARRAY|VT_BOOL: + case VT_ARRAY|VT_DECIMAL: + case VT_ARRAY|VT_DISPATCH: + case VT_ARRAY|VT_UNKNOWN: + case VT_ARRAY|VT_ERROR: + case VT_ARRAY|VT_VARIANT: return S_OK; } WARN("Bad type %d\n", vt); @@ -3051,6 +3067,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.capropvar.pElems); } } + else if (pvar->vt & VT_ARRAY) + hr = SafeArrayDestroy(pvar->u.parray); else { WARN("Invalid/unsupported type %d\n", pvar->vt); @@ -3231,6 +3249,11 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ else CopyMemory(pvarDest->u.capropvar.pElems, pvarSrc->u.capropvar.pElems, len * elemSize); } + else if (pvarSrc->vt & VT_ARRAY) + { + pvarDest->u.uhVal.QuadPart = 0; + return SafeArrayCopy(pvarSrc->u.parray, &pvarDest->u.parray); + } else WARN("Invalid/unsupported type %d\n", pvarSrc->vt); } diff --git a/dll/win32/ole32/ole2stubs.c b/dll/win32/ole32/ole2stubs.c index d7fd58c5264..49130c51584 100644 --- a/dll/win32/ole32/ole2stubs.c +++ b/dll/win32/ole32/ole2stubs.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/ole32/ole32.spec b/dll/win32/ole32/ole32.spec index 97667918e9e..b56b01d84c6 100644 --- a/dll/win32/ole32/ole32.spec +++ b/dll/win32/ole32/ole32.spec @@ -22,11 +22,11 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) # CoCreateObjectInContext # CoDeactivateObject -@ stdcall -stub CoDisableCallCancellation(ptr) +@ stdcall CoDisableCallCancellation(ptr) @ stdcall -stub -version=0x600+ CoDisconnectContext(long) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime -@ stdcall -stub CoEnableCallCancellation(ptr) +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() diff --git a/dll/win32/ole32/ole32_main.c b/dll/win32/ole32/ole32_main.c index 7c12f1ce33a..c38c525d5a6 100644 --- a/dll/win32/ole32/ole32_main.c +++ b/dll/win32/ole32/ole32_main.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> diff --git a/dll/win32/ole32/oleobj.c b/dll/win32/ole32/oleobj.c index 44e15e551f5..13a873655f5 100644 --- a/dll/win32/ole32/oleobj.c +++ b/dll/win32/ole32/oleobj.c @@ -41,11 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static void release_statdata(STATDATA *data) { - if(data->formatetc.ptd) - { - CoTaskMemFree(data->formatetc.ptd); - data->formatetc.ptd = NULL; - } + CoTaskMemFree(data->formatetc.ptd); + data->formatetc.ptd = NULL; if(data->pAdvSink) { diff --git a/dll/win32/ole32/oleproxy.c b/dll/win32/ole32/oleproxy.c index a7b8e395104..b5c08ff1c5b 100644 --- a/dll/win32/ole32/oleproxy.c +++ b/dll/win32/ole32/oleproxy.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dll/win32/ole32/precomp.h b/dll/win32/ole32/precomp.h index c9ea8458419..634e3238ae8 100644 --- a/dll/win32/ole32/precomp.h +++ b/dll/win32/ole32/precomp.h @@ -2,8 +2,6 @@ #ifndef _OLE32_PCH_ #define _OLE32_PCH_ -#include <wine/config.h> - #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -30,7 +28,6 @@ #include <wine/debug.h> #include <wine/list.h> -#include <wine/unicode.h> #include "compobj_private.h" #include "dictionary.h" diff --git a/dll/win32/ole32/rpc.c b/dll/win32/ole32/rpc.c index bd4611d7d5f..895aa4010cd 100644 --- a/dll/win32/ole32/rpc.c +++ b/dll/win32/ole32/rpc.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <string.h> @@ -39,7 +36,6 @@ #include "winerror.h" #include "winreg.h" #include "servprov.h" -#include "wine/unicode.h" #include "compobj_private.h" @@ -1684,7 +1680,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* EXE servers are started with the -Embedding switch. */ - strcatW(command, embedding); + lstrcatW(command, embedding); TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid)); @@ -1800,7 +1796,7 @@ static HRESULT create_local_service(REFCLSID rclsid) static void get_localserver_pipe_name(WCHAR *pipefn, REFCLSID rclsid) { static const WCHAR wszPipeRef[] = {'\\','\\','.','\\','p','i','p','e','\\',0}; - strcpyW(pipefn, wszPipeRef); + lstrcpyW(pipefn, wszPipeRef); StringFromGUID2(rclsid, pipefn + ARRAY_SIZE(wszPipeRef) - 1, CHARS_IN_GUID); } diff --git a/dll/win32/ole32/stg_prop.c b/dll/win32/ole32/stg_prop.c index 4b968d6e9cc..d2e66a15c1e 100644 --- a/dll/win32/ole32/stg_prop.c +++ b/dll/win32/ole32/stg_prop.c @@ -36,9 +36,6 @@ * PropertyStorage_ReadFromStream */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -52,7 +49,7 @@ #include "winbase.h" #include "winnls.h" #include "winuser.h" -#include "wine/unicode.h" +#include "wine/asm.h" #include "wine/debug.h" #include "dictionary.h" #include "storage32.h" @@ -61,10 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); -#ifdef _MSC_VER -#define __ASM_STDCALL_FUNC(name,args,code) -#endif - static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) { return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); @@ -375,7 +368,7 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, size_t len; if (dstCP == CP_UNICODE) - len = (strlenW((LPCWSTR)src) + 1) * sizeof(WCHAR); + len = (lstrlenW((LPCWSTR)src) + 1) * sizeof(WCHAR); else len = strlen(src) + 1; *dst = CoTaskMemAlloc(len * sizeof(WCHAR)); @@ -943,7 +936,7 @@ static int PropertyStorage_PropNameCompare(const void *a, const void *b, { TRACE("(%s, %s)\n", debugstr_w(a), debugstr_w(b)); if (This->grfFlags & PROPSETFLAG_CASE_SENSITIVE) - return lstrcmpW(a, b); + return wcscmp(a, b); else return lstrcmpiW(a, b); } @@ -2513,7 +2506,7 @@ static void prop_enum_copy_cb(IUnknown *parent, void *orig, void *dest) if (dictionary_find(storage->propid_to_name, UlongToPtr(src_prop->propid), (void**)&name)) { - DWORD size = (strlenW(name) + 1) * sizeof(WCHAR); + DWORD size = (lstrlenW(name) + 1) * sizeof(WCHAR); dest_prop->lpwstrName = CoTaskMemAlloc(size); if (!dest_prop->lpwstrName) return; diff --git a/dll/win32/ole32/storage32.c b/dll/win32/ole32/storage32.c index a8bbd407dd7..fa3872dad07 100644 --- a/dll/win32/ole32/storage32.c +++ b/dll/win32/ole32/storage32.c @@ -43,7 +43,6 @@ #include "winbase.h" #include "winnls.h" #include "winuser.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "storage32.h" @@ -519,7 +518,7 @@ static LONG entryNameCmp( /* * We compare the string themselves only when they are of the same length */ - diff = toupperW(*name1++) - toupperW(*name2++); + diff = towupper(*name1++) - towupper(*name2++); } return diff; @@ -1347,7 +1346,7 @@ static HRESULT StorageBaseImpl_CopyChildEntryTo(StorageBaseImpl *This, while ( *snb != NULL && !skip ) { - if ( lstrcmpW(data.name, *snb) == 0 ) + if ( wcscmp(data.name, *snb) == 0 ) skip = TRUE; ++snb; } @@ -1891,7 +1890,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( currentEntryRef); /* Change the name of the element */ - strcpyW(currentEntry.name, pwcsNewName); + lstrcpyW(currentEntry.name, pwcsNewName); /* Delete any sibling links */ currentEntry.leftChild = DIRENTRY_NULL; @@ -2013,7 +2012,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( if (newStreamEntry.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN) return STG_E_INVALIDNAME; - strcpyW(newStreamEntry.name, pwcsName); + lstrcpyW(newStreamEntry.name, pwcsName); newStreamEntry.stgType = STGTY_STREAM; newStreamEntry.startingBlock = BLOCK_END_OF_CHAIN; @@ -2209,7 +2208,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_INVALIDNAME; } - strcpyW(newEntry.name, pwcsName); + lstrcpyW(newEntry.name, pwcsName); newEntry.stgType = STGTY_STORAGE; newEntry.startingBlock = BLOCK_END_OF_CHAIN; @@ -2357,7 +2356,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( while ( *snb != NULL && fail ) { - if ( lstrcmpW(data.name, *snb) == 0 ) + if ( wcscmp(data.name, *snb) == 0 ) fail = FALSE; ++snb; } @@ -4768,7 +4767,7 @@ static HRESULT StorageImpl_Refresh(StorageImpl *This, BOOL new_object, BOOL crea * Initialize the directory table */ memset(&rootEntry, 0, sizeof(rootEntry)); - strcpyW(rootEntry.name, rootentryW); + lstrcpyW(rootEntry.name, rootentryW); rootEntry.sizeOfNameString = sizeof(rootentryW); rootEntry.stgType = STGTY_ROOT; rootEntry.leftChild = DIRENTRY_NULL; @@ -7040,7 +7039,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( destination->pwcsName = CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR)); - strcpyW(destination->pwcsName, source->name); + lstrcpyW(destination->pwcsName, source->name); } switch (source->stgType) diff --git a/dll/win32/ole32/usrmarshal.c b/dll/win32/ole32/usrmarshal.c index 9f19b66d635..ba318c66b62 100644 --- a/dll/win32/ole32/usrmarshal.c +++ b/dll/win32/ole32/usrmarshal.c @@ -35,7 +35,6 @@ #include "oleauto.h" #include "rpcproxy.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -1716,7 +1715,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM { TRACE("file name is %s\n", debugstr_w(pStgMedium->u.lpszFileName)); size += 3 * sizeof(DWORD) + - (strlenW(pStgMedium->u.lpszFileName) + 1) * sizeof(WCHAR); + (lstrlenW(pStgMedium->u.lpszFileName) + 1) * sizeof(WCHAR); } break; case TYMED_ISTREAM: @@ -1814,7 +1813,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p if (pStgMedium->u.lpszFileName) { DWORD len; - len = strlenW(pStgMedium->u.lpszFileName); + len = lstrlenW(pStgMedium->u.lpszFileName); /* conformance */ *(DWORD *)pBuffer = len + 1; pBuffer += sizeof(DWORD); @@ -2126,7 +2125,7 @@ ULONG __RPC_USER SNB_UserSize(ULONG *pFlags, ULONG StartingSize, SNB *pSnb) while (*ptrW) { - size += (strlenW(*ptrW) + 1)*sizeof(WCHAR); + size += (lstrlenW(*ptrW) + 1)*sizeof(WCHAR); ptrW++; } } @@ -2161,7 +2160,7 @@ unsigned char * __RPC_USER SNB_UserMarshal(ULONG *pFlags, unsigned char *pBuffer while (*ptrW) { - ULONG len = strlenW(*ptrW) + 1; + ULONG len = lstrlenW(*ptrW) + 1; wire->strcnt++; wire->charcnt += len; @@ -2202,7 +2201,7 @@ unsigned char * __RPC_USER SNB_UserUnmarshal(ULONG *pFlags, unsigned char *pBuff for (i = 0; i < wire->strcnt; i++) { - ULONG len = strlenW(src); + ULONG len = lstrlenW(src); memcpy(dest, src, (len + 1)*sizeof(WCHAR)); *ptrW = dest; src += len + 1; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 352ad732cf6..2376a96c5ae 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -140,7 +140,7 @@ dll/win32/ntdsapi # Synced to WineStaging-4.18 dll/win32/objsel # Synced to WineStaging-4.18 dll/win32/odbc32 # Synced to WineStaging-4.18. Depends on port of Linux ODBC. dll/win32/odbccp32 # Synced to WineStaging-4.18 -dll/win32/ole32 # Synced to WineStaging-4.0 +dll/win32/ole32 # Synced to WineStaging-4.18 dll/win32/oleacc # Synced to WineStaging-4.0 dll/win32/oleaut32 # Synced to WineStaging-4.0 dll/win32/olecli32 # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [ODBCCP32_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 10 Nov '19

10 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6816ff8dbd3a3af612be1… commit 6816ff8dbd3a3af612be1e115880567e8af8d71c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 10 14:10:31 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Nov 10 14:10:31 2019 +0100 [ODBCCP32_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/odbccp32/misc.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/rostests/winetests/odbccp32/misc.c b/modules/rostests/winetests/odbccp32/misc.c index dc65bdf3f9a..dc2ca7ed3f4 100644 --- a/modules/rostests/winetests/odbccp32/misc.c +++ b/modules/rostests/winetests/odbccp32/misc.c @@ -741,6 +741,31 @@ static void test_SQLValidDSNW(void) ok(ret, "got %d\n", ret); } +static void test_SQLConfigDataSource(void) +{ + BOOL ret; + + ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); + ok(ret, "got %d\n", ret); + + ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); + ok(ret, "got %d\n", ret); + + ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); + if(!ret) + { + RETCODE ret; + DWORD err; + ret = SQLInstallerError(1, &err, NULL, 0, NULL); + ok(ret == SQL_SUCCESS_WITH_INFO, "got %d\n", ret); + todo_wine ok(err == ODBC_ERROR_INVALID_DSN, "got %u\n", err); + } + + ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "ODBC driver", "DSN=ODBC data source\0\0"); + todo_wine ok(!ret, "got %d\n", ret); + todo_wine check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -754,4 +779,5 @@ START_TEST(misc) test_SQLGetInstalledDrivers(); test_SQLValidDSN(); test_SQLValidDSNW(); + test_SQLConfigDataSource(); }

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