Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [MEDIA][FONTS] Revert "Add Microsoft Sans Serif font (#1805)"

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23e575c1bcebc130d8ef0… commit 23e575c1bcebc130d8ef03b5e771b774716981c6 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Nov 12 01:54:07 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Nov 12 01:54:07 2019 +0100 [MEDIA][FONTS] Revert "Add Microsoft Sans Serif font (#1805)" To fix regression CORE-16497 "Chromium BSU setup using wrong font" It is a good idea to add micross.ttf, but we should not use "Liberation Sans" as template but instead either create it from scratch or at least use something with the same metrics as the MS font and does not blur in CORE-16497. This reverts commit 0.4.13-dev-796-g eefc54420294eda81665fb6eb8f6b4bb92b2d20a Same revert already done in 0.4.13-RC-25-g c8edd36e3e064b7844c0c46361e08eb33e395aec --- media/fonts/CMakeLists.txt | 1 - media/fonts/doc/MicrosoftSansSerif/LICENSE.txt | 104 ------------------------- media/fonts/doc/MicrosoftSansSerif/README.txt | 6 -- media/fonts/micross.ttf | Bin 183332 -> 0 bytes 4 files changed, 111 deletions(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 3cede56d7d8..ef0284283c6 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -33,7 +33,6 @@ list(APPEND FONT_FILES georgiaz.ttf lucon.ttf Marlett.ttf - micross.ttf pala.ttf palab.ttf palabi.ttf diff --git a/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt b/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt deleted file mode 100644 index cb6c5ce9cfd..00000000000 --- a/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt +++ /dev/null @@ -1,104 +0,0 @@ -Digitized data copyright (c) 2010 Google Corporation - with Reserved Font Arimo, Tinos and Cousine. -Copyright (c) 2012 Red Hat, Inc. - with Reserved Font Name Liberation. -Copyright (c) 2019 Katayama Hirofumi MZ - with renaming as "Microsoft Sans Serif". - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 - -PREAMBLE The goals of the Open Font License (OFL) are to stimulate -worldwide development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to provide -a free and open framework in which fonts may be shared and improved in -partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. -The fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - - - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. -This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components -as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting ? in part or in whole ? -any of the components of the Original Version, by changing formats or -by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer -or other person who contributed to the Font Software. - - -PERMISSION & CONDITIONS - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components,in - Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the - corresponding Copyright Holder. This restriction only applies to the - primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - -5) The Font Software, modified or unmodified, in part or in whole, must - be distributed entirely under this license, and must not be distributed - under any other license. The requirement for fonts to remain under - this license does not apply to any document created using the Font - Software. - - - -TERMINATION -This license becomes null and void if any of the above conditions are not met. - - - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. - diff --git a/media/fonts/doc/MicrosoftSansSerif/README.txt b/media/fonts/doc/MicrosoftSansSerif/README.txt deleted file mode 100644 index 9e07f116ff5..00000000000 --- a/media/fonts/doc/MicrosoftSansSerif/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -ReactOS "Microsoft Sans Serif" font is based on "Liberation Sans". - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -Please read file "LICENSE" for details. diff --git a/media/fonts/micross.ttf b/media/fonts/micross.ttf deleted file mode 100644 index fd6b1f36bc8..00000000000 Binary files a/media/fonts/micross.ttf and /dev/null differ

4 years, 11 months

[reactos] 02/02: [NTOSKRNL] Properly check for Ft volumes

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=324285f0b9a7726cf2c00… commit 324285f0b9a7726cf2c00aa49cd262f1f4f70ec0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Nov 11 21:20:58 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 11 21:20:58 2019 +0100 [NTOSKRNL] Properly check for Ft volumes This fixes a regression introduced in 5ab1cfc which was causing Unix (BtrFS, ExtX, and so on) volumes not to be assigned a drive letter assigned anymore. And thus, they were no longer mounted and presented to the users. CORE-16499 --- ntoskrnl/fstub/disksup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index 0b81bc561dd..3198481fb5d 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -277,7 +277,7 @@ HalpQueryPartitionType(IN PUNICODE_STRING DeviceName, } /* Check if that's a FT volume */ - if (PartitionInfo.Mbr.PartitionType & PARTITION_NTFT) + if (IsFTPartition(PartitionInfo.Mbr.PartitionType)) { *PartitionType = FtPartition; return STATUS_SUCCESS;

4 years, 11 months

[reactos] 01/02: [SDK] Properly define IsFTPartition so that it doesn't match Unix partition type

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a0e6a9f07c1127888d7c… commit 0a0e6a9f07c1127888d7c5c533b61e79caad3dd1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Nov 11 21:18:13 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 11 21:18:13 2019 +0100 [SDK] Properly define IsFTPartition so that it doesn't match Unix partition type CORE-16499 --- sdk/include/psdk/ntdddisk.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/ntdddisk.h b/sdk/include/psdk/ntdddisk.h index 13b8e0e9995..7c7cc1dd600 100644 --- a/sdk/include/psdk/ntdddisk.h +++ b/sdk/include/psdk/ntdddisk.h @@ -239,8 +239,13 @@ extern "C" { #endif #define IsFTPartition( PartitionType ) \ - (((PartitionType) & PARTITION_NTFT) && \ - IsRecognizedPartition(PartitionType)) + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \ + (((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) + #define IsContainerPartition(PartitionType) \ (((PartitionType) == PARTITION_EXTENDED) || \

4 years, 11 months

[reactos] 01/01: [CLASS2] Drop the drive letter hack

by Pierre Schweitzer

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; }

4 years, 11 months

[reactos] 01/01: [NETSHELL] Fix checkboxes in the network adapter properties

by Eric Kohl

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

4 years, 11 months

[reactos] 01/01: [USETUP] Hungarian translation fix (#2026)

by Tibor Lajos Füzi

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,

4 years, 11 months

[reactos] 01/01: [IDL][DNSRSLVR] Use the stdcall calling convention for remote functions

by Eric Kohl

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 */

4 years, 11 months

[reactos] 01/01: [SHELL32] Follow up of #2021 (#2022)

by Katayama Hirofumi MZ

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);

4 years, 11 months

[reactos] 01/01: [SMSS] When determining page file size, keep more free disk space. CORE-6839

by Thomas Faber

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) //

4 years, 11 months

[reactos] 01/01: [DNSRSLVR][DNSAPI] Enable the DNS resolver cache

by Eric Kohl

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

4 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019