From eeb38cd0386a0d64317a3ad666028f128ceb539d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 10 Jan 2013 00:10:32 +0000 Subject: [PATCH 01/71] [BUGCODES] Add two missing bugcheck codes. svn path=/trunk/; revision=58153 --- reactos/include/reactos/mc/bugcodes.mc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/reactos/include/reactos/mc/bugcodes.mc b/reactos/include/reactos/mc/bugcodes.mc index 44d720b0da9..6c52496a5f6 100644 --- a/reactos/include/reactos/mc/bugcodes.mc +++ b/reactos/include/reactos/mc/bugcodes.mc @@ -814,6 +814,22 @@ Language=English PINBALL_FILE_SYSTEM . +MessageId=0x5A +Severity=Success +Facility=System +SymbolicName=CRITICAL_SERVICE_FAILED +Language=English +CRITICAL_SERVICE_FAILED +. + +MessageId=0x5B +Severity=Success +Facility=System +SymbolicName=SET_ENV_VAR_FAILED +Language=English +SET_ENV_VAR_FAILED +. + MessageId=0x5C Severity=Success Facility=System From cb2a5efc11c7cce3eab91d23a219762e6d4c546f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 10 Jan 2013 01:45:22 +0000 Subject: [PATCH 02/71] [REACTOS] Fix the debugging macros introduced in r58132 (for the _FATAL case): do not use exceptions but instead a breakpoint followed by a process termination procedure (or a bugcheck if we are in kernel mode). Feel free to improve them !! [DRIVERS-HAL] Finish to use the new debugging macros Part 3/3 svn path=/trunk/; revision=58154 --- reactos/drivers/bus/pcix/device.c | 9 +-- reactos/drivers/bus/pcix/enum.c | 37 ++++------- reactos/drivers/bus/pcix/fdo.c | 40 ++++-------- reactos/drivers/bus/pcix/init.c | 7 +-- reactos/drivers/bus/pcix/intrface/agpintrf.c | 3 +- reactos/drivers/bus/pcix/intrface/busintrf.c | 3 +- reactos/drivers/bus/pcix/intrface/cardbus.c | 24 +++----- reactos/drivers/bus/pcix/intrface/devhere.c | 3 +- reactos/drivers/bus/pcix/intrface/lddintrf.c | 3 +- reactos/drivers/bus/pcix/intrface/locintrf.c | 3 +- reactos/drivers/bus/pcix/intrface/pmeintf.c | 3 +- reactos/drivers/bus/pcix/intrface/routintf.c | 3 +- reactos/drivers/bus/pcix/pci/config.c | 3 +- reactos/drivers/bus/pcix/pci/ppbridge.c | 3 +- reactos/drivers/bus/pcix/pcivrify.c | 3 +- reactos/drivers/bus/pcix/pdo.c | 39 ++++-------- reactos/drivers/bus/pcix/power.c | 3 +- reactos/drivers/bus/pcix/utils.c | 6 +- reactos/hal/halx86/acpi/halpnpdd.c | 3 +- reactos/hal/halx86/generic/bios.c | 4 +- reactos/hal/halx86/generic/misc.c | 2 +- reactos/hal/halx86/generic/spinlock.c | 6 +- reactos/hal/halx86/legacy/bus/cmosbus.c | 6 +- reactos/hal/halx86/legacy/bus/pcibus.c | 15 ++--- reactos/hal/halx86/legacy/halpnpdd.c | 3 +- reactos/include/reactos/debug.h | 65 +++++++++++--------- 26 files changed, 115 insertions(+), 184 deletions(-) diff --git a/reactos/drivers/bus/pcix/device.c b/reactos/drivers/bus/pcix/device.c index c8a1accdfcf..a1f65f668bb 100644 --- a/reactos/drivers/bus/pcix/device.c +++ b/reactos/drivers/bus/pcix/device.c @@ -261,8 +261,7 @@ Device_GetAdditionalResourceDescriptors(IN PPCI_CONFIGURATOR_CONTEXT Context, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -271,8 +270,7 @@ Device_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -281,8 +279,7 @@ Device_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* EOF */ diff --git a/reactos/drivers/bus/pcix/enum.c b/reactos/drivers/bus/pcix/enum.c index 4fde88f0aa2..e4735cf708d 100644 --- a/reactos/drivers/bus/pcix/enum.c +++ b/reactos/drivers/bus/pcix/enum.c @@ -147,14 +147,12 @@ PciComputeNewCurrentSettings(IN PPCI_PDO_EXTENSION PdoExtension, { /* Not used in the driver yet */ case 1: - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); break; /* Not used in the driver yet */ case 2: - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); break; /* A drain request */ @@ -540,8 +538,7 @@ PciQueryEjectionRelations(IN PPCI_PDO_EXTENSION PdoExtension, IN OUT PDEVICE_RELATIONS *pDeviceRelations) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } @@ -599,8 +596,7 @@ PciQueryRequirements(IN PPCI_PDO_EXTENSION PdoExtension, (ExIsProcessorFeaturePresent(PF_PAE_ENABLED))) { /* Have not tested this on eVb's machine yet */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Check if the requirements are actually the zero list */ @@ -1522,8 +1518,7 @@ PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) if (!PCI_IS_ROOT_FDO(DeviceExtension)) { /* Not really handling this year */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); /* Check for PCI bridges with the ISA bit set, or required */ if ((PdoExtension) && @@ -1532,8 +1527,7 @@ PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) (PdoExtension->Dependent.type1.IsaBitSet))) { /* We'll need to do some legacy support */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } else @@ -1547,8 +1541,7 @@ PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) if (PdoExtension->Dependent.type1.VgaBitSet) { /* Again, some more legacy support we'll have to do */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } } @@ -1557,8 +1550,7 @@ PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) if (PciAssignBusNumbers) { /* Not yet supported */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } @@ -1605,9 +1597,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) sizeof(UCHAR)); if (SecondaryBus != PdoExtension->Dependent.type1.SecondaryBus) { - DPRINT1("PCI: Bus numbers have been changed! Restoring originals.\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("PCI: Bus numbers have been changed! Restoring originals.\n"); } } @@ -1668,8 +1658,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) if (WdTable) { /* Check if this PCI device is the ACPI Watchdog Device... */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Check for non-simple devices */ @@ -1734,8 +1723,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) if (PdoExtension) { /* Rescan scenarios are not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Bus processing will need to happen */ @@ -2197,8 +2185,7 @@ PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension, (FdoExtension->HotPlugParameters.Acquired)) { /* Don't have hotplug devices to test with yet, QEMU 0.14 should */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Locate the correct resource configurator for this type of device */ diff --git a/reactos/drivers/bus/pcix/fdo.c b/reactos/drivers/bus/pcix/fdo.c index ed80518b793..fbb69713d90 100644 --- a/reactos/drivers/bus/pcix/fdo.c +++ b/reactos/drivers/bus/pcix/fdo.c @@ -93,8 +93,7 @@ PciFdoIrpStartDevice(IN PIRP Irp, { /* These resources would only be for non-root FDOs, unhandled for now */ ASSERT(Resources->Count == 1); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Initialize the arbiter for this FDO */ @@ -111,8 +110,7 @@ PciFdoIrpStartDevice(IN PIRP Irp, { /* Unhandled for now */ ASSERT(Resources->Count == 1); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Commit the transition to the started state */ @@ -136,8 +134,7 @@ PciFdoIrpRemoveDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -147,8 +144,7 @@ PciFdoIrpCancelRemoveDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -158,8 +154,7 @@ PciFdoIrpStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -169,8 +164,7 @@ PciFdoIrpQueryStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -180,8 +174,7 @@ PciFdoIrpCancelStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -318,8 +311,7 @@ PciFdoIrpDeviceUsageNotification(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -329,8 +321,7 @@ PciFdoIrpSurpriseRemoval(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -340,8 +331,7 @@ PciFdoIrpQueryLegacyBusInformation(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -392,8 +382,7 @@ PciGetHotPlugParameters(IN PPCI_FDO_EXTENSION FdoExtension) if (OutputBuffer->Count != 4) break; /* HotPlug PCI Support not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } while (FALSE); /* Free the buffer and return */ @@ -544,17 +533,14 @@ PciAddDevice(IN PDRIVER_OBJECT DriverObject, else { /* Root PDO in ReactOS does not assign boot resources */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); - DPRINT1("Encountered during setup\n"); + UNIMPLEMENTED_DBGBREAK("Encountered during setup\n"); Descriptor = NULL; } if (Descriptor) { /* Root PDO in ReactOS does not assign boot resources */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } else { diff --git a/reactos/drivers/bus/pcix/init.c b/reactos/drivers/bus/pcix/init.c index 36d1d930ee4..58f1328fbae 100644 --- a/reactos/drivers/bus/pcix/init.c +++ b/reactos/drivers/bus/pcix/init.c @@ -678,8 +678,7 @@ NTAPI PciGetDebugPorts(IN HANDLE DebugKey) { /* This function is not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } @@ -688,9 +687,7 @@ NTAPI PciDriverUnload(IN PDRIVER_OBJECT DriverObject) { /* This function is not yet implemented */ - DPRINT1("PCI: Unload\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("PCI: Unload\n"); } NTSTATUS diff --git a/reactos/drivers/bus/pcix/intrface/agpintrf.c b/reactos/drivers/bus/pcix/intrface/agpintrf.c index e9d285dc921..8bb63c6b96d 100644 --- a/reactos/drivers/bus/pcix/intrface/agpintrf.c +++ b/reactos/drivers/bus/pcix/intrface/agpintrf.c @@ -58,8 +58,7 @@ agpintrf_Constructor(IN PVOID DeviceExtension, } /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/busintrf.c b/reactos/drivers/bus/pcix/intrface/busintrf.c index a6dc65d561f..bd8b80d1139 100644 --- a/reactos/drivers/bus/pcix/intrface/busintrf.c +++ b/reactos/drivers/bus/pcix/intrface/busintrf.c @@ -48,8 +48,7 @@ busintrf_Constructor(IN PVOID DeviceExtension, IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/cardbus.c b/reactos/drivers/bus/pcix/intrface/cardbus.c index be6ce008cdf..553105441d8 100644 --- a/reactos/drivers/bus/pcix/intrface/cardbus.c +++ b/reactos/drivers/bus/pcix/intrface/cardbus.c @@ -33,32 +33,28 @@ VOID NTAPI Cardbus_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -67,8 +63,7 @@ Cardbus_GetAdditionalResourceDescriptors(IN PPCI_CONFIGURATOR_CONTEXT Context, IN PPCI_COMMON_HEADER PciData, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -76,8 +71,7 @@ NTAPI Cardbus_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -85,8 +79,7 @@ NTAPI Cardbus_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -108,8 +101,7 @@ pcicbintrf_Constructor(IN PVOID DeviceExtension, IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/devhere.c b/reactos/drivers/bus/pcix/intrface/devhere.c index b2d4548dd21..e3ff52362cb 100644 --- a/reactos/drivers/bus/pcix/intrface/devhere.c +++ b/reactos/drivers/bus/pcix/intrface/devhere.c @@ -50,8 +50,7 @@ devpresent_Constructor(IN PVOID DeviceExtension, PAGED_CODE(); /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/lddintrf.c b/reactos/drivers/bus/pcix/intrface/lddintrf.c index 512390e66f1..e8bba0f62c2 100644 --- a/reactos/drivers/bus/pcix/intrface/lddintrf.c +++ b/reactos/drivers/bus/pcix/intrface/lddintrf.c @@ -48,8 +48,7 @@ lddintrf_Constructor(IN PVOID DeviceExtension, IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/locintrf.c b/reactos/drivers/bus/pcix/intrface/locintrf.c index 814d69e808e..13e457c24cc 100644 --- a/reactos/drivers/bus/pcix/intrface/locintrf.c +++ b/reactos/drivers/bus/pcix/intrface/locintrf.c @@ -48,8 +48,7 @@ locintrf_Constructor(IN PVOID DeviceExtension, IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/pmeintf.c b/reactos/drivers/bus/pcix/intrface/pmeintf.c index 0debb22eba4..4b78b69720b 100644 --- a/reactos/drivers/bus/pcix/intrface/pmeintf.c +++ b/reactos/drivers/bus/pcix/intrface/pmeintf.c @@ -51,8 +51,7 @@ PciPmeInterfaceConstructor(IN PVOID DeviceExtension, if (Version != PCI_PME_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/intrface/routintf.c b/reactos/drivers/bus/pcix/intrface/routintf.c index f7e53711be6..6158b508055 100644 --- a/reactos/drivers/bus/pcix/intrface/routintf.c +++ b/reactos/drivers/bus/pcix/intrface/routintf.c @@ -53,8 +53,7 @@ routeintrf_Constructor(IN PVOID DeviceExtension, if (Version != PCI_INT_ROUTE_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } diff --git a/reactos/drivers/bus/pcix/pci/config.c b/reactos/drivers/bus/pcix/pci/config.c index c4fc3c71b6d..6d676dac8e4 100644 --- a/reactos/drivers/bus/pcix/pci/config.c +++ b/reactos/drivers/bus/pcix/pci/config.c @@ -65,8 +65,7 @@ PciReadWriteConfigSpace(IN PPCI_FDO_EXTENSION DeviceExtension, if (PciInterface) { /* Currently this driver only supports the legacy HAL interface */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } else { diff --git a/reactos/drivers/bus/pcix/pci/ppbridge.c b/reactos/drivers/bus/pcix/pci/ppbridge.c index 7881f1dc448..26cbb30ea7d 100644 --- a/reactos/drivers/bus/pcix/pci/ppbridge.c +++ b/reactos/drivers/bus/pcix/pci/ppbridge.c @@ -671,8 +671,7 @@ NTAPI PPBridge_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID diff --git a/reactos/drivers/bus/pcix/pcivrify.c b/reactos/drivers/bus/pcix/pcivrify.c index 1d04ee73dd9..3e4a4ed36a3 100644 --- a/reactos/drivers/bus/pcix/pcivrify.c +++ b/reactos/drivers/bus/pcix/pcivrify.c @@ -79,8 +79,7 @@ PciVerifierProfileChangeCallback(IN PVOID NotificationStructure, IN PVOID Context) { /* This function is not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } diff --git a/reactos/drivers/bus/pcix/pdo.c b/reactos/drivers/bus/pcix/pdo.c index 7a647d6eca8..9d06b6fbe3a 100644 --- a/reactos/drivers/bus/pcix/pdo.c +++ b/reactos/drivers/bus/pcix/pdo.c @@ -79,8 +79,7 @@ PciPdoWaitWake(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -100,8 +99,7 @@ PciPdoIrpQueryPower(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -218,8 +216,7 @@ PciPdoIrpRemoveDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -229,8 +226,7 @@ PciPdoIrpCancelRemoveDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -240,8 +236,7 @@ PciPdoIrpStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -251,8 +246,7 @@ PciPdoIrpQueryStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -262,8 +256,7 @@ PciPdoIrpCancelStopDevice(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -273,8 +266,7 @@ PciPdoIrpQueryInterface(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -404,8 +396,7 @@ PciPdoIrpReadConfig(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -415,8 +406,7 @@ PciPdoIrpWriteConfig(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -436,8 +426,7 @@ PciPdoIrpDeviceUsageNotification(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -447,8 +436,7 @@ PciPdoIrpSurpriseRemoval(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -458,8 +446,7 @@ PciPdoIrpQueryLegacyBusInformation(IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } diff --git a/reactos/drivers/bus/pcix/power.c b/reactos/drivers/bus/pcix/power.c index d52aab00ae6..ad1a8af4a91 100644 --- a/reactos/drivers/bus/pcix/power.c +++ b/reactos/drivers/bus/pcix/power.c @@ -191,8 +191,7 @@ PciSetPowerManagedDevicePowerState(IN PPCI_PDO_EXTENSION DeviceExtension, if (DeviceState < DeviceExtension->PowerState.CurrentDeviceState) { /* We would normally re-assign resources after powerup */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); Status = STATUS_NOT_IMPLEMENTED; } } diff --git a/reactos/drivers/bus/pcix/utils.c b/reactos/drivers/bus/pcix/utils.c index d7511f769cd..c16afaf1116 100644 --- a/reactos/drivers/bus/pcix/utils.c +++ b/reactos/drivers/bus/pcix/utils.c @@ -152,8 +152,7 @@ PciIsDatacenter(VOID) else { /* This scenario shouldn't happen yet, since SetupDD isn't used */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its setup device driver install program. Therefore this scenario must not happen!\n"); } /* Return if this is Datacenter or not */ @@ -757,8 +756,7 @@ PciIsDeviceOnDebugPath(IN PPCI_PDO_EXTENSION DeviceExtension) if (!PciDebugPortsCount) return FALSE; /* eVb has not been able to test such devices yet */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } diff --git a/reactos/hal/halx86/acpi/halpnpdd.c b/reactos/hal/halx86/acpi/halpnpdd.c index 37e13eea43c..5b7cac23311 100644 --- a/reactos/hal/halx86/acpi/halpnpdd.c +++ b/reactos/hal/halx86/acpi/halpnpdd.c @@ -813,8 +813,7 @@ NTAPI HalpDispatchWmi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("HAL: PnP Driver WMI!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("HAL: PnP Driver WMI!\n"); return STATUS_SUCCESS; } diff --git a/reactos/hal/halx86/generic/bios.c b/reactos/hal/halx86/generic/bios.c index fa159e09239..32157e0b601 100644 --- a/reactos/hal/halx86/generic/bios.c +++ b/reactos/hal/halx86/generic/bios.c @@ -217,8 +217,8 @@ HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) DPRINT1("HAL: Trap0D while not in V86 mode\n"); KiDumpTrapFrame(TrapFrame); - ASSERT(FALSE); - while (TRUE); + ERROR_FATAL(); + while (TRUE); /* 'noreturn' function */ } VOID diff --git a/reactos/hal/halx86/generic/misc.c b/reactos/hal/halx86/generic/misc.c index 87be9c8a5bd..5be07ed2db1 100644 --- a/reactos/hal/halx86/generic/misc.c +++ b/reactos/hal/halx86/generic/misc.c @@ -229,7 +229,7 @@ HalHandleNMI(IN PVOID NmiInfo) // // Don't recurse // - if (HalpNMIInProgress++) ASSERT(FALSE); // while (TRUE); + if (HalpNMIInProgress++) ERROR_DBGBREAK(); // // Read the system control register B diff --git a/reactos/hal/halx86/generic/spinlock.c b/reactos/hal/halx86/generic/spinlock.c index d9cf19b4e29..01512dc9a85 100644 --- a/reactos/hal/halx86/generic/spinlock.c +++ b/reactos/hal/halx86/generic/spinlock.c @@ -181,8 +181,7 @@ KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN PKIRQL OldIrql) { #ifdef CONFIG_SMP - ASSERT(FALSE); // FIXME: Unused - // while (TRUE); + ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused return FALSE; #endif @@ -206,8 +205,7 @@ KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, OUT PKIRQL OldIrql) { #ifdef CONFIG_SMP - ASSERT(FALSE); // FIXME: Unused - // while (TRUE); + ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused return FALSE; #endif diff --git a/reactos/hal/halx86/legacy/bus/cmosbus.c b/reactos/hal/halx86/legacy/bus/cmosbus.c index 5561284040f..24a36b01dea 100644 --- a/reactos/hal/halx86/legacy/bus/cmosbus.c +++ b/reactos/hal/halx86/legacy/bus/cmosbus.c @@ -25,8 +25,7 @@ HalpcGetCmosData(IN PBUS_HANDLER BusHandler, IN ULONG Offset, IN ULONG Length) { - DPRINT1("CMOS GetData\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("CMOS GetData\n"); return 0; } @@ -39,8 +38,7 @@ HalpcSetCmosData(IN PBUS_HANDLER BusHandler, IN ULONG Offset, IN ULONG Length) { - DPRINT1("CMOS SetData\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("CMOS SetData\n"); return 0; } diff --git a/reactos/hal/halx86/legacy/bus/pcibus.c b/reactos/hal/halx86/legacy/bus/pcibus.c index b1bde8a7178..d5656bf1444 100644 --- a/reactos/hal/halx86/legacy/bus/pcibus.c +++ b/reactos/hal/halx86/legacy/bus/pcibus.c @@ -536,8 +536,7 @@ HalpPCIPin2ISALine(IN PBUS_HANDLER BusHandler, IN PCI_SLOT_NUMBER SlotNumber, IN PPCI_COMMON_CONFIG PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -548,8 +547,7 @@ HalpPCIISALine2Pin(IN PBUS_HANDLER BusHandler, IN PPCI_COMMON_CONFIG PciNewData, IN PPCI_COMMON_CONFIG PciOldData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -641,10 +639,8 @@ HalpRegisterPciDebuggingDeviceInfo(VOID) if (!Found) return; /* FIXME: TODO */ - DPRINT1("You have implemented the KD routines for searching PCI debugger" - "devices, but you have forgotten to implement this routine\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("You have implemented the KD routines for searching PCI debugger" + "devices, but you have forgotten to implement this routine\n"); } static ULONG NTAPI @@ -678,8 +674,7 @@ HalpAdjustPCIResourceList(IN PBUS_HANDLER BusHandler, if (HalpPciLockSettings) { /* /PCILOCK is not yet supported */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("/PCILOCK boot switch is not yet supported."); } #endif /* Now create the correct resource list based on the supported bus ranges */ diff --git a/reactos/hal/halx86/legacy/halpnpdd.c b/reactos/hal/halx86/legacy/halpnpdd.c index c79a9a387f6..6c25d3e082a 100644 --- a/reactos/hal/halx86/legacy/halpnpdd.c +++ b/reactos/hal/halx86/legacy/halpnpdd.c @@ -811,8 +811,7 @@ NTAPI HalpDispatchWmi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("HAL: PnP Driver WMI!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("HAL: PnP Driver WMI!\n"); return STATUS_SUCCESS; } diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h index c08b7dfc2f7..a98dc3c9bc9 100644 --- a/reactos/include/reactos/debug.h +++ b/reactos/include/reactos/debug.h @@ -15,7 +15,7 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -/* Define DbgPrint/DbgPrintEx/RtlAssert/RtlRaiseStatus unless the NDK is used */ +/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) /* Make sure we have basic types (some people include us *before* SDK)... */ @@ -51,31 +51,8 @@ RtlAssert( PCHAR Message ); -/* - * This is the definition of NTSTATUS, but renamed - * in order not to conflict with other ones. - */ -typedef _Return_type_success_(return >= 0) LONG DEBUG_NTSTATUS; - -__analysis_noreturn -NTSYSAPI -VOID -NTAPI -RtlRaiseStatus( - _In_ DEBUG_NTSTATUS Status -); - #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */ - -/* Fix usage of RtlRaiseStatus */ -#if !defined(_RTLFUNCS_H) && defined(_NTDDK_) - #define RaiseStatus ExRaiseStatus -#else - #define RaiseStatus RtlRaiseStatus -#endif /* !defined(_RTLFUNCS_H) && defined(_NTDDK_) */ - - #ifndef assert #ifndef NASSERT #define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } @@ -160,6 +137,37 @@ RtlRaiseStatus( #endif /* not DBG */ /******************************************************************************/ +/* + * Declare a target-dependent process termination procedure. + */ +#ifndef _NTDDK_ /* User-Mode */ + #ifndef NTOS_MODE_USER /* Should be Win32 */ + #ifndef _WIN32 + #error "Unsupported target." + #else + #define TerminateCurrentProcess(Status) TerminateProcess(GetCurrentProcess(), (Status)) + #endif + #else /* Native */ + #ifndef _PSFUNCS_H + NTSYSCALLAPI + NTSTATUS + NTAPI + NtTerminateProcess( + IN HANDLE ProcessHandle, + IN NTSTATUS ExitStatus + ); + #endif + #ifndef NtCurrentProcess + #define NtCurrentProcess() ((HANDLE)(LONG_PTR)-1) + #endif + #define TerminateCurrentProcess(Status) NtTerminateProcess(NtCurrentProcess(), (Status)) + #endif +#else /* Kernel-Mode */ + #include + #define TerminateCurrentProcess(Status) KeBugCheckEx(CRITICAL_SERVICE_FAILED, (Status), 0, 0, 0) +#endif + + /* For internal purposes only */ #define __ERROR_DBGBREAK(...) \ do { \ @@ -168,10 +176,11 @@ do { \ } while (0) /* For internal purposes only */ -#define __ERROR_FATAL(Status, ...) \ -do { \ - DbgPrint("" __VA_ARGS__); \ - RaiseStatus((Status)); \ +#define __ERROR_FATAL(Status, ...) \ +do { \ + DbgPrint("" __VA_ARGS__); \ + DbgBreakPoint(); \ + TerminateCurrentProcess(Status); \ } while (0) /* From 5e30ff83851520d2babf3bc749e4c1e0cb9df595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 10 Jan 2013 01:49:15 +0000 Subject: [PATCH 03/71] [PCIX] Fix a comment. svn path=/trunk/; revision=58155 --- reactos/drivers/bus/pcix/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/drivers/bus/pcix/utils.c b/reactos/drivers/bus/pcix/utils.c index c16afaf1116..bca16f24303 100644 --- a/reactos/drivers/bus/pcix/utils.c +++ b/reactos/drivers/bus/pcix/utils.c @@ -152,7 +152,7 @@ PciIsDatacenter(VOID) else { /* This scenario shouldn't happen yet, since SetupDD isn't used */ - UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its setup device driver install program. Therefore this scenario must not happen!\n"); + UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its installation program. Therefore this scenario must not happen!\n"); } /* Return if this is Datacenter or not */ From 3f0a0ef2c3a2e09730815ba9baa6ec4f2d683e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 10 Jan 2013 02:18:25 +0000 Subject: [PATCH 04/71] [REGEDIT] Fix error strings placeholders (the '%s' e.g.) broken by changes in r58085. svn path=/trunk/; revision=58156 --- reactos/base/applications/regedit/lang/bg-BG.rc | 8 ++++---- reactos/base/applications/regedit/lang/cs-CZ.rc | 8 ++++---- reactos/base/applications/regedit/lang/de-DE.rc | 8 ++++---- reactos/base/applications/regedit/lang/el-GR.rc | 8 ++++---- reactos/base/applications/regedit/lang/en-US.rc | 8 ++++---- reactos/base/applications/regedit/lang/es-ES.rc | 8 ++++---- reactos/base/applications/regedit/lang/fr-FR.rc | 8 ++++---- reactos/base/applications/regedit/lang/hu-HU.rc | 8 ++++---- reactos/base/applications/regedit/lang/id-ID.rc | 8 ++++---- reactos/base/applications/regedit/lang/it-IT.rc | 8 ++++---- reactos/base/applications/regedit/lang/ja-JP.rc | 8 ++++---- reactos/base/applications/regedit/lang/ko-KR.rc | 8 ++++---- reactos/base/applications/regedit/lang/nl-NL.rc | 8 ++++---- reactos/base/applications/regedit/lang/no-NO.rc | 8 ++++---- reactos/base/applications/regedit/lang/pl-PL.rc | 8 ++++---- reactos/base/applications/regedit/lang/pt-BR.rc | 8 ++++---- reactos/base/applications/regedit/lang/pt-PT.rc | 8 ++++---- reactos/base/applications/regedit/lang/ro-RO.rc | 8 ++++---- reactos/base/applications/regedit/lang/ru-RU.rc | 8 ++++---- reactos/base/applications/regedit/lang/sk-SK.rc | 8 ++++---- reactos/base/applications/regedit/lang/sl-SI.rc | 8 ++++---- reactos/base/applications/regedit/lang/sv-SE.rc | 8 ++++---- reactos/base/applications/regedit/lang/th-TH.rc | 8 ++++---- reactos/base/applications/regedit/lang/uk-UA.rc | 8 ++++---- reactos/base/applications/regedit/lang/zh-CN.rc | 8 ++++---- reactos/base/applications/regedit/lang/zh-TW.rc | 8 ++++---- 26 files changed, 104 insertions(+), 104 deletions(-) diff --git a/reactos/base/applications/regedit/lang/bg-BG.rc b/reactos/base/applications/regedit/lang/bg-BG.rc index 9a89e74cd93..19a8243b96b 100644 --- a/reactos/base/applications/regedit/lang/bg-BG.rc +++ b/reactos/base/applications/regedit/lang/bg-BG.rc @@ -449,10 +449,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/cs-CZ.rc b/reactos/base/applications/regedit/lang/cs-CZ.rc index 859a87f00df..ffece4dde81 100644 --- a/reactos/base/applications/regedit/lang/cs-CZ.rc +++ b/reactos/base/applications/regedit/lang/cs-CZ.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/de-DE.rc b/reactos/base/applications/regedit/lang/de-DE.rc index 6087fdc3a3d..04f778e851a 100644 --- a/reactos/base/applications/regedit/lang/de-DE.rc +++ b/reactos/base/applications/regedit/lang/de-DE.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/el-GR.rc b/reactos/base/applications/regedit/lang/el-GR.rc index 5ef7ffacb5e..f6ace36961b 100644 --- a/reactos/base/applications/regedit/lang/el-GR.rc +++ b/reactos/base/applications/regedit/lang/el-GR.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/en-US.rc b/reactos/base/applications/regedit/lang/en-US.rc index db5e0f4a1f1..33c7f5f9f7e 100644 --- a/reactos/base/applications/regedit/lang/en-US.rc +++ b/reactos/base/applications/regedit/lang/en-US.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/es-ES.rc b/reactos/base/applications/regedit/lang/es-ES.rc index 781b47c204d..14addd7d07c 100644 --- a/reactos/base/applications/regedit/lang/es-ES.rc +++ b/reactos/base/applications/regedit/lang/es-ES.rc @@ -437,10 +437,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/fr-FR.rc b/reactos/base/applications/regedit/lang/fr-FR.rc index a17cbce4b27..62d06533159 100644 --- a/reactos/base/applications/regedit/lang/fr-FR.rc +++ b/reactos/base/applications/regedit/lang/fr-FR.rc @@ -430,10 +430,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants.\nSi vous n'êtes pas sûr de la source de ces informations dans '%1', ne les ajoutez pas au Registre.\n\nÊtes-vous sûr de vouloir continuer ?" - IDS_IMPORT_OK "Les clés et valeurs contenues dans '%1' ont été correctement ajoutées au Registre." - IDS_IMPORT_ERROR "Impossible d'importer '%1' à la suite d'une erreur lors de la lecture de ce fichier. Il s'agit d'une erreur disque, ou le fichier est endommagé." - IDS_EXPORT_ERROR "Impossible d'exporter dans le fichier '%1' à la suite d'une erreur lors de sa création ou d'une tentative d'écriture, pouvant être due à une erreur de disque ou de système de fichiers." + IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants.\nSi vous n'êtes pas sûr de la source de ces informations dans '%s', ne les ajoutez pas au Registre.\n\nÊtes-vous sûr de vouloir continuer ?" + IDS_IMPORT_OK "Les clés et valeurs contenues dans '%s' ont été correctement ajoutées au Registre." + IDS_IMPORT_ERROR "Impossible d'importer '%s' à la suite d'une erreur lors de la lecture de ce fichier. Il s'agit d'une erreur disque, ou le fichier est endommagé." + IDS_EXPORT_ERROR "Impossible d'exporter dans le fichier '%s' à la suite d'une erreur lors de sa création ou d'une tentative d'écriture, pouvant être due à une erreur de disque ou de système de fichiers." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/hu-HU.rc b/reactos/base/applications/regedit/lang/hu-HU.rc index e17cee0e98a..e299293482b 100644 --- a/reactos/base/applications/regedit/lang/hu-HU.rc +++ b/reactos/base/applications/regedit/lang/hu-HU.rc @@ -435,10 +435,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/id-ID.rc b/reactos/base/applications/regedit/lang/id-ID.rc index c10b1044197..1c628cc4119 100644 --- a/reactos/base/applications/regedit/lang/id-ID.rc +++ b/reactos/base/applications/regedit/lang/id-ID.rc @@ -433,10 +433,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/it-IT.rc b/reactos/base/applications/regedit/lang/it-IT.rc index dbe3168b69b..cc4d1509581 100644 --- a/reactos/base/applications/regedit/lang/it-IT.rc +++ b/reactos/base/applications/regedit/lang/it-IT.rc @@ -436,10 +436,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/ja-JP.rc b/reactos/base/applications/regedit/lang/ja-JP.rc index 7cb11142b46..bda2023af57 100644 --- a/reactos/base/applications/regedit/lang/ja-JP.rc +++ b/reactos/base/applications/regedit/lang/ja-JP.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/ko-KR.rc b/reactos/base/applications/regedit/lang/ko-KR.rc index e56320ae3e4..fd371da8295 100644 --- a/reactos/base/applications/regedit/lang/ko-KR.rc +++ b/reactos/base/applications/regedit/lang/ko-KR.rc @@ -419,10 +419,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/nl-NL.rc b/reactos/base/applications/regedit/lang/nl-NL.rc index fe77fb233bb..dfcc4cfdd6b 100644 --- a/reactos/base/applications/regedit/lang/nl-NL.rc +++ b/reactos/base/applications/regedit/lang/nl-NL.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/no-NO.rc b/reactos/base/applications/regedit/lang/no-NO.rc index 85e3715c82d..083c0cf7321 100644 --- a/reactos/base/applications/regedit/lang/no-NO.rc +++ b/reactos/base/applications/regedit/lang/no-NO.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/pl-PL.rc b/reactos/base/applications/regedit/lang/pl-PL.rc index e19ba7cb92b..58a2af06e26 100644 --- a/reactos/base/applications/regedit/lang/pl-PL.rc +++ b/reactos/base/applications/regedit/lang/pl-PL.rc @@ -441,10 +441,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/pt-BR.rc b/reactos/base/applications/regedit/lang/pt-BR.rc index 08b57f0bce2..85bb32abacb 100644 --- a/reactos/base/applications/regedit/lang/pt-BR.rc +++ b/reactos/base/applications/regedit/lang/pt-BR.rc @@ -435,10 +435,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/pt-PT.rc b/reactos/base/applications/regedit/lang/pt-PT.rc index 95335f123da..ced0bcc8c6a 100644 --- a/reactos/base/applications/regedit/lang/pt-PT.rc +++ b/reactos/base/applications/regedit/lang/pt-PT.rc @@ -436,10 +436,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/ro-RO.rc b/reactos/base/applications/regedit/lang/ro-RO.rc index 6e204b63aa7..c8264be8b5a 100644 --- a/reactos/base/applications/regedit/lang/ro-RO.rc +++ b/reactos/base/applications/regedit/lang/ro-RO.rc @@ -432,10 +432,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/ru-RU.rc b/reactos/base/applications/regedit/lang/ru-RU.rc index 459214b18b1..efb10f9989d 100644 --- a/reactos/base/applications/regedit/lang/ru-RU.rc +++ b/reactos/base/applications/regedit/lang/ru-RU.rc @@ -431,10 +431,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/sk-SK.rc b/reactos/base/applications/regedit/lang/sk-SK.rc index 88a3967fdc4..b5de43b4234 100644 --- a/reactos/base/applications/regedit/lang/sk-SK.rc +++ b/reactos/base/applications/regedit/lang/sk-SK.rc @@ -419,10 +419,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/sl-SI.rc b/reactos/base/applications/regedit/lang/sl-SI.rc index 04bdec5b2db..d1598c2455f 100644 --- a/reactos/base/applications/regedit/lang/sl-SI.rc +++ b/reactos/base/applications/regedit/lang/sl-SI.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/sv-SE.rc b/reactos/base/applications/regedit/lang/sv-SE.rc index b682c0e0f2e..b371820479e 100644 --- a/reactos/base/applications/regedit/lang/sv-SE.rc +++ b/reactos/base/applications/regedit/lang/sv-SE.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/th-TH.rc b/reactos/base/applications/regedit/lang/th-TH.rc index 792748fb745..47bac7ad3ea 100644 --- a/reactos/base/applications/regedit/lang/th-TH.rc +++ b/reactos/base/applications/regedit/lang/th-TH.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/uk-UA.rc b/reactos/base/applications/regedit/lang/uk-UA.rc index 03efe7afe0a..934091fcc11 100644 --- a/reactos/base/applications/regedit/lang/uk-UA.rc +++ b/reactos/base/applications/regedit/lang/uk-UA.rc @@ -435,10 +435,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/zh-CN.rc b/reactos/base/applications/regedit/lang/zh-CN.rc index 15b65f4bf4e..3c6e45bdb40 100644 --- a/reactos/base/applications/regedit/lang/zh-CN.rc +++ b/reactos/base/applications/regedit/lang/zh-CN.rc @@ -434,10 +434,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE diff --git a/reactos/base/applications/regedit/lang/zh-TW.rc b/reactos/base/applications/regedit/lang/zh-TW.rc index 23f3c943a5e..348c2188a9b 100644 --- a/reactos/base/applications/regedit/lang/zh-TW.rc +++ b/reactos/base/applications/regedit/lang/zh-TW.rc @@ -435,10 +435,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE From 741b1a9b33b81f774aaec1be999f4d921f7c4419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 11 Jan 2013 22:35:44 +0000 Subject: [PATCH 05/71] =?UTF-8?q?[CRT]=20Add=20an=20error=20icon=20to=20th?= =?UTF-8?q?e=20C=20Runtime=20termination=20message=20box.=20Patch=20by=20L?= =?UTF-8?q?ee=20Schr=C3=B6der.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CORE-6886 #resolve #comment Committed in r58157, thanks :) svn path=/trunk/; revision=58157 --- reactos/lib/sdk/crt/stdlib/abort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/lib/sdk/crt/stdlib/abort.c b/reactos/lib/sdk/crt/stdlib/abort.c index 3a3abb67c58..dae41dc70d5 100644 --- a/reactos/lib/sdk/crt/stdlib/abort.c +++ b/reactos/lib/sdk/crt/stdlib/abort.c @@ -33,7 +33,7 @@ abort ( (msvcrt_error_mode == _OUT_TO_MSGBOX)) { /* Output a message box */ - __crt_MessageBoxA(abort_msg, MB_OK); + __crt_MessageBoxA(abort_msg, MB_OK | MB_ICONERROR); } else { From 542200a48d51c5643483005dbb22fe3728d27162 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 12 Jan 2013 15:30:28 +0000 Subject: [PATCH 06/71] [SAMSRV] - Implement SamrAddMemberToGroup and SamrRemoveMemberFromGroup partially. - Constify some parameters. svn path=/trunk/; revision=58159 --- reactos/dll/win32/samsrv/CMakeLists.txt | 1 + reactos/dll/win32/samsrv/database.c | 2 +- reactos/dll/win32/samsrv/group.c | 154 ++++++++++++++++++++++++ reactos/dll/win32/samsrv/registry.c | 6 +- reactos/dll/win32/samsrv/samrpc.c | 82 ++++++++----- reactos/dll/win32/samsrv/samsrv.h | 32 ++++- 6 files changed, 240 insertions(+), 37 deletions(-) create mode 100644 reactos/dll/win32/samsrv/group.c diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt index bdc88e0a55f..d52210a2621 100644 --- a/reactos/dll/win32/samsrv/CMakeLists.txt +++ b/reactos/dll/win32/samsrv/CMakeLists.txt @@ -9,6 +9,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE database.c + group.c registry.c samrpc.c samsrv.c diff --git a/reactos/dll/win32/samsrv/database.c b/reactos/dll/win32/samsrv/database.c index 59b99697dad..94e725230f5 100644 --- a/reactos/dll/win32/samsrv/database.c +++ b/reactos/dll/win32/samsrv/database.c @@ -555,7 +555,7 @@ done: NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPWSTR lpAccountName) + IN LPCWSTR lpAccountName) { HANDLE AccountKey; HANDLE NamesKey; diff --git a/reactos/dll/win32/samsrv/group.c b/reactos/dll/win32/samsrv/group.c new file mode 100644 index 00000000000..696beb4e5a8 --- /dev/null +++ b/reactos/dll/win32/samsrv/group.c @@ -0,0 +1,154 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/group.c + * PURPOSE: Group specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + + +NTSTATUS +SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId) +{ + PULONG MembersBuffer = NULL; + ULONG MembersCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + MembersBuffer = midl_user_allocate(Length + sizeof(ULONG)); + if (MembersBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + MembersBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + MembersCount = Length / sizeof(ULONG); + } + + for (i = 0; i < MembersCount; i++) + { + if (MembersBuffer[i] == MemberId) + { + Status = STATUS_MEMBER_IN_GROUP; + goto done; + } + } + + MembersBuffer[MembersCount] = MemberId; + Length += sizeof(ULONG); + + Status = SampSetObjectAttribute(GroupObject, + L"Members", + REG_BINARY, + MembersBuffer, + Length); + +done: + if (MembersBuffer != NULL) + midl_user_free(MembersBuffer); + + return Status; +} + + +NTSTATUS +SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId) +{ + PULONG MembersBuffer = NULL; + ULONG MembersCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_MEMBER_NOT_IN_GROUP; + + if (!NT_SUCCESS(Status)) + return Status; + + MembersBuffer = midl_user_allocate(Length); + if (MembersBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + MembersBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Status = STATUS_MEMBER_NOT_IN_GROUP; + + MembersCount = Length / sizeof(ULONG); + for (i = 0; i < MembersCount; i++) + { + if (MembersBuffer[i] == MemberId) + { + Length -= sizeof(ULONG); + Status = STATUS_SUCCESS; + break; + } + + if (Status == STATUS_SUCCESS && i < MembersCount - 1) + { + MembersBuffer[i] = MembersBuffer[i + 1]; + } + } + + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttribute(GroupObject, + L"Members", + REG_BINARY, + MembersBuffer, + Length); + +done: + if (MembersBuffer != NULL) + midl_user_free(MembersBuffer); + + return Status; +} + +/* EOF */ diff --git a/reactos/dll/win32/samsrv/registry.c b/reactos/dll/win32/samsrv/registry.c index ed172edaec4..e00963213f7 100644 --- a/reactos/dll/win32/samsrv/registry.c +++ b/reactos/dll/win32/samsrv/registry.c @@ -202,7 +202,7 @@ SampRegQueryKeyInfo(IN HANDLE KeyHandle, NTSTATUS SampRegDeleteValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName) + IN LPCWSTR ValueName) { UNICODE_STRING Name; @@ -322,7 +322,7 @@ done: NTSTATUS SampRegQueryValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, OUT PULONG Type OPTIONAL, OUT PVOID Data OPTIONAL, IN OUT PULONG DataLength OPTIONAL) @@ -392,7 +392,7 @@ SampRegQueryValue(IN HANDLE KeyHandle, NTSTATUS SampRegSetValue(HANDLE KeyHandle, - LPWSTR ValueName, + LPCWSTR ValueName, ULONG Type, LPVOID Data, ULONG DataLength) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index d996c8c68d6..6c522d6d4c2 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -191,7 +191,7 @@ NTSTATUS NTAPI SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, IN SECURITY_INFORMATION SecurityInformation, - OUT PSAMPR_SR_SECURITY_DESCRIPTOR * SecurityDescriptor) + OUT PSAMPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3593,8 +3593,8 @@ SampQueryGroupGeneral(PSAM_DB_OBJECT GroupObject, PSAMPR_GROUP_INFO_BUFFER *Buffer) { PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; - HANDLE MembersKeyHandle = NULL; SAM_GROUP_FIXED_DATA FixedData; + ULONG MembersLength = 0; ULONG Length = 0; NTSTATUS Status; @@ -3633,33 +3633,22 @@ SampQueryGroupGeneral(PSAM_DB_OBJECT GroupObject, InfoBuffer->General.Attributes = FixedData.Attributes; - /* Open the Members subkey */ - Status = SampRegOpenKey(GroupObject->KeyHandle, - L"Members", - KEY_READ, - &MembersKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("Status 0x%08lx\n", Status); + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &MembersLength); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) goto done; - } - /* Retrieve the number of members of the alias */ - Status = SampRegQueryKeyInfo(MembersKeyHandle, - NULL, - &InfoBuffer->General.MemberCount); - if (!NT_SUCCESS(Status)) - { - TRACE("Status 0x%08lx\n", Status); - goto done; - } + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + InfoBuffer->General.MemberCount = 0; + else + InfoBuffer->General.MemberCount = MembersLength / sizeof(ULONG); *Buffer = InfoBuffer; done: - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - if (!NT_SUCCESS(Status)) { if (InfoBuffer != NULL) @@ -3941,10 +3930,29 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long MemberId, IN unsigned long Attributes) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("(%p %lu %lx)\n", + GroupHandle, MemberId, Attributes); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_ADD_MEMBER, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* FIXME: Add group membership to the user object */ + + Status = SampAddMemberToGroup(GroupObject, + MemberId); + + return Status; } + /* Function 21 */ NTSTATUS NTAPI @@ -3954,16 +3962,36 @@ SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) return STATUS_NOT_IMPLEMENTED; } + /* Function 24 */ NTSTATUS NTAPI SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long MemberId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("(%p %lu)\n", + GroupHandle, MemberId); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_REMOVE_MEMBER, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* FIXME: Remove group membership from the user object */ + + Status = SampRemoveMemberFromGroup(GroupObject, + MemberId); + + return Status; } + /* Function 25 */ NTSTATUS NTAPI diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index 609a4029bd7..55db546537a 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Security Account Manager (LSA) Server + * PROJECT: Security Account Manager (SAM) Server * FILE: reactos/dll/win32/samsrv/samsrv.h * PURPOSE: Common header file * @@ -109,6 +109,7 @@ typedef struct _SAM_USER_FIXED_DATA USHORT OperatorCount; } SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA; + /* database.c */ NTSTATUS @@ -143,7 +144,7 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject); NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPWSTR lpAccountName); + IN LPCWSTR lpAccountName); NTSTATUS SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, @@ -170,7 +171,20 @@ SampGetObjectAttributeString(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, RPC_UNICODE_STRING *String); + +/* group.h */ + +NTSTATUS +SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId); + +NTSTATUS +SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId); + + /* registry.h */ + NTSTATUS SampRegCloseKey(IN HANDLE KeyHandle); @@ -203,7 +217,7 @@ SampRegQueryKeyInfo(IN HANDLE KeyHandle, NTSTATUS SampRegDeleteValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName); + IN LPCWSTR ValueName); NTSTATUS SampRegEnumerateValue(IN HANDLE KeyHandle, @@ -216,21 +230,27 @@ SampRegEnumerateValue(IN HANDLE KeyHandle, NTSTATUS SampRegQueryValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, OUT PULONG Type OPTIONAL, OUT LPVOID Data OPTIONAL, IN OUT PULONG DataLength OPTIONAL); NTSTATUS SampRegSetValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, IN ULONG Type, IN LPVOID Data, IN ULONG DataLength); + /* samspc.c */ + VOID SampStartRpcServer(VOID); + /* setup.c */ + BOOL SampIsSetupRunning(VOID); -BOOL SampInitializeSAM(VOID); \ No newline at end of file +BOOL SampInitializeSAM(VOID); + +/* EOF */ From 23174045bf1f7f20012c86192d00d7b6303f9216 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 12 Jan 2013 16:22:46 +0000 Subject: [PATCH 07/71] [SAMSRV] - Move domain specific helper functions to a separate file. - Implement SampRemoveAccountNameFromDomain. svn path=/trunk/; revision=58160 --- reactos/dll/win32/samsrv/CMakeLists.txt | 1 + reactos/dll/win32/samsrv/database.c | 184 ----------------- reactos/dll/win32/samsrv/domain.c | 259 ++++++++++++++++++++++++ reactos/dll/win32/samsrv/samsrv.h | 30 ++- 4 files changed, 279 insertions(+), 195 deletions(-) create mode 100644 reactos/dll/win32/samsrv/domain.c diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt index d52210a2621..81969d98f72 100644 --- a/reactos/dll/win32/samsrv/CMakeLists.txt +++ b/reactos/dll/win32/samsrv/CMakeLists.txt @@ -9,6 +9,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE database.c + domain.c group.c registry.c samrpc.c diff --git a/reactos/dll/win32/samsrv/database.c b/reactos/dll/win32/samsrv/database.c index 94e725230f5..34f55674081 100644 --- a/reactos/dll/win32/samsrv/database.c +++ b/reactos/dll/win32/samsrv/database.c @@ -487,190 +487,6 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject) } -NTSTATUS -SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAccountName, - IN ULONG ulRelativeId) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE ContainerKeyHandle = NULL; - HANDLE NamesKeyHandle = NULL; - NTSTATUS Status; - - TRACE("SampSetAccountNameInDomain()\n"); - - /* Open the container key */ - RtlInitUnicodeString(&KeyName, lpContainerName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DomainObject->KeyHandle, - NULL); - - Status = NtOpenKey(&ContainerKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - /* Open the 'Names' key */ - RtlInitUnicodeString(&KeyName, L"Names"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ContainerKeyHandle, - NULL); - - Status = NtOpenKey(&NamesKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - goto done; - - /* Set the alias value */ - RtlInitUnicodeString(&ValueName, lpAccountName); - - Status = NtSetValueKey(NamesKeyHandle, - &ValueName, - 0, - REG_DWORD, - (LPVOID)&ulRelativeId, - sizeof(ULONG)); - -done: - if (NamesKeyHandle) - NtClose(NamesKeyHandle); - - if (ContainerKeyHandle) - NtClose(ContainerKeyHandle); - - return Status; -} - - -NTSTATUS -SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpAccountName) -{ - HANDLE AccountKey; - HANDLE NamesKey; - NTSTATUS Status; - - TRACE("SampCheckAccountNameInDomain()\n"); - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Aliases", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for alias account failed (Status 0x%08lx)\n", Status); - return Status; - } - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Groups", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for group account failed (Status 0x%08lx)\n", Status); - return Status; - } - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Users", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for user account failed (Status 0x%08lx)\n", Status); - } - - return Status; -} - - NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, diff --git a/reactos/dll/win32/samsrv/domain.c b/reactos/dll/win32/samsrv/domain.c new file mode 100644 index 00000000000..9c7811f81ed --- /dev/null +++ b/reactos/dll/win32/samsrv/domain.c @@ -0,0 +1,259 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/domain.c + * PURPOSE: Domain specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + TRACE("SampSetAccountNameInDomain()\n"); + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the alias value */ + RtlInitUnicodeString(&ValueName, lpAccountName); + + Status = NtSetValueKey(NamesKeyHandle, + &ValueName, + 0, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampRemoveAccountNameFromDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + TRACE("(%S %S)\n", lpContainerName, lpAccountName); + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Delete the account name value */ + Status = SampRegDeleteValue(NamesKeyHandle, + lpAccountName); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpAccountName) +{ + HANDLE AccountKey; + HANDLE NamesKey; + NTSTATUS Status; + + TRACE("SampCheckAccountNameInDomain()\n"); + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for alias account failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for group account failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Users", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for user account failed (Status 0x%08lx)\n", Status); + } + + return Status; +} + +/* EOF */ diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index 55db546537a..b25f69d8462 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Security Account Manager (SAM) Server + * PROJECT: Security Account Manager (LSA) Server * FILE: reactos/dll/win32/samsrv/samsrv.h * PURPOSE: Common header file * @@ -142,16 +142,6 @@ SampValidateDbObject(SAMPR_HANDLE Handle, NTSTATUS SampCloseDbObject(PSAM_DB_OBJECT DbObject); -NTSTATUS -SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpAccountName); - -NTSTATUS -SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAccountName, - IN ULONG ulRelativeId); - NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, @@ -172,6 +162,24 @@ SampGetObjectAttributeString(PSAM_DB_OBJECT DbObject, RPC_UNICODE_STRING *String); +/* domain.c */ + +NTSTATUS +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId); + +NTSTATUS +SampRemoveAccountNameFromDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName); + +NTSTATUS +SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpAccountName); + + /* group.h */ NTSTATUS From b9272a3090ff0b4e302348284409ea34a5705da5 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 12 Jan 2013 21:32:26 +0000 Subject: [PATCH 08/71] [SAMSRV] - SamrAddMemberToGroup: Add the group membership to the user object. - SamrRemoveMemberFromGroup: Remove the group membership from the user object. svn path=/trunk/; revision=58161 --- reactos/dll/win32/samsrv/CMakeLists.txt | 1 + reactos/dll/win32/samsrv/samrpc.c | 61 +++++++- reactos/dll/win32/samsrv/samsrv.h | 18 +++ reactos/dll/win32/samsrv/user.c | 188 ++++++++++++++++++++++++ 4 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 reactos/dll/win32/samsrv/user.c diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt index 81969d98f72..f242a36a4a5 100644 --- a/reactos/dll/win32/samsrv/CMakeLists.txt +++ b/reactos/dll/win32/samsrv/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE samrpc.c samsrv.c setup.c + user.c samsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 6c522d6d4c2..33db795d9e3 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -3931,6 +3931,7 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long Attributes) { PSAM_DB_OBJECT GroupObject; + PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; TRACE("(%p %lu %lx)\n", @@ -3944,10 +3945,38 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, if (!NT_SUCCESS(Status)) return Status; - /* FIXME: Add group membership to the user object */ + /* Open the user object in the same domain */ + Status = SampOpenUserObject(GroupObject->ParentObject, + MemberId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + ERR("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Add group membership to the user object */ + Status = SampAddGroupMembershipToUser(UserObject, + GroupObject->RelativeId, + Attributes); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Add the member to the group object */ Status = SampAddMemberToGroup(GroupObject, MemberId); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddMemberToGroup() failed (Status 0x%08lx)\n", Status); + } + +done: + if (UserObject) + SampCloseDbObject(UserObject); return Status; } @@ -3970,6 +3999,7 @@ SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long MemberId) { PSAM_DB_OBJECT GroupObject; + PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; TRACE("(%p %lu)\n", @@ -3983,10 +4013,37 @@ SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, if (!NT_SUCCESS(Status)) return Status; - /* FIXME: Remove group membership from the user object */ + /* Open the user object in the same domain */ + Status = SampOpenUserObject(GroupObject->ParentObject, + MemberId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + ERR("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Remove group membership from the user object */ + Status = SampRemoveGroupMembershipFromUser(UserObject, + GroupObject->RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove the member from the group object */ Status = SampRemoveMemberFromGroup(GroupObject, MemberId); + if (!NT_SUCCESS(Status)) + { + ERR("SampRemoveMemberFromGroup() failed (Status 0x%08lx)\n", Status); + } + +done: + if (UserObject) + SampCloseDbObject(UserObject); return Status; } diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index b25f69d8462..eab66474d3e 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -261,4 +261,22 @@ VOID SampStartRpcServer(VOID); BOOL SampIsSetupRunning(VOID); BOOL SampInitializeSAM(VOID); + +/* user.c */ + +NTSTATUS +SampOpenUserObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *UserObject); + +NTSTATUS +SampAddGroupMembershipToUser(PSAM_DB_OBJECT UserObject, + ULONG GroupId, + ULONG Attributes); + +NTSTATUS +SampRemoveGroupMembershipFromUser(PSAM_DB_OBJECT UserObject, + ULONG GroupId); + /* EOF */ diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c new file mode 100644 index 00000000000..be7042ee4bf --- /dev/null +++ b/reactos/dll/win32/samsrv/user.c @@ -0,0 +1,188 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/user.c + * PURPOSE: User specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenUserObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *UserObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, UserId, DesiredAccess, UserObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", UserId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Users", + szRid, + UserId, + SamDbUserObject, + DesiredAccess, + UserObject); +} + + +NTSTATUS +SampAddGroupMembershipToUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId, + IN ULONG Attributes) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG GroupsCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + TRACE("(%p %lu %lx)\n", + UserObject, GroupId, Attributes); + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + GroupsBuffer = midl_user_allocate(Length + sizeof(GROUP_MEMBERSHIP)); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + GroupsCount = Length / sizeof(GROUP_MEMBERSHIP); + } + + for (i = 0; i < GroupsCount; i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + Status = STATUS_MEMBER_IN_GROUP; + goto done; + } + } + + GroupsBuffer[GroupsCount].RelativeId = GroupId; + GroupsBuffer[GroupsCount].Attributes = Attributes; + Length += sizeof(GROUP_MEMBERSHIP); + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + GroupsBuffer, + Length); + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + + +NTSTATUS +SampRemoveGroupMembershipFromUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG GroupsCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + TRACE("(%p %lu)\n", + UserObject, GroupId); + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_MEMBER_NOT_IN_GROUP; + + if (!NT_SUCCESS(Status)) + return Status; + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Status = STATUS_MEMBER_NOT_IN_GROUP; + + GroupsCount = Length / sizeof(GROUP_MEMBERSHIP); + for (i = 0; i < GroupsCount; i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + Length -= sizeof(GROUP_MEMBERSHIP); + Status = STATUS_SUCCESS; + break; + } + + if (Status == STATUS_SUCCESS && i < GroupsCount - 1) + { + CopyMemory(&GroupsBuffer[i], + &GroupsBuffer[i + 1], + sizeof(GROUP_MEMBERSHIP)); + } + } + + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + GroupsBuffer, + Length); + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + +/* EOF */ From fc8c223f282431b3c5fbdb075715dfebfb6b2e23 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 13 Jan 2013 10:19:56 +0000 Subject: [PATCH 09/71] [SAMSRV] Implement SamrGetGroupsForUser. svn path=/trunk/; revision=58162 --- reactos/dll/win32/samsrv/samrpc.c | 97 +++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 33db795d9e3..27516bbab80 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -6562,16 +6562,101 @@ SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle, return STATUS_NOT_IMPLEMENTED; } + /* Function 39 */ NTSTATUS NTAPI SamrGetGroupsForUser(IN SAMPR_HANDLE UserHandle, OUT PSAMPR_GET_GROUPS_BUFFER *Groups) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAMPR_GET_GROUPS_BUFFER GroupsBuffer = NULL; + PSAM_DB_OBJECT UserObject; + ULONG Length = 0; + NTSTATUS Status; + + TRACE("SamrGetGroupsForUser(%p %p)\n", + UserHandle, Groups); + + /* Validate the domain handle */ + Status = SampValidateDbObject(UserHandle, + SamDbUserObject, + USER_LIST_GROUPS, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + /* Allocate the groups buffer */ + GroupsBuffer = midl_user_allocate(sizeof(SAMPR_GET_GROUPS_BUFFER)); + if (GroupsBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* + * Get the size of the Groups attribute. + * Do not check the status code because in case of an error + * Length will be 0. And that is all we need. + */ + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + /* If there is no Groups attribute, return a groups buffer without an array */ + if (Length == 0) + { + GroupsBuffer->MembershipCount = 0; + GroupsBuffer->Groups = NULL; + + *Groups = GroupsBuffer; + + return STATUS_SUCCESS; + } + + /* Allocate a buffer for the Groups attribute */ + GroupsBuffer->Groups = midl_user_allocate(Length); + if (GroupsBuffer->Groups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Retrieve the Grous attribute */ + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer->Groups, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed with status 0x%08lx\n", Status); + goto done; + } + + /* Calculate the membership count */ + GroupsBuffer->MembershipCount = Length / sizeof(GROUP_MEMBERSHIP); + + /* Return the groups buffer to the caller */ + *Groups = GroupsBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (GroupsBuffer != NULL) + { + if (GroupsBuffer->Groups != NULL) + midl_user_free(GroupsBuffer->Groups); + + midl_user_free(GroupsBuffer); + } + } + + return Status; } + /* Function 40 */ NTSTATUS NTAPI @@ -6772,10 +6857,10 @@ SamrCreateUser2InDomain(IN SAMPR_HANDLE DomainHandle, /* Store the fixed domain attributes */ Status = SampSetObjectAttribute(DomainObject, - L"F", - REG_BINARY, - &FixedDomainData, - ulSize); + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); From c7e752270c898f442dcf65891cb376719fa67dc0 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 13 Jan 2013 10:38:47 +0000 Subject: [PATCH 10/71] =?UTF-8?q?[EXPLORER=5FNEW]=20-=20Process=20autostar?= =?UTF-8?q?t=20registry=20entries.=20Patch=20by=20Edijs=20Kolesnikovi?= =?UTF-8?q?=C4=8Ds.=20CORE-6887?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=58163 --- .../base/shell/explorer-new/CMakeLists.txt | 1 + reactos/base/shell/explorer-new/explorer.c | 2 + reactos/base/shell/explorer-new/precomp.h | 6 + reactos/base/shell/explorer-new/startup.c | 347 ++++++++++++++++++ 4 files changed, 356 insertions(+) create mode 100644 reactos/base/shell/explorer-new/startup.c diff --git a/reactos/base/shell/explorer-new/CMakeLists.txt b/reactos/base/shell/explorer-new/CMakeLists.txt index 173c065bbfa..1bcc714fb0f 100644 --- a/reactos/base/shell/explorer-new/CMakeLists.txt +++ b/reactos/base/shell/explorer-new/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE explorer.c settings.c startmnu.c + startup.c taskband.c taskswnd.c tbsite.c diff --git a/reactos/base/shell/explorer-new/explorer.c b/reactos/base/shell/explorer-new/explorer.c index 61506e59574..0322a6c1f54 100644 --- a/reactos/base/shell/explorer-new/explorer.c +++ b/reactos/base/shell/explorer-new/explorer.c @@ -400,6 +400,8 @@ _tWinMain(IN HINSTANCE hInstance, /* WinXP: Notify msgina to hide the welcome screen */ if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + + startup(0, NULL); } else { diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h index fbeaec3defe..2ff7c74f4fa 100644 --- a/reactos/base/shell/explorer-new/precomp.h +++ b/reactos/base/shell/explorer-new/precomp.h @@ -256,6 +256,12 @@ SaveSettingDword(IN PCTSTR pszKeyName, IN PCTSTR pszValueName, IN DWORD dwValue); +/* + * startup.c + */ + +int startup(int argc, const char *argv[]); + /* * trayprop.h */ diff --git a/reactos/base/shell/explorer-new/startup.c b/reactos/base/shell/explorer-new/startup.c new file mode 100644 index 00000000000..a135201ccee --- /dev/null +++ b/reactos/base/shell/explorer-new/startup.c @@ -0,0 +1,347 @@ +/* + * Copyright (C) 2002 Andreas Mohr + * Copyright (C) 2002 Shachar Shemesh + * Copyright (C) 2013 Edijs Kolesnikovics + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* Based on the Wine "bootup" handler application + * + * This app handles the various "hooks" windows allows for applications to perform + * as part of the bootstrap process. Theses are roughly devided into three types. + * Knowledge base articles that explain this are 137367, 179365, 232487 and 232509. + * Also, 119941 has some info on grpconv.exe + * The operations performed are (by order of execution): + * + * Startup (before the user logs in) + * - Services (NT, ?semi-synchronous?, not implemented yet) + * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServicesOnce (9x, asynch) + * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices (9x, asynch) + * + * After log in + * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunOnce (all, synch) + * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run (all, asynch) + * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run (all, asynch) + * - Startup folders (all, ?asynch?, no imp) + * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce (all, asynch) + * + * Somewhere in there is processing the RunOnceEx entries (also no imp) + */ + +#include "precomp.h" + +EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); + +enum runkeys { + RUNKEY_RUN, RUNKEY_RUNONCE, RUNKEY_RUNSERVICES, RUNKEY_RUNSERVICESONCE +}; + +const WCHAR runkeys_names[][30]= +{ + {'R','u','n',0}, + {'R','u','n','O','n','c','e',0}, + {'R','u','n','S','e','r','v','i','c','e','s',0}, + {'R','u','n','S','e','r','v','i','c','e','s','O','n','c','e',0} +}; + +#define INVALID_RUNCMD_RETURN -1 +/** + * This function runs the specified command in the specified dir. + * [in,out] cmdline - the command line to run. The function may change the passed buffer. + * [in] dir - the dir to run the command in. If it is NULL, then the current dir is used. + * [in] wait - whether to wait for the run program to finish before returning. + * [in] minimized - Whether to ask the program to run minimized. + * + * Returns: + * If running the process failed, returns INVALID_RUNCMD_RETURN. Use GetLastError to get the error code. + * If wait is FALSE - returns 0 if successful. + * If wait is TRUE - returns the program's return value. + */ +static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) +{ + STARTUPINFOW si; + PROCESS_INFORMATION info; + DWORD exit_code = 0; + WCHAR szCmdLineExp[MAX_PATH+1] = L"\0"; + + ExpandEnvironmentStringsW(cmdline, szCmdLineExp, sizeof(szCmdLineExp) / sizeof(WCHAR)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + if (minimized) + { + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_MINIMIZE; + } + memset(&info, 0, sizeof(info)); + + if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) + { + printf("Failed to run command (%ld)\n", GetLastError()); + + return INVALID_RUNCMD_RETURN; + } + + printf("Successfully ran command\n"); + + if (wait) + { /* wait for the process to exit */ + WaitForSingleObject(info.hProcess, INFINITE); + GetExitCodeProcess(info.hProcess, &exit_code); + } + + CloseHandle(info.hThread); + CloseHandle(info.hProcess); + + return exit_code; +} + + +/** + * Process a "Run" type registry key. + * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is + * opened. + * szKeyName is the key holding the actual entries. + * bDelete tells whether we should delete each value right before executing it. + * bSynchronous tells whether we should wait for the prog to complete before + * going on to the next prog. + */ +static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, + BOOL bSynchronous) +{ + static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + HKEY hkWin = NULL, hkRun=NULL; + LONG res = ERROR_SUCCESS; + DWORD i, nMaxCmdLine = 0, nMaxValue = 0; + WCHAR *szCmdLine = NULL; + WCHAR *szValue = NULL; + + if (hkRoot == HKEY_LOCAL_MACHINE) + wprintf(L"processing %s entries under HKLM\n", szKeyName); + else + wprintf(L"processing %s entries under HKCU\n", szKeyName); + + if ((res = RegOpenKeyExW(hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin)) != ERROR_SUCCESS) + { + printf("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", + res); + + goto end; + } + + if ((res = RegOpenKeyExW(hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun))!= + ERROR_SUCCESS) + { + if (res == ERROR_FILE_NOT_FOUND) + { + printf("Key doesn't exist - nothing to be done\n"); + + res = ERROR_SUCCESS; + } + else + printf("RegOpenKey failed on run key (%ld)\n", res); + + goto end; + } + + if ((res = RegQueryInfoKeyW(hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, + &nMaxCmdLine, NULL, NULL)) != ERROR_SUCCESS) + { + printf("Couldn't query key info (%ld)\n", res); + + goto end; + } + + if (i == 0) + { + printf("No commands to execute.\n"); + + res = ERROR_SUCCESS; + goto end; + } + + if ((szCmdLine = malloc(nMaxCmdLine)) == NULL) + { + printf("Couldn't allocate memory for the commands to be executed\n"); + + res = ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + if ((szValue = malloc((++nMaxValue)*sizeof(*szValue))) == NULL) + { + printf("Couldn't allocate memory for the value names\n"); + + free(szCmdLine); + res = ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + while(i > 0) + { + DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; + DWORD type; + + --i; + + if ((res = RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type, + (LPBYTE)szCmdLine, &nDataLength)) != ERROR_SUCCESS) + { + printf("Couldn't read in value %ld - %ld\n", i, res); + + continue; + } + + /* safe mode - force to run if prefixed with asterisk */ + if (GetSystemMetrics(SM_CLEANBOOT) && (szValue[0] != L'*')) continue; + + if (bDelete && (res = RegDeleteValueW(hkRun, szValue)) != ERROR_SUCCESS) + { + printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res); + } + + if (type != REG_SZ) + { + printf("Incorrect type of value #%ld (%ld)\n", i, type); + + continue; + } + + if ((res = runCmd(szCmdLine, NULL, bSynchronous, FALSE)) == INVALID_RUNCMD_RETURN) + { + printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); + } + + printf("Done processing cmd #%ld\n", i); + } + + free(szValue); + free(szCmdLine); + res = ERROR_SUCCESS; + +end: + if (hkRun != NULL) + RegCloseKey(hkRun); + if (hkWin != NULL) + RegCloseKey(hkWin); + + printf("done\n"); + + return res == ERROR_SUCCESS ? TRUE : FALSE; +} + + /// structure holding startup flags +struct op_mask { + BOOL w9xonly; /* Perform only operations done on Windows 9x */ + BOOL ntonly; /* Perform only operations done on Windows NT */ + BOOL startup; /* Perform the operations that are performed every boot */ + BOOL preboot; /* Perform file renames typically done before the system starts */ + BOOL prelogin; /* Perform the operations typically done before the user logs in */ + BOOL postlogin; /* Operations done after login */ +}; + +static const struct op_mask + SESSION_START = {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE}, + SETUP = {FALSE, FALSE, FALSE, TRUE, TRUE, TRUE}; +#define DEFAULT SESSION_START + +int startup(int argc, const char *argv[]) +{ + struct op_mask ops; /* Which of the ops do we want to perform? */ + /* First, set the current directory to SystemRoot */ + TCHAR gen_path[MAX_PATH]; + DWORD res; + HKEY hSessionKey, hKey; + HRESULT hr; + + res = GetWindowsDirectory(gen_path, sizeof(gen_path)); + + if (res == 0) + { + printf("Couldn't get the windows directory - error %ld\n", + GetLastError()); + + return 100; + } + + if (!SetCurrentDirectory(gen_path)) + { + wprintf(L"Cannot set the dir to %s (%ld)\n", gen_path, GetLastError()); + + return 100; + } + + hr = SHCreateSessionKey(KEY_WRITE, &hSessionKey); + if (SUCCEEDED(hr)) + { + LONG Error; + DWORD dwDisp; + + Error = RegCreateKeyEx(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); + RegCloseKey(hSessionKey); + if (Error == ERROR_SUCCESS) + { + RegCloseKey(hKey); + if (dwDisp == REG_OPENED_EXISTING_KEY) + { + /* Startup programs has already been run */ + return 0; + } + } + } + + if (argc > 1) + { + switch(argv[1][0]) + { + case 'r': /* Restart */ + ops = SETUP; + break; + case 's': /* Full start */ + ops = SESSION_START; + break; + default: + ops = DEFAULT; + break; + } + } + else + ops = DEFAULT; + + /* do not run certain items in Safe Mode */ + if (GetSystemMetrics(SM_CLEANBOOT)) ops.startup = FALSE; + + /* Perform the ops by order, stopping if one fails, skipping if necessary */ + res = TRUE; + if (res && !ops.ntonly && ops.prelogin) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE); + if (res && !ops.ntonly && ops.prelogin && ops.startup) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE); + if (res && ops.postlogin) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE, FALSE); + + printf("Operation done\n"); + + return res ? 0 : 101; +} From 4526c852359a09f7ad11c31537104bd0eb6b81cb Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 13 Jan 2013 14:49:21 +0000 Subject: [PATCH 11/71] [NDK] Add SAL 2 annotations, use dummy annotations, if no SAL is available [PSDK/DDK/XDK] Fix a number of annotations, change the order in wdm.h fix IRQL annotations svn path=/trunk/; revision=58164 --- reactos/include/ddk/ntddk.h | 155 +- reactos/include/ddk/ntifs.h | 234 +-- reactos/include/ddk/wdm.h | 1228 ++++++++------- reactos/include/ndk/cmfuncs.h | 426 +++--- reactos/include/ndk/dbgkfuncs.h | 80 +- reactos/include/ndk/exfuncs.h | 593 ++++---- reactos/include/ndk/extypes.h | 8 +- reactos/include/ndk/halfuncs.h | 70 +- reactos/include/ndk/haltypes.h | 94 +- reactos/include/ndk/ifssupp.h | 6 +- reactos/include/ndk/inbvfuncs.h | 34 +- reactos/include/ndk/iofuncs.h | 924 ++++++------ reactos/include/ndk/iotypes.h | 6 +- reactos/include/ndk/kefuncs.h | 390 ++--- reactos/include/ndk/ketypes.h | 12 +- reactos/include/ndk/ldrfuncs.h | 88 +- reactos/include/ndk/ldrtypes.h | 12 +- reactos/include/ndk/lgpl.txt | 8 +- reactos/include/ndk/lpcfuncs.h | 296 ++-- reactos/include/ndk/mmfuncs.h | 400 ++--- reactos/include/ndk/ndk.txt | 8 +- reactos/include/ndk/no_sal2.h | 525 +++++++ reactos/include/ndk/ntndk.h | 8 + reactos/include/ndk/obfuncs.h | 463 +++--- reactos/include/ndk/obtypes.h | 82 +- reactos/include/ndk/pofuncs.h | 76 +- reactos/include/ndk/psfuncs.h | 484 +++--- reactos/include/ndk/pstypes.h | 34 +- reactos/include/ndk/readme.txt | 24 +- reactos/include/ndk/rtlfuncs.h | 2084 ++++++++++++++------------ reactos/include/ndk/rtltypes.h | 38 +- reactos/include/ndk/sefuncs.h | 450 +++--- reactos/include/ndk/umfuncs.h | 134 +- reactos/include/ndk/vffuncs.h | 20 +- reactos/include/psdk/driverspecs.h | 1 + reactos/include/psdk/sal.h | 14 +- reactos/include/psdk/winnt.h | 13 +- reactos/include/xdk/kdfuncs.h | 2 +- reactos/include/xdk/kefuncs.h | 15 - reactos/include/xdk/ketypes.h | 57 + reactos/include/xdk/ntifs.template.h | 42 +- reactos/include/xdk/pstypes.h | 39 - reactos/include/xdk/rtlfuncs.h | 55 +- reactos/include/xdk/rtltypes.h | 124 +- reactos/include/xdk/wdm.template.h | 2 +- 45 files changed, 5313 insertions(+), 4545 deletions(-) create mode 100644 reactos/include/ndk/no_sal2.h diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h index 969d18422c9..9576d3f43b9 100644 --- a/reactos/include/ddk/ntddk.h +++ b/reactos/include/ddk/ntddk.h @@ -1900,6 +1900,45 @@ typedef struct _HAL_PLATFORM_INFORMATION { * Kernel Types * ******************************************************************************/ +typedef struct _NT_TIB { + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + PVOID StackBase; + PVOID StackLimit; + PVOID SubSystemTib; + _ANONYMOUS_UNION union { + PVOID FiberData; + ULONG Version; + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; + struct _NT_TIB *Self; +} NT_TIB, *PNT_TIB; + +typedef struct _NT_TIB32 { + ULONG ExceptionList; + ULONG StackBase; + ULONG StackLimit; + ULONG SubSystemTib; + _ANONYMOUS_UNION union { + ULONG FiberData; + ULONG Version; + } DUMMYUNIONNAME; + ULONG ArbitraryUserPointer; + ULONG Self; +} NT_TIB32,*PNT_TIB32; + +typedef struct _NT_TIB64 { + ULONG64 ExceptionList; + ULONG64 StackBase; + ULONG64 StackLimit; + ULONG64 SubSystemTib; + _ANONYMOUS_UNION union { + ULONG64 FiberData; + ULONG Version; + } DUMMYUNIONNAME; + ULONG64 ArbitraryUserPointer; + ULONG64 Self; +} NT_TIB64,*PNT_TIB64; + #define NX_SUPPORT_POLICY_ALWAYSOFF 0 #define NX_SUPPORT_POLICY_ALWAYSON 1 #define NX_SUPPORT_POLICY_OPTIN 2 @@ -2083,6 +2122,7 @@ extern PCCHAR KeNumberProcessors; #endif + /****************************************************************************** * Kernel Debugger Types * ******************************************************************************/ @@ -2390,45 +2430,6 @@ typedef VOID #define PROCESS_HANDLE_TRACING_MAX_STACKS 16 -typedef struct _NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; - PVOID StackBase; - PVOID StackLimit; - PVOID SubSystemTib; - _ANONYMOUS_UNION union { - PVOID FiberData; - ULONG Version; - } DUMMYUNIONNAME; - PVOID ArbitraryUserPointer; - struct _NT_TIB *Self; -} NT_TIB, *PNT_TIB; - -typedef struct _NT_TIB32 { - ULONG ExceptionList; - ULONG StackBase; - ULONG StackLimit; - ULONG SubSystemTib; - _ANONYMOUS_UNION union { - ULONG FiberData; - ULONG Version; - } DUMMYUNIONNAME; - ULONG ArbitraryUserPointer; - ULONG Self; -} NT_TIB32,*PNT_TIB32; - -typedef struct _NT_TIB64 { - ULONG64 ExceptionList; - ULONG64 StackBase; - ULONG64 StackLimit; - ULONG64 SubSystemTib; - _ANONYMOUS_UNION union { - ULONG64 FiberData; - ULONG Version; - } DUMMYUNIONNAME; - ULONG64 ArbitraryUserPointer; - ULONG64 Self; -} NT_TIB64,*PNT_TIB64; - typedef enum _PROCESSINFOCLASS { ProcessBasicInformation, ProcessQuotaLimits, @@ -2851,68 +2852,6 @@ typedef struct _RTL_DYNAMIC_HASH_TABLE { PVOID Directory; } RTL_DYNAMIC_HASH_TABLE, *PRTL_DYNAMIC_HASH_TABLE; -typedef struct _OSVERSIONINFOA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; -} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; - -typedef struct _OSVERSIONINFOW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; -} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; - -typedef struct _OSVERSIONINFOEXA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; - -typedef struct _OSVERSIONINFOEXW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; - -#ifdef UNICODE -typedef OSVERSIONINFOEXW OSVERSIONINFOEX; -typedef POSVERSIONINFOEXW POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; -typedef OSVERSIONINFOW OSVERSIONINFO; -typedef POSVERSIONINFOW POSVERSIONINFO; -typedef LPOSVERSIONINFOW LPOSVERSIONINFO; -#else -typedef OSVERSIONINFOEXA OSVERSIONINFOEX; -typedef POSVERSIONINFOEXA POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; -typedef OSVERSIONINFOA OSVERSIONINFO; -typedef POSVERSIONINFOA POSVERSIONINFO; -typedef LPOSVERSIONINFOA LPOSVERSIONINFO; -#endif /* UNICODE */ - #define HASH_ENTRY_KEY(x) ((x)->Signature) /****************************************************************************** @@ -5043,20 +4982,6 @@ RtlVolumeDeviceToDosName( _In_ PVOID VolumeDeviceObject, _Out_ PUNICODE_STRING DosName); -NTSYSAPI -NTSTATUS -NTAPI -RtlGetVersion( - IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); - -NTSYSAPI -NTSTATUS -NTAPI -RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask); - _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ NTSYSAPI diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index afdde2e8702..9751340066e 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -2366,7 +2366,7 @@ NTSTATUS NTAPI NtAllocateVirtualMemory( _In_ HANDLE ProcessHandle, - _Outptr_result_bytebuffer_(*RegionSize) PVOID *BaseAddress, + _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, _In_ ULONG_PTR ZeroBits, _Inout_ PSIZE_T RegionSize, _In_ ULONG AllocationType, @@ -11303,37 +11303,37 @@ FsRtlNotifyChangeDirectory ( NTKERNELAPI NTSTATUS NTAPI -ObCreateObject ( - IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - IN ULONG ObjectSize, - IN ULONG PagedPoolCharge OPTIONAL, - IN ULONG NonPagedPoolCharge OPTIONAL, - OUT PVOID *Object +ObCreateObject( + _In_opt_ KPROCESSOR_MODE ObjectAttributesAccessMode, + _In_ POBJECT_TYPE ObjectType, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _In_ ULONG ObjectSize, + _In_opt_ ULONG PagedPoolCharge, + _In_opt_ ULONG NonPagedPoolCharge, + _Out_ PVOID *Object ); NTKERNELAPI ULONG NTAPI -ObGetObjectPointerCount ( - IN PVOID Object +ObGetObjectPointerCount( + _In_ PVOID Object ); NTKERNELAPI NTSTATUS NTAPI -ObReferenceObjectByName ( - IN PUNICODE_STRING ObjectName, - IN ULONG Attributes, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - OUT PVOID *Object +ObReferenceObjectByName( + _In_ PUNICODE_STRING ObjectName, + _In_ ULONG Attributes, + _In_opt_ PACCESS_STATE PassedAccessState, + _In_opt_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_TYPE ObjectType, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _Out_ PVOID *Object ); #define PsDereferenceImpersonationToken(T) \ @@ -11347,36 +11347,37 @@ ObReferenceObjectByName ( NTKERNELAPI NTSTATUS NTAPI -PsLookupProcessThreadByCid ( - IN PCLIENT_ID Cid, - OUT PEPROCESS *Process OPTIONAL, - OUT PETHREAD *Thread +PsLookupProcessThreadByCid( + _In_ PCLIENT_ID Cid, + _Out_opt_ PEPROCESS *Process, + _Out_ PETHREAD *Thread ); NTSYSAPI NTSTATUS NTAPI -RtlSetSaclSecurityDescriptor ( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN SaclPresent, - IN PACL Sacl, - IN BOOLEAN SaclDefaulted +RtlSetSaclSecurityDescriptor( + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN SaclPresent, + _In_ PACL Sacl, + _In_ BOOLEAN SaclDefaulted ); #define SeEnableAccessToExports() SeExports = *(PSE_EXPORTS *)SeExports; #if (VER_PRODUCTBUILD >= 2195) +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI -ZwAdjustPrivilegesToken ( - IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, - OUT PULONG ReturnLength +ZwAdjustPrivilegesToken( + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, + _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength ); #endif /* (VER_PRODUCTBUILD >= 2195) */ @@ -11384,8 +11385,8 @@ ZwAdjustPrivilegesToken ( NTSYSAPI NTSTATUS NTAPI -ZwAlertThread ( - IN HANDLE ThreadHandle +ZwAlertThread( + _In_ HANDLE ThreadHandle ); NTSYSAPI @@ -11410,9 +11411,9 @@ ZwAccessCheckAndAuditAlarm ( NTSYSAPI NTSTATUS NTAPI -ZwCancelIoFile ( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock +ZwCancelIoFile( + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); #endif /* (VER_PRODUCTBUILD >= 2195) */ @@ -11420,44 +11421,45 @@ ZwCancelIoFile ( NTSYSAPI NTSTATUS NTAPI -ZwClearEvent ( - IN HANDLE EventHandle +ZwClearEvent( + _In_ HANDLE EventHandle ); NTSYSAPI NTSTATUS NTAPI -ZwCloseObjectAuditAlarm ( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose +ZwCloseObjectAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose ); NTSYSAPI NTSTATUS NTAPI -ZwCreateSymbolicLinkObject ( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING TargetName +ZwCreateSymbolicLinkObject( + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PUNICODE_STRING Name ); NTSYSAPI NTSTATUS NTAPI -ZwFlushInstructionCache ( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress OPTIONAL, - IN ULONG FlushSize +ZwFlushInstructionCache( + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ ULONG NumberOfBytesToFlush ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwFlushBuffersFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); #if (VER_PRODUCTBUILD >= 2195) @@ -11465,11 +11467,11 @@ ZwFlushBuffersFile( NTSYSAPI NTSTATUS NTAPI -ZwInitiatePowerAction ( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous +ZwInitiatePowerAction( + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous ); #endif /* (VER_PRODUCTBUILD >= 2195) */ @@ -11482,64 +11484,66 @@ ZwLoadKey ( IN POBJECT_ATTRIBUTES FileObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -ZwOpenProcessToken ( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE TokenHandle +ZwOpenProcessToken( + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI -ZwOpenThread ( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId +ZwOpenThread( + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PCLIENT_ID ClientId ); NTSYSAPI NTSTATUS NTAPI -ZwOpenThreadToken ( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - OUT PHANDLE TokenHandle +ZwOpenThreadToken( + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI -ZwPulseEvent ( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL +ZwPulseEvent( + _In_ HANDLE EventHandle, + _In_opt_ PLONG PulseCount ); NTSYSAPI NTSTATUS NTAPI -ZwQueryDefaultLocale ( - IN BOOLEAN ThreadOrSystem, - OUT PLCID Locale +ZwQueryDefaultLocale( + _In_ BOOLEAN UserProfile, + _Out_ PLCID DefaultLocaleId ); #if (VER_PRODUCTBUILD >= 2195) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -ZwQueryDirectoryObject ( - IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL +ZwQueryDirectoryObject( + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength ); #endif /* (VER_PRODUCTBUILD >= 2195) */ @@ -11567,9 +11571,9 @@ ZwReplaceKey ( NTSYSAPI NTSTATUS NTAPI -ZwResetEvent ( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL +ZwResetEvent( + _In_ HANDLE EventHandle, + _Out_opt_ PLONG NumberOfWaitingThreads ); #if (VER_PRODUCTBUILD >= 2195) @@ -11596,9 +11600,9 @@ ZwSaveKey ( NTSYSAPI NTSTATUS NTAPI -ZwSetDefaultLocale ( - IN BOOLEAN ThreadOrSystem, - IN LCID Locale +ZwSetDefaultLocale( + _In_ BOOLEAN UserProfile, + _In_ LCID DefaultLocaleId ); #if (VER_PRODUCTBUILD >= 2195) @@ -11615,37 +11619,37 @@ ZwSetDefaultUILanguage ( NTSYSAPI NTSTATUS NTAPI -ZwSetInformationProcess ( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - IN PVOID ProcessInformation, - IN ULONG ProcessInformationLength +ZwSetInformationProcess( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _In_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength ); NTSYSAPI NTSTATUS NTAPI -ZwSetSystemTime ( - IN PLARGE_INTEGER NewTime, - OUT PLARGE_INTEGER OldTime OPTIONAL +ZwSetSystemTime( + _In_ PLARGE_INTEGER SystemTime, + _In_opt_ PLARGE_INTEGER NewSystemTime ); NTSYSAPI NTSTATUS NTAPI -ZwUnloadKey ( - IN POBJECT_ATTRIBUTES KeyObjectAttributes +ZwUnloadKey( + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes ); NTSYSAPI NTSTATUS NTAPI -ZwWaitForMultipleObjects ( - IN ULONG HandleCount, - IN PHANDLE Handles, - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL +ZwWaitForMultipleObjects( + _In_ ULONG Count, + _In_ HANDLE Object[], + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); NTSYSAPI diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index 93d8df55647..45bda569bcc 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -116,7 +116,7 @@ extern "C" { #pragma warning(disable:4115) /* Named type definition in parentheses */ #pragma warning(disable:4201) /* Nameless unions and structs */ #pragma warning(disable:4214) /* Bit fields of other types than int */ -#pragma warning(disable:4820) /* Padding added, due to alignemnet requirement */ +#pragma warning(disable:4820) /* Padding added, due to alignment requirement */ /* Indicate if #pragma alloc_text() is supported */ #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) @@ -622,6 +622,68 @@ typedef BOOLEAN (*PFN_RTL_IS_SERVICE_PACK_VERSION_INSTALLED)( _In_ ULONG Version); +typedef struct _OSVERSIONINFOA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; +} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; + +typedef struct _OSVERSIONINFOW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; +} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; + +typedef struct _OSVERSIONINFOEXA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; + +typedef struct _OSVERSIONINFOEXW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; + +#ifdef UNICODE +typedef OSVERSIONINFOEXW OSVERSIONINFOEX; +typedef POSVERSIONINFOEXW POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; +typedef OSVERSIONINFOW OSVERSIONINFO; +typedef POSVERSIONINFOW POSVERSIONINFO; +typedef LPOSVERSIONINFOW LPOSVERSIONINFO; +#else +typedef OSVERSIONINFOEXA OSVERSIONINFOEX; +typedef POSVERSIONINFOEXA POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; +typedef OSVERSIONINFOA OSVERSIONINFO; +typedef POSVERSIONINFOA POSVERSIONINFO; +typedef LPOSVERSIONINFOA LPOSVERSIONINFO; +#endif /* UNICODE */ + /****************************************************************************** * Kernel Types * ******************************************************************************/ @@ -1613,6 +1675,567 @@ extern PCCHAR KeNumberProcessors; #endif +#if defined(_M_IX86) +/** Kernel definitions for x86 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMCI_LEVEL 5 +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 +#define CLOCK_LEVEL CLOCK2_LEVEL + +#define KIP0PCRADDRESS 0xffdff000 +#define KI_USER_SHARED_DATA 0xffdf0000 +#define SharedUserData ((KUSER_SHARED_DATA * CONST)KI_USER_SHARED_DATA) + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L +#define KeGetDcacheFillSize() 1L + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) + + +typedef struct _KFLOATING_SAVE { + ULONG ControlWord; + ULONG StatusWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + ULONG Cr0NpxState; + ULONG Spare1; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount; + +#define YieldProcessor _mm_pause + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + LONG Barrier, *Dummy = &Barrier; + UNREFERENCED_LOCAL_VARIABLE(Dummy); + +#if defined(__GNUC__) + __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); +#elif defined(_MSC_VER) + __asm xchg [Barrier], eax +#endif +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() + +_IRQL_requires_max_(HIGH_LEVEL) +_IRQL_saves_ +NTHALAPI +KIRQL +NTAPI +KeGetCurrentIrql(VOID); + +_IRQL_requires_max_(HIGH_LEVEL) +NTHALAPI +VOID +FASTCALL +KfLowerIrql( + _In_ _IRQL_restores_ _Notliteral_ KIRQL NewIrql); +#define KeLowerIrql(a) KfLowerIrql(a) + +_IRQL_requires_max_(HIGH_LEVEL) +_IRQL_raises_(NewIrql) +_IRQL_saves_ +NTHALAPI +KIRQL +FASTCALL +KfRaiseIrql( + _In_ KIRQL NewIrql); +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_saves_ +_IRQL_raises_(DISPATCH_LEVEL) +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + +_Requires_lock_not_held_(*SpinLock) +_Acquires_lock_(*SpinLock) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_saves_ +_IRQL_raises_(DISPATCH_LEVEL) +NTHALAPI +KIRQL +FASTCALL +KfAcquireSpinLock( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) + +_Requires_lock_held_(*SpinLock) +_Releases_lock_(*SpinLock) +_IRQL_requires_(DISPATCH_LEVEL) +NTHALAPI +VOID +FASTCALL +KfReleaseSpinLock( + _Inout_ PKSPIN_LOCK SpinLock, + _In_ _IRQL_restores_ KIRQL NewIrql); +#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +_Requires_lock_not_held_(*SpinLock) +_Acquires_lock_(*SpinLock) +_IRQL_requires_min_(DISPATCH_LEVEL) +NTKERNELAPI +VOID +FASTCALL +KefAcquireSpinLockAtDpcLevel( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) + +_Requires_lock_held_(*SpinLock) +_Releases_lock_(*SpinLock) +_IRQL_requires_min_(DISPATCH_LEVEL) +NTKERNELAPI +VOID +FASTCALL +KefReleaseSpinLockFromDpcLevel( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) + +NTSYSAPI +PKTHREAD +NTAPI +KeGetCurrentThread(VOID); + +_Always_(_Post_satisfies_(return<=0)) +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) +_Kernel_float_saved_ +_At_(*FloatSave, _Kernel_requires_resource_not_held_(FloatState) _Kernel_acquires_resource_(FloatState)) +NTKERNELAPI +NTSTATUS +NTAPI +KeSaveFloatingPointState( + _Out_ PKFLOATING_SAVE FloatSave); + +_Success_(1) +_Kernel_float_restored_ +_At_(*FloatSave, _Kernel_requires_resource_held_(FloatState) _Kernel_releases_resource_(FloatState)) +NTKERNELAPI +NTSTATUS +NTAPI +KeRestoreFloatingPointState( + _In_ PKFLOATING_SAVE FloatSave); + +/* VOID + * KeFlushIoBuffers( + * IN PMDL Mdl, + * IN BOOLEAN ReadOperation, + * IN BOOLEAN DmaOperation) + */ +#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) + +/* x86 and x64 performs a 0x2C interrupt */ +#define DbgRaiseAssertionFailure __int2c + +FORCEINLINE +VOID +_KeQueryTickCount( + OUT PLARGE_INTEGER CurrentCount) +{ + for (;;) { +#ifdef NONAMELESSUNION + CurrentCount->s.HighPart = KeTickCount.High1Time; + CurrentCount->s.LowPart = KeTickCount.LowPart; + if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; +#else + CurrentCount->HighPart = KeTickCount.High1Time; + CurrentCount->LowPart = KeTickCount.LowPart; + if (CurrentCount->HighPart == KeTickCount.High2Time) break; +#endif + YieldProcessor(); + } +} +#define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) + + + + + +#elif defined(_M_AMD64) +/** Kernel definitions for AMD64 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMCI_LEVEL 5 +#define CLOCK_LEVEL 13 +#define IPI_LEVEL 14 +#define DRS_LEVEL 14 +#define POWER_LEVEL 14 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL +#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA) +#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8) +#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14) +#define SharedTickCount (KI_USER_SHARED_DATA + 0x320) + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +typedef struct _KFLOATING_SAVE { + ULONG Dummy; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +typedef XSAVE_FORMAT XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; + +#define KeQueryInterruptTime() \ + (*(volatile ULONG64*)SharedInterruptTime) + +#define KeQuerySystemTime(CurrentCount) \ + *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedSystemTime + +#define KeQueryTickCount(CurrentCount) \ + *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedTickCount + +#define KeGetDcacheFillSize() 1L + +#define YieldProcessor _mm_pause +#define MemoryBarrier __faststorefence +#define FastFence __faststorefence +#define LoadFence _mm_lfence +#define MemoryFence _mm_mfence +#define StoreFence _mm_sfence +#define LFENCE_ACQUIRE() LoadFence() + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + // FIXME: Do we really need lfence after the __faststorefence ? + FastFence(); + LFENCE_ACQUIRE(); +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() + +FORCEINLINE +KIRQL +KeGetCurrentIrql(VOID) +{ + return (KIRQL)__readcr8(); +} + +FORCEINLINE +VOID +KeLowerIrql(IN KIRQL NewIrql) +{ + ASSERT((KIRQL)__readcr8() >= NewIrql); + __writecr8(NewIrql); +} + +FORCEINLINE +KIRQL +KfRaiseIrql(IN KIRQL NewIrql) +{ + KIRQL OldIrql; + + OldIrql = (KIRQL)__readcr8(); + ASSERT(OldIrql <= NewIrql); + __writecr8(NewIrql); + return OldIrql; +} +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +FORCEINLINE +KIRQL +KeRaiseIrqlToDpcLevel(VOID) +{ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +FORCEINLINE +KIRQL +KeRaiseIrqlToSynchLevel(VOID) +{ + return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 +} + +FORCEINLINE +PKTHREAD +KeGetCurrentThread(VOID) +{ + return (struct _KTHREAD *)__readgsqword(0x188); +} + +FORCEINLINE +NTSTATUS +KeSaveFloatingPointState(PVOID FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; +} + +FORCEINLINE +NTSTATUS +KeRestoreFloatingPointState(PVOID FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; +} + +/* VOID + * KeFlushIoBuffers( + * IN PMDL Mdl, + * IN BOOLEAN ReadOperation, + * IN BOOLEAN DmaOperation) + */ +#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) + +/* x86 and x64 performs a 0x2C interrupt */ +#define DbgRaiseAssertionFailure __int2c + +#elif defined(_M_IA64) +/** Kernel definitions for IA64 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMC_LEVEL 3 +#define DEVICE_LEVEL_BASE 4 +#define PC_LEVEL 12 +#define IPI_LEVEL 14 +#define DRS_LEVEL 14 +#define CLOCK_LEVEL 13 +#define POWER_LEVEL 15 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +#define KI_USER_SHARED_DATA ((ULONG_PTR)(KADDRESS_BASE + 0xFFFE0000)) +extern volatile LARGE_INTEGER KeTickCount; + +#define PAUSE_PROCESSOR __yield(); + +FORCEINLINE +VOID +KeFlushWriteBuffer(VOID) +{ + __mf (); + return; +} + +NTSYSAPI +PKTHREAD +NTAPI +KeGetCurrentThread(VOID); + + +#elif defined(_M_PPC) + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 + +// +// Used to contain PFNs and PFN counts +// +typedef ULONG PFN_COUNT; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; + + +typedef struct _KFLOATING_SAVE { + ULONG Dummy; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +typedef struct _KPCR_TIB { + PVOID ExceptionList; /* 00 */ + PVOID StackBase; /* 04 */ + PVOID StackLimit; /* 08 */ + PVOID SubSystemTib; /* 0C */ + _ANONYMOUS_UNION union { + PVOID FiberData; /* 10 */ + ULONG Version; /* 10 */ + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; /* 14 */ + struct _KPCR_TIB *Self; /* 18 */ +} KPCR_TIB, *PKPCR_TIB; /* 1C */ + +#define PCR_MINOR_VERSION 1 +#define PCR_MAJOR_VERSION 1 + +typedef struct _KPCR { + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SpareUnused; /* 50 */ + UCHAR Number; /* 51 */ +} KPCR, *PKPCR; /* 54 */ + +#define KeGetPcr() PCR + +#define YieldProcessor() __asm__ __volatile__("nop"); + +FORCEINLINE +ULONG +NTAPI +KeGetCurrentProcessorNumber(VOID) +{ + ULONG Number; + __asm__ __volatile__ ( + "lwz %0, %c1(12)\n" + : "=r" (Number) + : "i" (FIELD_OFFSET(KPCR, Number)) + ); + return Number; +} + +NTHALAPI +VOID +FASTCALL +KfLowerIrql( + IN KIRQL NewIrql); +#define KeLowerIrql(a) KfLowerIrql(a) + +NTHALAPI +KIRQL +FASTCALL +KfRaiseIrql( + IN KIRQL NewIrql); +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + + + +#elif defined(_M_MIPS) +#error MIPS Headers are totally incorrect + +// +// Used to contain PFNs and PFN counts +// +typedef ULONG PFN_COUNT; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; + +#define PASSIVE_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define IPI_LEVEL 29 +#define HIGH_LEVEL 31 + +typedef struct _KPCR { + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IDR; /* 30 */ +} KPCR, *PKPCR; + +#define KeGetPcr() PCR + +typedef struct _KFLOATING_SAVE { +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +static __inline +ULONG +NTAPI +KeGetCurrentProcessorNumber(VOID) +{ + return 0; +} + +#define YieldProcessor() __asm__ __volatile__("nop"); + +#define KeLowerIrql(a) KfLowerIrql(a) +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +NTKERNELAPI +VOID +NTAPI +KfLowerIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KfRaiseIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + + +#elif defined(_M_ARM) +#include +#else +#error Unknown Architecture +#endif + /****************************************************************************** * Memory manager Types * ******************************************************************************/ @@ -8120,7 +8743,7 @@ RtlGUIDFromString( _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) NTSYSAPI VOID NTAPI @@ -8473,13 +9096,15 @@ RtlInitAnsiString( _Out_ PANSI_STRING DestinationString, _In_opt_z_ __drv_aliasesMem PCSZ SourceString); +_At_(BitMapHeader->SizeOfBitMap, _Post_equal_to_(SizeOfBitMap)) +_At_(BitMapHeader->Buffer, _Post_equal_to_(BitMapBuffer)) NTSYSAPI VOID NTAPI RtlInitializeBitMap( _Out_ PRTL_BITMAP BitMapHeader, - _In_ __drv_aliasesMem PULONG BitMapBuffer, - _In_ ULONG SizeOfBitMap); + _In_opt_ __drv_aliasesMem PULONG BitMapBuffer, + _In_opt_ ULONG SizeOfBitMap); _IRQL_requires_max_(DISPATCH_LEVEL) NTSYSAPI @@ -8548,12 +9173,12 @@ NTSYSAPI NTSTATUS NTAPI RtlQueryRegistryValues( - _In_ ULONG RelativeTo, - _In_ PCWSTR Path, - _Inout_ _At_(*(*QueryTable).EntryContext, _Post_valid_) - PRTL_QUERY_REGISTRY_TABLE QueryTable, - _In_opt_ PVOID Context, - _In_opt_ PVOID Environment); + _In_ ULONG RelativeTo, + _In_ PCWSTR Path, + _Inout_ _At_(*(*QueryTable).EntryContext, _Pre_unknown_) + PRTL_QUERY_REGISTRY_TABLE QueryTable, + _In_opt_ PVOID Context, + _In_opt_ PVOID Environment); #define SHORT_SIZE (sizeof(USHORT)) #define SHORT_MASK (SHORT_SIZE - 1) @@ -8801,6 +9426,27 @@ NTAPI RtlValidSecurityDescriptor( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +RtlGetVersion( + _Out_ + _At_(lpVersionInformation->dwOSVersionInfoSize, _Pre_ _Valid_) + _When_(lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW), + _At_((PRTL_OSVERSIONINFOEXW)lpVersionInformation, _Out_)) + PRTL_OSVERSIONINFOW lpVersionInformation); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlVerifyVersionInfo( + _In_ PRTL_OSVERSIONINFOEXW VersionInfo, + _In_ ULONG TypeMask, + _In_ ULONGLONG ConditionMask); + _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS @@ -9520,566 +10166,6 @@ RTLVERLIB_DDI(RtlIsServicePackVersionInstalled)( /****************************************************************************** * Kernel Functions * ******************************************************************************/ -#if defined(_M_IX86) -/** Kernel definitions for x86 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMCI_LEVEL 5 -#define PROFILE_LEVEL 27 -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 -#define IPI_LEVEL 29 -#define POWER_LEVEL 30 -#define HIGH_LEVEL 31 -#define CLOCK_LEVEL CLOCK2_LEVEL - -#define KIP0PCRADDRESS 0xffdff000 -#define KI_USER_SHARED_DATA 0xffdf0000 -#define SharedUserData ((KUSER_SHARED_DATA * CONST)KI_USER_SHARED_DATA) - -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L -#define KeGetDcacheFillSize() 1L - -#define EFLAG_SIGN 0x8000 -#define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) - - -typedef struct _KFLOATING_SAVE { - ULONG ControlWord; - ULONG StatusWord; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - ULONG Cr0NpxState; - ULONG Spare1; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount; - -#define YieldProcessor _mm_pause - -FORCEINLINE -VOID -KeMemoryBarrier(VOID) -{ - LONG Barrier, *Dummy = &Barrier; - UNREFERENCED_LOCAL_VARIABLE(Dummy); - -#if defined(__GNUC__) - __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); -#elif defined(_MSC_VER) - __asm xchg [Barrier], eax -#endif -} - -#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() - -_IRQL_requires_max_(HIGH_LEVEL) -_IRQL_saves_ -NTHALAPI -KIRQL -NTAPI -KeGetCurrentIrql(VOID); - -_IRQL_requires_max_(HIGH_LEVEL) -NTHALAPI -VOID -FASTCALL -KfLowerIrql( - _In_ _IRQL_restores_ _Notliteral_ KIRQL NewIrql); -#define KeLowerIrql(a) KfLowerIrql(a) - -_IRQL_requires_max_(HIGH_LEVEL) -_IRQL_raises_(NewIrql) -_IRQL_saves_ -NTHALAPI -KIRQL -FASTCALL -KfRaiseIrql( - _In_ KIRQL NewIrql); -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -_IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_saves_ -_IRQL_raises_(DISPATCH_LEVEL) -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - -_Requires_lock_not_held_(*SpinLock) -_Acquires_lock_(*SpinLock) -_IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_saves_ -_IRQL_raises_(DISPATCH_LEVEL) -NTHALAPI -KIRQL -FASTCALL -KfAcquireSpinLock( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) - -_Requires_lock_held_(*SpinLock) -_Releases_lock_(*SpinLock) -_IRQL_requires_(DISPATCH_LEVEL) -NTHALAPI -VOID -FASTCALL -KfReleaseSpinLock( - _Inout_ PKSPIN_LOCK SpinLock, - _In_ _IRQL_restores_ KIRQL NewIrql); -#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) - -_Requires_lock_not_held_(*SpinLock) -_Acquires_lock_(*SpinLock) -_IRQL_requires_min_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -FASTCALL -KefAcquireSpinLockAtDpcLevel( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) - -_Requires_lock_held_(*SpinLock) -_Releases_lock_(*SpinLock) -_IRQL_requires_min_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -FASTCALL -KefReleaseSpinLockFromDpcLevel( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) - -NTSYSAPI -PKTHREAD -NTAPI -KeGetCurrentThread(VOID); - -_Always_(_Post_satisfies_(return<=0)) -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_Kernel_float_saved_ -_At_(*FloatSave, _Kernel_requires_resource_not_held_(FloatState) _Kernel_acquires_resource_(FloatState)) -NTKERNELAPI -NTSTATUS -NTAPI -KeSaveFloatingPointState( - _Out_ PKFLOATING_SAVE FloatSave); - -_Success_(1) -_Kernel_float_restored_ -_At_(*FloatSave, _Kernel_requires_resource_held_(FloatState) _Kernel_releases_resource_(FloatState)) -NTKERNELAPI -NTSTATUS -NTAPI -KeRestoreFloatingPointState( - _In_ PKFLOATING_SAVE FloatSave); - -/* VOID - * KeFlushIoBuffers( - * IN PMDL Mdl, - * IN BOOLEAN ReadOperation, - * IN BOOLEAN DmaOperation) - */ -#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) - -/* x86 and x64 performs a 0x2C interrupt */ -#define DbgRaiseAssertionFailure __int2c - -FORCEINLINE -VOID -_KeQueryTickCount( - OUT PLARGE_INTEGER CurrentCount) -{ - for (;;) { -#ifdef NONAMELESSUNION - CurrentCount->s.HighPart = KeTickCount.High1Time; - CurrentCount->s.LowPart = KeTickCount.LowPart; - if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; -#else - CurrentCount->HighPart = KeTickCount.High1Time; - CurrentCount->LowPart = KeTickCount.LowPart; - if (CurrentCount->HighPart == KeTickCount.High2Time) break; -#endif - YieldProcessor(); - } -} -#define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) - - - - - -#elif defined(_M_AMD64) -/** Kernel definitions for AMD64 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMCI_LEVEL 5 -#define CLOCK_LEVEL 13 -#define IPI_LEVEL 14 -#define DRS_LEVEL 14 -#define POWER_LEVEL 14 -#define PROFILE_LEVEL 15 -#define HIGH_LEVEL 15 - -#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL -#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA) -#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8) -#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14) -#define SharedTickCount (KI_USER_SHARED_DATA + 0x320) - -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L - -#define EFLAG_SIGN 0x8000 -#define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -typedef struct _KFLOATING_SAVE { - ULONG Dummy; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -typedef XSAVE_FORMAT XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; - -#define KeQueryInterruptTime() \ - (*(volatile ULONG64*)SharedInterruptTime) - -#define KeQuerySystemTime(CurrentCount) \ - *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedSystemTime - -#define KeQueryTickCount(CurrentCount) \ - *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedTickCount - -#define KeGetDcacheFillSize() 1L - -#define YieldProcessor _mm_pause -#define MemoryBarrier __faststorefence -#define FastFence __faststorefence -#define LoadFence _mm_lfence -#define MemoryFence _mm_mfence -#define StoreFence _mm_sfence -#define LFENCE_ACQUIRE() LoadFence() - -FORCEINLINE -VOID -KeMemoryBarrier(VOID) -{ - // FIXME: Do we really need lfence after the __faststorefence ? - FastFence(); - LFENCE_ACQUIRE(); -} - -#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() - -FORCEINLINE -KIRQL -KeGetCurrentIrql(VOID) -{ - return (KIRQL)__readcr8(); -} - -FORCEINLINE -VOID -KeLowerIrql(IN KIRQL NewIrql) -{ - ASSERT((KIRQL)__readcr8() >= NewIrql); - __writecr8(NewIrql); -} - -FORCEINLINE -KIRQL -KfRaiseIrql(IN KIRQL NewIrql) -{ - KIRQL OldIrql; - - OldIrql = (KIRQL)__readcr8(); - ASSERT(OldIrql <= NewIrql); - __writecr8(NewIrql); - return OldIrql; -} -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -FORCEINLINE -KIRQL -KeRaiseIrqlToDpcLevel(VOID) -{ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -FORCEINLINE -KIRQL -KeRaiseIrqlToSynchLevel(VOID) -{ - return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 -} - -FORCEINLINE -PKTHREAD -KeGetCurrentThread(VOID) -{ - return (struct _KTHREAD *)__readgsqword(0x188); -} - -FORCEINLINE -NTSTATUS -KeSaveFloatingPointState(PVOID FloatingState) -{ - UNREFERENCED_PARAMETER(FloatingState); - return STATUS_SUCCESS; -} - -FORCEINLINE -NTSTATUS -KeRestoreFloatingPointState(PVOID FloatingState) -{ - UNREFERENCED_PARAMETER(FloatingState); - return STATUS_SUCCESS; -} - -/* VOID - * KeFlushIoBuffers( - * IN PMDL Mdl, - * IN BOOLEAN ReadOperation, - * IN BOOLEAN DmaOperation) - */ -#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) - -/* x86 and x64 performs a 0x2C interrupt */ -#define DbgRaiseAssertionFailure __int2c - -#elif defined(_M_IA64) -/** Kernel definitions for IA64 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMC_LEVEL 3 -#define DEVICE_LEVEL_BASE 4 -#define PC_LEVEL 12 -#define IPI_LEVEL 14 -#define DRS_LEVEL 14 -#define CLOCK_LEVEL 13 -#define POWER_LEVEL 15 -#define PROFILE_LEVEL 15 -#define HIGH_LEVEL 15 - -#define KI_USER_SHARED_DATA ((ULONG_PTR)(KADDRESS_BASE + 0xFFFE0000)) -extern volatile LARGE_INTEGER KeTickCount; - -#define PAUSE_PROCESSOR __yield(); - -FORCEINLINE -VOID -KeFlushWriteBuffer(VOID) -{ - __mf (); - return; -} - -NTSYSAPI -PKTHREAD -NTAPI -KeGetCurrentThread(VOID); - - -#elif defined(_M_PPC) - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define PROFILE_LEVEL 27 -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 -#define IPI_LEVEL 29 -#define POWER_LEVEL 30 -#define HIGH_LEVEL 31 - -// -// Used to contain PFNs and PFN counts -// -typedef ULONG PFN_COUNT; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; - - -typedef struct _KFLOATING_SAVE { - ULONG Dummy; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -typedef struct _KPCR_TIB { - PVOID ExceptionList; /* 00 */ - PVOID StackBase; /* 04 */ - PVOID StackLimit; /* 08 */ - PVOID SubSystemTib; /* 0C */ - _ANONYMOUS_UNION union { - PVOID FiberData; /* 10 */ - ULONG Version; /* 10 */ - } DUMMYUNIONNAME; - PVOID ArbitraryUserPointer; /* 14 */ - struct _KPCR_TIB *Self; /* 18 */ -} KPCR_TIB, *PKPCR_TIB; /* 1C */ - -#define PCR_MINOR_VERSION 1 -#define PCR_MAJOR_VERSION 1 - -typedef struct _KPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SpareUnused; /* 50 */ - UCHAR Number; /* 51 */ -} KPCR, *PKPCR; /* 54 */ - -#define KeGetPcr() PCR - -#define YieldProcessor() __asm__ __volatile__("nop"); - -FORCEINLINE -ULONG -NTAPI -KeGetCurrentProcessorNumber(VOID) -{ - ULONG Number; - __asm__ __volatile__ ( - "lwz %0, %c1(12)\n" - : "=r" (Number) - : "i" (FIELD_OFFSET(KPCR, Number)) - ); - return Number; -} - -NTHALAPI -VOID -FASTCALL -KfLowerIrql( - IN KIRQL NewIrql); -#define KeLowerIrql(a) KfLowerIrql(a) - -NTHALAPI -KIRQL -FASTCALL -KfRaiseIrql( - IN KIRQL NewIrql); -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - - - -#elif defined(_M_MIPS) -#error MIPS Headers are totally incorrect - -// -// Used to contain PFNs and PFN counts -// -typedef ULONG PFN_COUNT; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; - -#define PASSIVE_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define PROFILE_LEVEL 27 -#define IPI_LEVEL 29 -#define HIGH_LEVEL 31 - -typedef struct _KPCR { - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IDR; /* 30 */ -} KPCR, *PKPCR; - -#define KeGetPcr() PCR - -typedef struct _KFLOATING_SAVE { -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -static __inline -ULONG -NTAPI -KeGetCurrentProcessorNumber(VOID) -{ - return 0; -} - -#define YieldProcessor() __asm__ __volatile__("nop"); - -#define KeLowerIrql(a) KfLowerIrql(a) -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -NTKERNELAPI -VOID -NTAPI -KfLowerIrql( - IN KIRQL NewIrql); - -NTKERNELAPI -KIRQL -NTAPI -KfRaiseIrql( - IN KIRQL NewIrql); - -NTKERNELAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTKERNELAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - - -#elif defined(_M_ARM) -#include -#else -#error Unknown Architecture -#endif NTKERNELAPI VOID @@ -15698,7 +15784,7 @@ NTSYSAPI VOID NTAPI DbgBreakPointWithStatus( - IN ULONG Status); + _In_ ULONG Status); #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ diff --git a/reactos/include/ndk/cmfuncs.h b/reactos/include/ndk/cmfuncs.h index b9cd568d22a..3d9a68efc6b 100644 --- a/reactos/include/ndk/cmfuncs.h +++ b/reactos/include/ndk/cmfuncs.h @@ -31,326 +31,326 @@ Author: NTSTATUS NTAPI NtCompactKeys( - IN ULONG Count, - IN PHANDLE KeyArray + _In_ ULONG Count, + _In_reads_(Count) PHANDLE KeyArray ); NTSTATUS NTAPI NtCompressKey( - IN HANDLE Key + _In_ HANDLE Key ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateKey( - OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG TitleIndex, - IN PUNICODE_STRING Class OPTIONAL, - IN ULONG CreateOptions, - IN PULONG Disposition OPTIONAL + _Out_ PHANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG TitleIndex, + _In_opt_ PUNICODE_STRING Class, + _In_ ULONG CreateOptions, + _In_opt_ PULONG Disposition ); NTSYSCALLAPI NTSTATUS NTAPI NtDeleteKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtDeleteValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName ); NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateKey( - IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ ULONG Index, + _In_ KEY_INFORMATION_CLASS KeyInformationClass, + _Out_bytecap_(Length) PVOID KeyInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateValueKey( - IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ ULONG Index, + _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + _Out_bytecap_(Length) PVOID KeyValueInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtFlushKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtGetPlugPlayEvent( - IN ULONG Reserved1, - IN ULONG Reserved2, - OUT PPLUGPLAY_EVENT_BLOCK Buffer, - IN ULONG BufferSize + _In_ ULONG Reserved1, + _In_ ULONG Reserved2, + _Out_ PPLUGPLAY_EVENT_BLOCK Buffer, + _In_ ULONG BufferSize ); NTSYSCALLAPI NTSTATUS NTAPI NtInitializeRegistry( - USHORT Flag + _In_ USHORT Flag ); NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey2( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes, - IN ULONG Flags + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes, + _In_ ULONG Flags ); NTSTATUS NTAPI NtLoadKeyEx( - IN POBJECT_ATTRIBUTES TargetKey, - IN POBJECT_ATTRIBUTES SourceFile, - IN ULONG Flags, - IN HANDLE TrustClassKey + _In_ POBJECT_ATTRIBUTES TargetKey, + _In_ POBJECT_ATTRIBUTES SourceFile, + _In_ ULONG Flags, + _In_ HANDLE TrustClassKey ); NTSTATUS NTAPI NtLockProductActivationKeys( - IN PULONG pPrivateVer, - IN PULONG pSafeMode + _In_ PULONG pPrivateVer, + _In_ PULONG pSafeMode ); NTSTATUS NTAPI NtLockRegistryKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeKey( - IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN Asynchroneous, - OUT PVOID ChangeBuffer, - IN ULONG Length, - IN BOOLEAN WatchSubtree + _In_ HANDLE KeyHandle, + _In_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN Asynchroneous, + _Out_bytecap_(Length) PVOID ChangeBuffer, + _In_ ULONG Length, + _In_ BOOLEAN WatchSubtree ); NTSTATUS NTAPI NtNotifyChangeMultipleKeys( - IN HANDLE MasterKeyHandle, - IN ULONG Count, - IN POBJECT_ATTRIBUTES SlaveObjects, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous + _In_ HANDLE MasterKeyHandle, + _In_ ULONG Count, + _In_ POBJECT_ATTRIBUTES SlaveObjects, + _In_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree, + _Out_bytecap_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_ BOOLEAN Asynchronous ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenKey( - OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtPlugPlayControl( - IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, - IN OUT PVOID Buffer, - IN ULONG BufferSize + _In_ PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, + _Inout_ PVOID Buffer, + _In_ ULONG BufferSize ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryKey( - IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ KEY_INFORMATION_CLASS KeyInformationClass, + _Out_bytecap_(Length) PVOID KeyInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryMultipleValueKey( - IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueList, - IN ULONG NumberOfValues, - OUT PVOID Buffer, - IN OUT PULONG Length, - OUT PULONG ReturnLength + _In_ HANDLE KeyHandle, + _Inout_ PKEY_VALUE_ENTRY ValueList, + _In_ ULONG NumberOfValues, + _Out_bytecap_(*Length) PVOID Buffer, + _Inout_ PULONG Length, + _Out_ PULONG ReturnLength ); NTSTATUS NTAPI NtQueryOpenSubKeys( - IN POBJECT_ATTRIBUTES TargetKey, - OUT PULONG HandleCount + _In_ POBJECT_ATTRIBUTES TargetKey, + _Out_ PULONG HandleCount ); NTSTATUS NTAPI NtQueryOpenSubKeysEx( - IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG BufferLength, - IN PVOID Buffer, - IN PULONG RequiredSize + _In_ POBJECT_ATTRIBUTES TargetKey, + _In_ ULONG BufferLength, + _In_ PVOID Buffer, + _In_ PULONG RequiredSize ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + _Out_bytecap_(Length) PVOID KeyValueInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtRenameKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ReplacementName + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ReplacementName ); NTSYSCALLAPI NTSTATUS NTAPI NtReplaceKey( - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE Key, - IN POBJECT_ATTRIBUTES ReplacedObjectAttributes + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE Key, + _In_ POBJECT_ATTRIBUTES ReplacedObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtRestoreKey( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG RestoreFlags + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG RestoreFlags ); NTSYSCALLAPI NTSTATUS NTAPI NtSaveKey( - IN HANDLE KeyHandle, - IN HANDLE FileHandle + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSaveKeyEx( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG Flags ); NTSTATUS NTAPI NtSaveMergedKeys( - IN HANDLE HighPrecedenceKeyHandle, - IN HANDLE LowPrecedenceKeyHandle, - IN HANDLE FileHandle + _In_ HANDLE HighPrecedenceKeyHandle, + _In_ HANDLE LowPrecedenceKeyHandle, + _In_ HANDLE FileHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationKey( - IN HANDLE KeyHandle, - IN KEY_SET_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG KeyInformationLength + _In_ HANDLE KeyHandle, + _In_ KEY_SET_INFORMATION_CLASS KeyInformationClass, + _In_ PVOID KeyInformation, + _In_ ULONG KeyInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtSetValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN ULONG TitleIndex OPTIONAL, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG TitleIndex, + _In_ ULONG Type, + _In_ PVOID Data, + _In_ ULONG DataSize ); NTSYSCALLAPI NTSTATUS NTAPI NtUnloadKey( - IN POBJECT_ATTRIBUTES KeyObjectAttributes + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes ); NTSTATUS NTAPI NtUnloadKey2( - IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG Flags + _In_ POBJECT_ATTRIBUTES TargetKey, + _In_ ULONG Flags ); NTSTATUS NTAPI NtUnloadKeyEx( - IN POBJECT_ATTRIBUTES TargetKey, - IN HANDLE Event + _In_ POBJECT_ATTRIBUTES TargetKey, + _In_ HANDLE Event ); #ifdef NTOS_MODE_USER @@ -358,212 +358,212 @@ NTSYSAPI NTSTATUS NTAPI ZwCreateKey( - OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG TitleIndex, - IN PUNICODE_STRING Class OPTIONAL, - IN ULONG CreateOptions, - IN PULONG Disposition OPTIONAL + _Out_ PHANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG TitleIndex, + _In_opt_ PUNICODE_STRING Class, + _In_ ULONG CreateOptions, + _In_opt_ PULONG Disposition ); NTSYSAPI NTSTATUS NTAPI ZwDeleteKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSAPI NTSTATUS NTAPI ZwDeleteValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName ); NTSYSAPI NTSTATUS NTAPI ZwEnumerateKey( - IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ ULONG Index, + _In_ KEY_INFORMATION_CLASS KeyInformationClass, + _Out_bytecap_(Length) PVOID KeyInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwEnumerateValueKey( - IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ ULONG Index, + _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + _Out_bytecap_(Length) PVOID KeyValueInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwFlushKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSAPI NTSTATUS NTAPI ZwGetPlugPlayEvent( - IN ULONG Reserved1, - IN ULONG Reserved2, - OUT PPLUGPLAY_EVENT_BLOCK Buffer, - IN ULONG BufferSize + _In_ ULONG Reserved1, + _In_ ULONG Reserved2, + _Out_bytecap_(BufferSize) PPLUGPLAY_EVENT_BLOCK Buffer, + _In_ ULONG BufferSize ); NTSYSAPI NTSTATUS NTAPI ZwLoadKey( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwLoadKey2( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes, - IN ULONG Flags + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes, + _In_ ULONG Flags ); NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeKey( - IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN Asynchroneous, - OUT PVOID ChangeBuffer, - IN ULONG Length, - IN BOOLEAN WatchSubtree + _In_ HANDLE KeyHandle, + _In_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN Asynchroneous, + _Out_bytecap_(Length) PVOID ChangeBuffer, + _In_ ULONG Length, + _In_ BOOLEAN WatchSubtree ); NTSYSAPI NTSTATUS NTAPI ZwOpenKey( - OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwPlugPlayControl( - IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, - IN OUT PVOID Buffer, - IN ULONG BufferSize + _In_ PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, + _Inout_bytecap_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize ); NTSYSAPI NTSTATUS NTAPI ZwQueryKey( - IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ KEY_INFORMATION_CLASS KeyInformationClass, + _Out_bytecap_(Length) PVOID KeyInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( - IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueList, - IN ULONG NumberOfValues, - OUT PVOID Buffer, - IN OUT PULONG Length, - OUT PULONG ReturnLength + _In_ HANDLE KeyHandle, + _Inout_ PKEY_VALUE_ENTRY ValueList, + _In_ ULONG NumberOfValues, + _Out_bytecap_(*Length) PVOID Buffer, + _Inout_ PULONG Length, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + _Out_bytecap_(Length) PVOID KeyValueInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwReplaceKey( - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE Key, - IN POBJECT_ATTRIBUTES ReplacedObjectAttributes + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE Key, + _In_ POBJECT_ATTRIBUTES ReplacedObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwRestoreKey( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG RestoreFlags + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG RestoreFlags ); NTSYSAPI NTSTATUS NTAPI ZwSaveKey( - IN HANDLE KeyHandle, - IN HANDLE FileHandle + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle ); NTSYSAPI NTSTATUS NTAPI ZwSaveKeyEx( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG Flags ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationKey( - IN HANDLE KeyHandle, - IN KEY_SET_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG KeyInformationLength + _In_ HANDLE KeyHandle, + _In_ KEY_SET_INFORMATION_CLASS KeyInformationClass, + _In_bytecount_(KeyInformationLength) PVOID KeyInformation, + _In_ ULONG KeyInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwSetValueKey( - IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN ULONG TitleIndex OPTIONAL, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG TitleIndex, + _In_ ULONG Type, + _In_bytecount_(DataSize) PVOID Data, + _In_ ULONG DataSize ); #endif @@ -571,14 +571,14 @@ NTSYSAPI NTSTATUS NTAPI ZwInitializeRegistry( - USHORT Flag + _In_ USHORT Flag ); NTSYSAPI NTSTATUS NTAPI ZwUnloadKey( - IN POBJECT_ATTRIBUTES KeyObjectAttributes + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes ); #endif diff --git a/reactos/include/ndk/dbgkfuncs.h b/reactos/include/ndk/dbgkfuncs.h index 6301eaabd66..acf6e8d942b 100644 --- a/reactos/include/ndk/dbgkfuncs.h +++ b/reactos/include/ndk/dbgkfuncs.h @@ -32,111 +32,111 @@ NTSYSCALLAPI NTSTATUS NTAPI NtDebugActiveProcess( - IN HANDLE Process, - IN HANDLE DebugObject + _In_ HANDLE Process, + _In_ HANDLE DebugObject ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateDebugObject( - OUT PHANDLE DebugHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Flags + _Out_ PHANDLE DebugHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags ); NTSYSCALLAPI NTSTATUS NTAPI NtDebugContinue( - IN HANDLE DebugObject, - IN PCLIENT_ID AppClientId, - IN NTSTATUS ContinueStatus + _In_ HANDLE DebugObject, + _In_ PCLIENT_ID AppClientId, + _In_ NTSTATUS ContinueStatus ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitForDebugEvent( - IN HANDLE DebugObject, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL, - OUT PDBGUI_WAIT_STATE_CHANGE StateChange + _In_ HANDLE DebugObject, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout, + _Out_ PDBGUI_WAIT_STATE_CHANGE StateChange ); NTSYSCALLAPI NTSTATUS NTAPI NtRemoveProcessDebug( - IN HANDLE Process, - IN HANDLE DebugObject + _In_ HANDLE Process, + _In_ HANDLE DebugObject ); NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationDebugObject( - IN HANDLE DebugObject, - IN DEBUGOBJECTINFOCLASS InformationClass, - IN PVOID Information, - IN ULONG InformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE DebugObject, + _In_ DEBUGOBJECTINFOCLASS InformationClass, + _In_ PVOID Information, + _In_ ULONG InformationLength, + _Out_opt_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwDebugActiveProcess( - IN HANDLE Process, - IN HANDLE DebugObject + _In_ HANDLE Process, + _In_ HANDLE DebugObject ); NTSYSAPI NTSTATUS NTAPI ZwCreateDebugObject( - OUT PHANDLE DebugHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Flags + _Out_ PHANDLE DebugHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags ); NTSYSAPI NTSTATUS NTAPI ZwDebugContinue( - IN HANDLE DebugObject, - IN PCLIENT_ID AppClientId, - IN NTSTATUS ContinueStatus + _In_ HANDLE DebugObject, + _In_ PCLIENT_ID AppClientId, + _In_ NTSTATUS ContinueStatus ); NTSYSAPI NTSTATUS NTAPI ZwRemoveProcessDebug( - IN HANDLE Process, - IN HANDLE DebugObject + _In_ HANDLE Process, + _In_ HANDLE DebugObject ); NTSYSAPI NTSTATUS NTAPI ZwWaitForDebugEvent( - IN HANDLE DebugObject, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL, - OUT PDBGUI_WAIT_STATE_CHANGE StateChange + _In_ HANDLE DebugObject, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout, + _Out_ PDBGUI_WAIT_STATE_CHANGE StateChange ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationDebugObject( - IN HANDLE DebugObject, - IN DEBUGOBJECTINFOCLASS InformationClass, - IN PVOID Information, - IN ULONG InformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE DebugObject, + _In_ DEBUGOBJECTINFOCLASS InformationClass, + _In_ PVOID Information, + _In_ ULONG InformationLength, + _Out_opt_ PULONG ReturnLength ); #endif diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h index bca62309f97..9caef1211e0 100644 --- a/reactos/include/ndk/exfuncs.h +++ b/reactos/include/ndk/exfuncs.h @@ -45,13 +45,13 @@ typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER; VOID FASTCALL ExEnterCriticalRegionAndAcquireFastMutexUnsafe( - PFAST_MUTEX FastMutex + _Inout_ PFAST_MUTEX FastMutex ); VOID FASTCALL ExReleaseFastMutexUnsafeAndLeaveCriticalRegion( - PFAST_MUTEX FastMutex + _Inout_ PFAST_MUTEX FastMutex ); // @@ -60,44 +60,44 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion( VOID FASTCALL ExfAcquirePushLockExclusive( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfAcquirePushLockShared( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfReleasePushLock( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfReleasePushLockExclusive( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfReleasePushLockShared( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfTryToWakePushLock( - PEX_PUSH_LOCK PushLock + _Inout_ PEX_PUSH_LOCK PushLock ); VOID FASTCALL ExfUnblockPushLock( - PEX_PUSH_LOCK PushLock, - PVOID CurrentWaitBlock + _Inout_ PEX_PUSH_LOCK PushLock, + _Inout_ PVOID CurrentWaitBlock ); // @@ -107,10 +107,10 @@ NTKERNELAPI BOOLEAN NTAPI ExEnumHandleTable( - IN PHANDLE_TABLE HandleTable, - IN PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, - IN OUT PVOID Context, - OUT PHANDLE Handle OPTIONAL + _In_ PHANDLE_TABLE HandleTable, + _In_ PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, + _Inout_ PVOID Context, + _Out_opt_ PHANDLE Handle ); // @@ -119,12 +119,12 @@ ExEnumHandleTable( NTSTATUS NTAPI ExRaiseHardError( - IN NTSTATUS ErrorStatus, - IN ULONG NumberOfParameters, - IN ULONG UnicodeStringParameterMask, - IN PULONG_PTR Parameters, - IN ULONG ValidResponseOptions, - OUT PULONG Response + _In_ NTSTATUS ErrorStatus, + _In_ ULONG NumberOfParameters, + _In_ ULONG UnicodeStringParameterMask, + _In_ PULONG_PTR Parameters, + _In_ ULONG ValidResponseOptions, + _Out_ PULONG Response ); #endif @@ -136,187 +136,187 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAddAtom( - IN PWSTR AtomName, - IN ULONG AtomNameLength, - IN OUT PRTL_ATOM Atom + _In_ PWSTR AtomName, + _In_ ULONG AtomNameLength, + _Inout_ PRTL_ATOM Atom ); NTSYSCALLAPI NTSTATUS NTAPI NtCancelTimer( - IN HANDLE TimerHandle, - OUT PBOOLEAN CurrentState OPTIONAL + _In_ HANDLE TimerHandle, + _Out_opt_ PBOOLEAN CurrentState ); NTSYSCALLAPI NTSTATUS NTAPI NtClearEvent( - IN HANDLE EventHandle + _In_ HANDLE EventHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState + _Out_ PHANDLE EventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ EVENT_TYPE EventType, + _In_ BOOLEAN InitialState ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateEventPair( - OUT PHANDLE EventPairHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventPairHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateKeyedEvent( - OUT PHANDLE KeyedEventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Flags + _Out_ PHANDLE KeyedEventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateMutant( - OUT PHANDLE MutantHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN InitialOwner + _Out_ PHANDLE MutantHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN InitialOwner ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateSemaphore( - OUT PHANDLE SemaphoreHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN LONG InitialCount, - IN LONG MaximumCount + _Out_ PHANDLE SemaphoreHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ LONG InitialCount, + _In_ LONG MaximumCount ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN TIMER_TYPE TimerType + _Out_ PHANDLE TimerHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TIMER_TYPE TimerType ); NTSYSCALLAPI NTSTATUS NTAPI NtDeleteAtom( - IN RTL_ATOM Atom + _In_ RTL_ATOM Atom ); NTSYSCALLAPI NTSTATUS NTAPI NtDisplayString( - IN PUNICODE_STRING DisplayString + _In_ PUNICODE_STRING DisplayString ); NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateSystemEnvironmentValuesEx( - IN ULONG InformationClass, - IN PVOID Buffer, - IN ULONG BufferLength + _In_ ULONG InformationClass, + _In_ PVOID Buffer, + _In_ ULONG BufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtFindAtom( - IN PWSTR AtomName, - IN ULONG AtomNameLength, - OUT PRTL_ATOM Atom OPTIONAL + _In_ PWSTR AtomName, + _In_ ULONG AtomNameLength, + _Out_opt_ PRTL_ATOM Atom ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenKeyedEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenEventPair( - OUT PHANDLE EventPairHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventPairHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenMutant( - OUT PHANDLE MutantHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE MutantHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenSemaphore( - OUT PHANDLE SemaphoreHandle, - IN ACCESS_MASK DesiredAcces, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SemaphoreHandle, + _In_ ACCESS_MASK DesiredAcces, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE TimerHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtPulseEvent( - IN HANDLE EventHandle, - IN PLONG PulseCount OPTIONAL + _In_ HANDLE EventHandle, + _In_opt_ PLONG PulseCount ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryDefaultLocale( - IN BOOLEAN UserProfile, - OUT PLCID DefaultLocaleId + _In_ BOOLEAN UserProfile, + _Out_ PLCID DefaultLocaleId ); NTSYSCALLAPI @@ -330,22 +330,22 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryEvent( - IN HANDLE EventHandle, - IN EVENT_INFORMATION_CLASS EventInformationClass, - OUT PVOID EventInformation, - IN ULONG EventInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE EventHandle, + _In_ EVENT_INFORMATION_CLASS EventInformationClass, + _Out_ PVOID EventInformation, + _In_ ULONG EventInformationLength, + _Out_ PULONG ReturnLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationAtom( - IN RTL_ATOM Atom, - IN ATOM_INFORMATION_CLASS AtomInformationClass, - OUT PVOID AtomInformation, - IN ULONG AtomInformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ RTL_ATOM Atom, + _In_ ATOM_INFORMATION_CLASS AtomInformationClass, + _Out_ PVOID AtomInformation, + _In_ ULONG AtomInformationLength, + _Out_opt_ PULONG ReturnLength ); NTSYSCALLAPI @@ -359,30 +359,30 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryMutant( - IN HANDLE MutantHandle, - IN MUTANT_INFORMATION_CLASS MutantInformationClass, - OUT PVOID MutantInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE MutantHandle, + _In_ MUTANT_INFORMATION_CLASS MutantInformationClass, + _Out_ PVOID MutantInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySemaphore( - IN HANDLE SemaphoreHandle, - IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, - OUT PVOID SemaphoreInformation, - IN ULONG Length, - OUT PULONG ReturnLength + _In_ HANDLE SemaphoreHandle, + _In_ SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, + _Out_ PVOID SemaphoreInformation, + _In_ ULONG Length, + _Out_ PULONG ReturnLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemEnvironmentValue( - IN PUNICODE_STRING Name, - OUT PWSTR Value, + _In_ PUNICODE_STRING Name, + _Out_ PWSTR Value, ULONG Length, PULONG ReturnLength ); @@ -391,87 +391,87 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemEnvironmentValueEx( - IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid, - IN PVOID Value, - IN OUT PULONG ReturnLength, - IN OUT PULONG Attributes + _In_ PUNICODE_STRING VariableName, + _In_ LPGUID VendorGuid, + _In_ PVOID Value, + _Inout_ PULONG ReturnLength, + _Inout_ PULONG Attributes ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _Out_ PVOID SystemInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimer( - IN HANDLE TimerHandle, - IN TIMER_INFORMATION_CLASS TimerInformationClass, - OUT PVOID TimerInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE TimerHandle, + _In_ TIMER_INFORMATION_CLASS TimerInformationClass, + _Out_ PVOID TimerInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtRaiseHardError( - IN NTSTATUS ErrorStatus, - IN ULONG NumberOfParameters, - IN ULONG UnicodeStringParameterMask, - IN PULONG_PTR Parameters, - IN ULONG ValidResponseOptions, - OUT PULONG Response + _In_ NTSTATUS ErrorStatus, + _In_ ULONG NumberOfParameters, + _In_ ULONG UnicodeStringParameterMask, + _In_ PULONG_PTR Parameters, + _In_ ULONG ValidResponseOptions, + _Out_ PULONG Response ); NTSYSCALLAPI NTSTATUS NTAPI NtReleaseMutant( - IN HANDLE MutantHandle, - IN PLONG ReleaseCount OPTIONAL + _In_ HANDLE MutantHandle, + _In_opt_ PLONG ReleaseCount ); NTSYSCALLAPI NTSTATUS NTAPI NtReleaseKeyedEvent( - IN HANDLE EventHandle, - IN PVOID Key, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE EventHandle, + _In_ PVOID Key, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSCALLAPI NTSTATUS NTAPI NtReleaseSemaphore( - IN HANDLE SemaphoreHandle, - IN LONG ReleaseCount, - OUT PLONG PreviousCount + _In_ HANDLE SemaphoreHandle, + _In_ LONG ReleaseCount, + _Out_ PLONG PreviousCount ); NTSYSCALLAPI NTSTATUS NTAPI NtResetEvent( - IN HANDLE EventHandle, - OUT PLONG NumberOfWaitingThreads OPTIONAL + _In_ HANDLE EventHandle, + _Out_opt_ PLONG NumberOfWaitingThreads ); NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultLocale( - IN BOOLEAN UserProfile, - IN LCID DefaultLocaleId + _In_ BOOLEAN UserProfile, + _In_ LCID DefaultLocaleId ); NTSYSCALLAPI @@ -485,145 +485,145 @@ NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultHardErrorPort( - IN HANDLE PortHandle + _In_ HANDLE PortHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetEvent( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL + _In_ HANDLE EventHandle, + _Out_opt_ PLONG PreviousState ); NTSYSCALLAPI NTSTATUS NTAPI NtSetEventBoostPriority( - IN HANDLE EventHandle + _In_ HANDLE EventHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetHighEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetHighWaitLowEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetLowEventPair( - HANDLE EventPair + _In_ HANDLE EventPair ); NTSYSCALLAPI NTSTATUS NTAPI NtSetLowWaitHighEventPair( - HANDLE EventPair + _In_ HANDLE EventPair ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemEnvironmentValue( - IN PUNICODE_STRING VariableName, - IN PUNICODE_STRING Value + _In_ PUNICODE_STRING VariableName, + _In_ PUNICODE_STRING Value ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemEnvironmentValueEx( - IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid + _In_ PUNICODE_STRING VariableName, + _In_ LPGUID VendorGuid ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN PVOID SystemInformation, - IN ULONG SystemInformationLength + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _In_ PVOID SystemInformation, + _In_ ULONG SystemInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtSetTimer( - IN HANDLE TimerHandle, - IN PLARGE_INTEGER DueTime, - IN PTIMER_APC_ROUTINE TimerApcRoutine, - IN PVOID TimerContext, - IN BOOLEAN WakeTimer, - IN LONG Period OPTIONAL, - OUT PBOOLEAN PreviousState OPTIONAL + _In_ HANDLE TimerHandle, + _In_ PLARGE_INTEGER DueTime, + _In_ PTIMER_APC_ROUTINE TimerApcRoutine, + _In_ PVOID TimerContext, + _In_ BOOLEAN WakeTimer, + _In_opt_ LONG Period, + _Out_opt_ PBOOLEAN PreviousState ); NTSYSCALLAPI NTSTATUS NTAPI NtSetUuidSeed( - IN PUCHAR UuidSeed + _In_ PUCHAR UuidSeed ); NTSYSCALLAPI NTSTATUS NTAPI NtShutdownSystem( - IN SHUTDOWN_ACTION Action + _In_ SHUTDOWN_ACTION Action ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitForKeyedEvent( - IN HANDLE EventHandle, - IN PVOID Key, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE EventHandle, + _In_ PVOID Key, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitHighEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitLowEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtTraceEvent( - IN ULONG TraceHandle, - IN ULONG Flags, - IN ULONG TraceHeaderLength, - IN PEVENT_TRACE_HEADER TraceHeader + _In_ ULONG TraceHandle, + _In_ ULONG Flags, + _In_ ULONG TraceHeaderLength, + _In_ PEVENT_TRACE_HEADER TraceHeader ); NTSYSAPI NTSTATUS NTAPI ZwAddAtom( - IN PWSTR AtomName, - IN ULONG AtomNameLength, - IN OUT PRTL_ATOM Atom + _In_ PWSTR AtomName, + _In_ ULONG AtomNameLength, + _Inout_ PRTL_ATOM Atom ); #ifdef NTOS_MODE_USER @@ -631,8 +631,8 @@ NTSYSAPI NTSTATUS NTAPI ZwCancelTimer( - IN HANDLE TimerHandle, - OUT PBOOLEAN CurrentState OPTIONAL + _In_ HANDLE TimerHandle, + _Out_opt_ PBOOLEAN CurrentState ); #endif @@ -640,48 +640,49 @@ NTSYSAPI NTSTATUS NTAPI ZwClearEvent( - IN HANDLE EventHandle + _In_ HANDLE EventHandle ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwCreateEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState + _Out_ PHANDLE EventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ EVENT_TYPE EventType, + _In_ BOOLEAN InitialState ); NTSYSAPI NTSTATUS NTAPI ZwCreateEventPair( - OUT PHANDLE EventPairHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventPairHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwCreateMutant( - OUT PHANDLE MutantHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN InitialOwner + _Out_ PHANDLE MutantHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN InitialOwner ); NTSYSAPI NTSTATUS NTAPI ZwCreateSemaphore( - OUT PHANDLE SemaphoreHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN LONG InitialCount, - IN LONG MaximumCount + _Out_ PHANDLE SemaphoreHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ LONG InitialCount, + _In_ LONG MaximumCount ); #ifdef NTOS_MODE_USER @@ -689,10 +690,10 @@ NTSYSAPI NTSTATUS NTAPI ZwCreateTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN TIMER_TYPE TimerType + _Out_ PHANDLE TimerHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TIMER_TYPE TimerType ); #endif @@ -700,59 +701,59 @@ NTSYSAPI NTSTATUS NTAPI ZwDeleteAtom( - IN RTL_ATOM Atom + _In_ RTL_ATOM Atom ); NTSYSAPI NTSTATUS NTAPI ZwDisplayString( - IN PUNICODE_STRING DisplayString + _In_ PUNICODE_STRING DisplayString ); NTSYSAPI NTSTATUS NTAPI ZwFindAtom( - IN PWSTR AtomName, - IN ULONG AtomNameLength, - OUT PRTL_ATOM Atom OPTIONAL + _In_ PWSTR AtomName, + _In_ ULONG AtomNameLength, + _Out_opt_ PRTL_ATOM Atom ); NTSYSCALLAPI NTSTATUS NTAPI ZwOpenEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwOpenEventPair( - OUT PHANDLE EventPairHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE EventPairHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwOpenMutant( - OUT PHANDLE MutantHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE MutantHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwOpenSemaphore( - OUT PHANDLE SemaphoreHandle, - IN ACCESS_MASK DesiredAcces, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SemaphoreHandle, + _In_ ACCESS_MASK DesiredAcces, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); #ifdef NTOS_MODE_USER @@ -760,9 +761,9 @@ NTSYSAPI NTSTATUS NTAPI ZwOpenTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE TimerHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); #endif @@ -770,16 +771,16 @@ NTSYSAPI NTSTATUS NTAPI ZwPulseEvent( - IN HANDLE EventHandle, - IN PLONG PulseCount OPTIONAL + _In_ HANDLE EventHandle, + _In_opt_ PLONG PulseCount ); NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultLocale( - IN BOOLEAN UserProfile, - OUT PLCID DefaultLocaleId + _In_ BOOLEAN UserProfile, + _Out_ PLCID DefaultLocaleId ); NTSYSAPI @@ -793,22 +794,22 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryEvent( - IN HANDLE EventHandle, - IN EVENT_INFORMATION_CLASS EventInformationClass, - OUT PVOID EventInformation, - IN ULONG EventInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE EventHandle, + _In_ EVENT_INFORMATION_CLASS EventInformationClass, + _Out_ PVOID EventInformation, + _In_ ULONG EventInformationLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryInformationAtom( - IN RTL_ATOM Atom, - IN ATOM_INFORMATION_CLASS AtomInformationClass, - OUT PVOID AtomInformation, - IN ULONG AtomInformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ RTL_ATOM Atom, + _In_ ATOM_INFORMATION_CLASS AtomInformationClass, + _Out_ PVOID AtomInformation, + _In_ ULONG AtomInformationLength, + _Out_opt_ PULONG ReturnLength ); NTSYSAPI @@ -822,98 +823,98 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryMutant( - IN HANDLE MutantHandle, - IN MUTANT_INFORMATION_CLASS MutantInformationClass, - OUT PVOID MutantInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE MutantHandle, + _In_ MUTANT_INFORMATION_CLASS MutantInformationClass, + _Out_ PVOID MutantInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwQuerySemaphore( - IN HANDLE SemaphoreHandle, - IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, - OUT PVOID SemaphoreInformation, - IN ULONG Length, - OUT PULONG ReturnLength + _In_ HANDLE SemaphoreHandle, + _In_ SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, + _Out_ PVOID SemaphoreInformation, + _In_ ULONG Length, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwQuerySystemEnvironmentValue( - IN PUNICODE_STRING Name, - OUT PWSTR Value, - ULONG Length, - PULONG ReturnLength + _In_ PUNICODE_STRING Name, + _Out_ PWSTR Value, + _In_ ULONG Length, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwQuerySystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID SystemInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _Out_ PVOID SystemInformation, + _In_ SIZE_T Length, + _Out_ PSIZE_T ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryTimer( - IN HANDLE TimerHandle, - IN TIMER_INFORMATION_CLASS TimerInformationClass, - OUT PVOID TimerInformation, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE TimerHandle, + _In_ TIMER_INFORMATION_CLASS TimerInformationClass, + _Out_ PVOID TimerInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwRaiseHardError( - IN NTSTATUS ErrorStatus, - IN ULONG NumberOfParameters, - IN ULONG UnicodeStringParameterMask, - IN PULONG_PTR Parameters, - IN ULONG ValidResponseOptions, - OUT PULONG Response + _In_ NTSTATUS ErrorStatus, + _In_ ULONG NumberOfParameters, + _In_ ULONG UnicodeStringParameterMask, + _In_ PULONG_PTR Parameters, + _In_ ULONG ValidResponseOptions, + _Out_ PULONG Response ); NTSYSAPI NTSTATUS NTAPI ZwReleaseMutant( - IN HANDLE MutantHandle, - IN PLONG ReleaseCount OPTIONAL + _In_ HANDLE MutantHandle, + _In_opt_ PLONG ReleaseCount ); NTSYSAPI NTSTATUS NTAPI ZwReleaseSemaphore( - IN HANDLE SemaphoreHandle, - IN LONG ReleaseCount, - OUT PLONG PreviousCount + _In_ HANDLE SemaphoreHandle, + _In_ LONG ReleaseCount, + _Out_ PLONG PreviousCount ); NTSYSAPI NTSTATUS NTAPI ZwResetEvent( - IN HANDLE EventHandle, - OUT PLONG NumberOfWaitingThreads OPTIONAL + _In_ HANDLE EventHandle, + _Out_opt_ PLONG NumberOfWaitingThreads ); NTSYSAPI NTSTATUS NTAPI ZwSetDefaultLocale( - IN BOOLEAN UserProfile, - IN LCID DefaultLocaleId + _In_ BOOLEAN UserProfile, + _In_ LCID DefaultLocaleId ); NTSYSAPI @@ -927,60 +928,60 @@ NTSYSAPI NTSTATUS NTAPI ZwSetDefaultHardErrorPort( - IN HANDLE PortHandle + _In_ HANDLE PortHandle ); NTSYSAPI NTSTATUS NTAPI ZwSetEvent( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL + _In_ HANDLE EventHandle, + _Out_opt_ PLONG PreviousState ); NTSYSAPI NTSTATUS NTAPI ZwSetHighEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSAPI NTSTATUS NTAPI ZwSetHighWaitLowEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSAPI NTSTATUS NTAPI ZwSetLowEventPair( - HANDLE EventPair + _In_ HANDLE EventPair ); NTSYSAPI NTSTATUS NTAPI ZwSetLowWaitHighEventPair( - HANDLE EventPair + _In_ HANDLE EventPair ); NTSYSAPI NTSTATUS NTAPI ZwSetSystemEnvironmentValue( - IN PUNICODE_STRING VariableName, - IN PUNICODE_STRING Value + _In_ PUNICODE_STRING VariableName, + _In_ PUNICODE_STRING Value ); NTSYSAPI NTSTATUS NTAPI ZwSetSystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN PVOID SystemInformation, - IN SIZE_T SystemInformationLength + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _In_ PVOID SystemInformation, + _In_ SIZE_T SystemInformationLength ); #ifdef NTOS_MODE_USER @@ -988,13 +989,13 @@ NTSYSAPI NTSTATUS NTAPI ZwSetTimer( - IN HANDLE TimerHandle, - IN PLARGE_INTEGER DueTime, - IN PTIMER_APC_ROUTINE TimerApcRoutine, - IN PVOID TimerContext, - IN BOOLEAN WakeTimer, - IN LONG Period OPTIONAL, - OUT PBOOLEAN PreviousState OPTIONAL + _In_ HANDLE TimerHandle, + _In_ PLARGE_INTEGER DueTime, + _In_ PTIMER_APC_ROUTINE TimerApcRoutine, + _In_ PVOID TimerContext, + _In_ BOOLEAN WakeTimer, + _In_opt_ LONG Period, + _Out_opt_ PBOOLEAN PreviousState ); #endif @@ -1002,38 +1003,38 @@ NTSYSAPI NTSTATUS NTAPI ZwSetUuidSeed( - IN PUCHAR UuidSeed + _In_ PUCHAR UuidSeed ); NTSYSAPI NTSTATUS NTAPI ZwShutdownSystem( - IN SHUTDOWN_ACTION Action + _In_ SHUTDOWN_ACTION Action ); NTSYSAPI NTSTATUS NTAPI ZwWaitHighEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSAPI NTSTATUS NTAPI ZwWaitLowEventPair( - IN HANDLE EventPairHandle + _In_ HANDLE EventPairHandle ); NTSYSAPI NTSTATUS NTAPI ZwTraceEvent( - IN ULONG TraceHandle, - IN ULONG Flags, - IN ULONG TraceHeaderLength, - IN PEVENT_TRACE_HEADER TraceHeader + _In_ ULONG TraceHandle, + _In_ ULONG Flags, + _In_ ULONG TraceHeaderLength, + _In_ PEVENT_TRACE_HEADER TraceHeader ); #ifdef __cplusplus diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h index 9d356ef3840..bd5780d1446 100644 --- a/reactos/include/ndk/extypes.h +++ b/reactos/include/ndk/extypes.h @@ -362,7 +362,7 @@ struct _SYSTEM_FIRMWARE_TABLE_INFORMATION; typedef NTSTATUS (__cdecl *PFNFTH)( - IN struct _SYSTEM_FIRMWARE_TABLE_INFORMATION *FirmwareTableInformation + _In_ struct _SYSTEM_FIRMWARE_TABLE_INFORMATION *FirmwareTableInformation ); #else @@ -373,9 +373,9 @@ NTSTATUS struct _HANDLE_TABLE_ENTRY; typedef BOOLEAN (NTAPI *PEX_ENUM_HANDLE_CALLBACK)( - IN struct _HANDLE_TABLE_ENTRY *HandleTableEntry, - IN HANDLE Handle, - IN PVOID Context + _In_ struct _HANDLE_TABLE_ENTRY *HandleTableEntry, + _In_ HANDLE Handle, + _In_ PVOID Context ); // diff --git a/reactos/include/ndk/halfuncs.h b/reactos/include/ndk/halfuncs.h index b55810da2f4..b54a2032ea1 100644 --- a/reactos/include/ndk/halfuncs.h +++ b/reactos/include/ndk/halfuncs.h @@ -68,7 +68,7 @@ NTHALAPI VOID NTAPI HalDisplayString( - IN PCHAR String + _In_ PCHAR String ); // @@ -86,24 +86,24 @@ NTHALAPI VOID NTAPI HalInitializeProcessor( - ULONG ProcessorNumber, - struct _LOADER_PARAMETER_BLOCK *LoaderBlock + _In_ ULONG ProcessorNumber, + _In_ struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); NTHALAPI BOOLEAN NTAPI HalInitSystem( - ULONG BootPhase, - struct _LOADER_PARAMETER_BLOCK *LoaderBlock + _In_ ULONG BootPhase, + _In_ struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); NTHALAPI BOOLEAN NTAPI HalStartNextProcessor( - IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PKPROCESSOR_STATE ProcessorState + _In_ struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + _In_ PKPROCESSOR_STATE ProcessorState ); #endif @@ -112,7 +112,7 @@ NTHALAPI VOID NTAPI HalReturnToFirmware( - FIRMWARE_REENTRY Action + _In_ FIRMWARE_REENTRY Action ); // @@ -132,32 +132,32 @@ NTHALAPI BOOLEAN NTAPI HalBeginSystemInterrupt( - KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql + _In_ KIRQL Irql, + _In_ ULONG Vector, + _Out_ PKIRQL OldIrql ); VOID FASTCALL HalClearSoftwareInterrupt( - IN KIRQL Request + _In_ KIRQL Request ); NTHALAPI VOID NTAPI HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql + _In_ ULONG Vector, + _In_ KIRQL Irql ); NTHALAPI BOOLEAN NTAPI HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode + _In_ ULONG Vector, + _In_ KIRQL Irql, + _In_ KINTERRUPT_MODE InterruptMode ); NTHALAPI @@ -165,7 +165,7 @@ VOID NTAPI HalEndSystemInterrupt( KIRQL Irql, - IN PKTRAP_FRAME TrapFrame + _In_ PKTRAP_FRAME TrapFrame ); #ifdef _ARM_ // FIXME: ndk/arm? armddk.h? @@ -186,14 +186,14 @@ NTHALAPI VOID FASTCALL HalRequestSoftwareInterrupt( - KIRQL SoftwareInterruptRequested + _In_ KIRQL SoftwareInterruptRequested ); NTHALAPI VOID NTAPI HalRequestIpi( - KAFFINITY TargetSet + _In_ KAFFINITY TargetSet ); NTHALAPI @@ -207,9 +207,9 @@ NTHALAPI UCHAR FASTCALL HalSystemVectorDispatchEntry( - IN ULONG Vector, - OUT PKINTERRUPT_ROUTINE **FlatDispatch, - OUT PKINTERRUPT_ROUTINE *NoConnection + _In_ ULONG Vector, + _Out_ PKINTERRUPT_ROUTINE **FlatDispatch, + _Out_ PKINTERRUPT_ROUTINE *NoConnection ); // @@ -219,7 +219,7 @@ NTHALAPI NTSTATUS NTAPI HalAdjustResourceList( - IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *pResourceList + _Inout_ PIO_RESOURCE_REQUIREMENTS_LIST *pResourceList ); // @@ -230,17 +230,17 @@ NTHALAPI ARC_STATUS NTAPI HalSetEnvironmentVariable( - IN PCH Name, - IN PCH Value + _In_ PCH Name, + _In_ PCH Value ); NTHALAPI ARC_STATUS NTAPI HalGetEnvironmentVariable( - IN PCH Variable, - IN USHORT Length, - OUT PCH Buffer + _In_ PCH Variable, + _In_ USHORT Length, + _Out_ PCH Buffer ); #endif @@ -250,21 +250,21 @@ HalGetEnvironmentVariable( VOID NTAPI HalStartProfileInterrupt( - IN KPROFILE_SOURCE ProfileSource + _In_ KPROFILE_SOURCE ProfileSource ); NTHALAPI VOID NTAPI HalStopProfileInterrupt( - IN KPROFILE_SOURCE ProfileSource + _In_ KPROFILE_SOURCE ProfileSource ); NTHALAPI ULONG_PTR NTAPI HalSetProfileInterval( - IN ULONG_PTR Interval + _In_ ULONG_PTR Interval ); // @@ -274,21 +274,21 @@ NTHALAPI BOOLEAN NTAPI HalQueryRealTimeClock( - IN PTIME_FIELDS RtcTime + _In_ PTIME_FIELDS RtcTime ); NTHALAPI BOOLEAN NTAPI HalSetRealTimeClock( - IN PTIME_FIELDS RtcTime + _In_ PTIME_FIELDS RtcTime ); NTHALAPI ULONG NTAPI HalSetTimeIncrement( - IN ULONG Increment + _In_ ULONG Increment ); #endif diff --git a/reactos/include/ndk/haltypes.h b/reactos/include/ndk/haltypes.h index 1fd0b94aadc..d27581b83fc 100644 --- a/reactos/include/ndk/haltypes.h +++ b/reactos/include/ndk/haltypes.h @@ -45,54 +45,54 @@ typedef enum _FIRMWARE_REENTRY typedef PBUS_HANDLER (FASTCALL *pHalHandlerForConfigSpace)( - IN BUS_DATA_TYPE ConfigSpace, - IN ULONG BusNumber + _In_ BUS_DATA_TYPE ConfigSpace, + _In_ ULONG BusNumber ); typedef NTSTATUS (NTAPI *PINSTALL_BUS_HANDLER)( - IN PBUS_HANDLER Bus + _In_ PBUS_HANDLER Bus ); typedef NTSTATUS (NTAPI *pHalRegisterBusHandler)( - IN INTERFACE_TYPE InterfaceType, - IN BUS_DATA_TYPE ConfigSpace, - IN ULONG BusNumber, - IN INTERFACE_TYPE ParentInterfaceType, - IN ULONG ParentBusNumber, - IN ULONG ContextSize, - IN PINSTALL_BUS_HANDLER InstallCallback, - OUT PBUS_HANDLER *BusHandler + _In_ INTERFACE_TYPE InterfaceType, + _In_ BUS_DATA_TYPE ConfigSpace, + _In_ ULONG BusNumber, + _In_ INTERFACE_TYPE ParentInterfaceType, + _In_ ULONG ParentBusNumber, + _In_ ULONG ContextSize, + _In_ PINSTALL_BUS_HANDLER InstallCallback, + _Out_ PBUS_HANDLER *BusHandler ); typedef VOID (NTAPI *pHalSetWakeEnable)( - IN BOOLEAN Enable + _In_ BOOLEAN Enable ); typedef VOID (NTAPI *pHalSetWakeAlarm)( - IN ULONGLONG AlartTime, - IN PTIME_FIELDS TimeFields + _In_ ULONGLONG AlartTime, + _In_ PTIME_FIELDS TimeFields ); typedef VOID (NTAPI *pHalLocateHiberRanges)( - IN PVOID MemoryMap + _In_ PVOID MemoryMap ); typedef NTSTATUS (NTAPI *pHalAllocateMapRegisters)( - IN PADAPTER_OBJECT AdapterObject, - IN ULONG Unknown, - IN ULONG Unknown2, + _In_ PADAPTER_OBJECT AdapterObject, + _In_ ULONG Unknown, + _In_ ULONG Unknown2, PMAP_REGISTER_ENTRY Registers ); @@ -102,54 +102,54 @@ NTSTATUS typedef NTSTATUS (NTAPI *PADJUSTRESOURCELIST)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *Resources + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _Inout_ PIO_RESOURCE_REQUIREMENTS_LIST *Resources ); typedef NTSTATUS (NTAPI *PASSIGNSLOTRESOURCES)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ PUNICODE_STRING RegistryPath, + _In_ PUNICODE_STRING DriverClassName, + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG SlotNumber, + _Inout_ PCM_RESOURCE_LIST *AllocatedResources ); typedef ULONG (NTAPI *PGETSETBUSDATA)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - OUT PVOID Buffer, - IN ULONG Offset, - IN ULONG Length + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _Out_ PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length ); typedef ULONG (NTAPI *PGETINTERRUPTVECTOR)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG BusInterruptLevel, + _In_ ULONG BusInterruptVector, + _Out_ PKIRQL Irql, + _Out_ PKAFFINITY Affinity ); typedef BOOLEAN (NTAPI *PTRANSLATEBUSADDRESS)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ PHYSICAL_ADDRESS BusAddress, + _Inout_ PULONG AddressSpace, + _Out_ PPHYSICAL_ADDRESS TranslatedAddress ); // @@ -199,7 +199,7 @@ typedef struct _SUPPORTED_RANGE LONGLONG Limit; } SUPPORTED_RANGE, *PSUPPORTED_RANGE; -typedef struct _SUPPORTED_RANGES +typedef struct _SUPPORTED_RANGES { USHORT Version; BOOLEAN Sorted; diff --git a/reactos/include/ndk/ifssupp.h b/reactos/include/ndk/ifssupp.h index b970ee33ae7..0eea03a6cc8 100644 --- a/reactos/include/ndk/ifssupp.h +++ b/reactos/include/ndk/ifssupp.h @@ -30,9 +30,9 @@ typedef enum _TOKEN_TYPE typedef NTSTATUS (NTAPI * PRTL_HEAP_COMMIT_ROUTINE)( - IN PVOID Base, - IN OUT PVOID *CommitAddress, - IN OUT PSIZE_T CommitSize + _In_ PVOID Base, + _Inout_ PVOID *CommitAddress, + _Inout_ PSIZE_T CommitSize ); typedef struct _RTL_HEAP_PARAMETERS diff --git a/reactos/include/ndk/inbvfuncs.h b/reactos/include/ndk/inbvfuncs.h index d21f16e969a..173604fe258 100644 --- a/reactos/include/ndk/inbvfuncs.h +++ b/reactos/include/ndk/inbvfuncs.h @@ -44,7 +44,7 @@ InbvCheckDisplayOwnership( VOID NTAPI InbvNotifyDisplayOwnershipLost( - IN INBV_RESET_DISPLAY_PARAMETERS Callback + _In_ INBV_RESET_DISPLAY_PARAMETERS Callback ); // @@ -53,13 +53,13 @@ InbvNotifyDisplayOwnershipLost( VOID NTAPI InbvEnableBootDriver( - IN BOOLEAN Enable + _In_ BOOLEAN Enable ); VOID NTAPI InbvInstallDisplayStringFilter( - IN INBV_DISPLAY_STRING_FILTER DisplayFilter + _In_ INBV_DISPLAY_STRING_FILTER DisplayFilter ); BOOLEAN @@ -74,13 +74,13 @@ InbvIsBootDriverInstalled( BOOLEAN NTAPI InbvDisplayString( - IN PCHAR String + _In_ PCHAR String ); BOOLEAN NTAPI InbvEnableDisplayString( - IN BOOLEAN Enable + _In_ BOOLEAN Enable ); BOOLEAN @@ -92,33 +92,33 @@ InbvResetDisplay( VOID NTAPI InbvSetScrollRegion( - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height ); VOID NTAPI InbvSetTextColor( - IN ULONG Color + _In_ ULONG Color ); VOID NTAPI InbvSolidColorFill( - IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Color + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Width, + _In_ ULONG Height, + _In_ ULONG Color ); VOID NTAPI InbvSetProgressBarSubset( - IN ULONG Floor, - IN ULONG Ceiling + _In_ ULONG Floor, + _In_ ULONG Ceiling ); #endif diff --git a/reactos/include/ndk/iofuncs.h b/reactos/include/ndk/iofuncs.h index 2aab3a1a798..5e566527bdf 100644 --- a/reactos/include/ndk/iofuncs.h +++ b/reactos/include/ndk/iofuncs.h @@ -32,33 +32,33 @@ Author: VOID FASTCALL IoAssignDriveLetters( - IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString + _In_ struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + _In_ PSTRING NtDeviceName, + _Out_ PUCHAR NtSystemPath, + _Out_ PSTRING NtSystemPathString ); NTSTATUS NTAPI IoSynchronousInvalidateDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN DEVICE_RELATION_TYPE Type + _In_ PDEVICE_OBJECT DeviceObject, + _In_ DEVICE_RELATION_TYPE Type ); NTSTATUS NTAPI IoCreateDriver( - IN PUNICODE_STRING DriverName OPTIONAL, - IN PDRIVER_INITIALIZE InitializationFunction + _In_opt_ PUNICODE_STRING DriverName, + _In_ PDRIVER_INITIALIZE InitializationFunction ); NTSTATUS NTAPI IoReportHalResourceUsage( - IN PUNICODE_STRING HalName, - IN PCM_RESOURCE_LIST RawResourceList, - IN PCM_RESOURCE_LIST TranslatedResourceList, - IN ULONG ResourceListSize + _In_ PUNICODE_STRING HalName, + _In_ PCM_RESOURCE_LIST RawResourceList, + _In_ PCM_RESOURCE_LIST TranslatedResourceList, + _In_ ULONG ResourceListSize ); #endif @@ -69,85 +69,86 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAddBootEntry( - IN PBOOT_ENTRY BootEntry, - IN ULONG Id + _In_ PBOOT_ENTRY BootEntry, + _In_ ULONG Id ); NTSYSCALLAPI NTSTATUS NTAPI NtAddDriverEntry( - IN PEFI_DRIVER_ENTRY BootEntry, - IN ULONG Id + _In_ PEFI_DRIVER_ENTRY BootEntry, + _In_ ULONG Id ); NTSYSCALLAPI NTSTATUS NTAPI NtCancelIoFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtCreateFile( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions, - IN PVOID EaBuffer OPTIONAL, - IN ULONG EaLength + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateIoCompletion( - OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG NumberOfConcurrentThreads + _Out_ PHANDLE IoCompletionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG NumberOfConcurrentThreads ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateMailslotFile( - OUT PHANDLE MailSlotFileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG MaxMessageSize, - IN PLARGE_INTEGER TimeOut + _Out_ PHANDLE MailSlotFileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG MaxMessageSize, + _In_ PLARGE_INTEGER TimeOut ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateNamedPipeFile( - OUT PHANDLE NamedPipeFileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions, - IN ULONG WriteModeMessage, - IN ULONG ReadModeMessage, - IN ULONG NonBlocking, - IN ULONG MaxInstances, - IN ULONG InBufferSize, - IN ULONG OutBufferSize, - IN PLARGE_INTEGER DefaultTimeOut + _Out_ PHANDLE NamedPipeFileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_ ULONG WriteModeMessage, + _In_ ULONG ReadModeMessage, + _In_ ULONG NonBlocking, + _In_ ULONG MaxInstances, + _In_ ULONG InBufferSize, + _In_ ULONG OutBufferSize, + _In_ PLARGE_INTEGER DefaultTimeOut ); @@ -155,61 +156,62 @@ NTSYSCALLAPI NTSTATUS NTAPI NtDeleteDriverEntry( - IN ULONG Id + _In_ ULONG Id ); NTSYSCALLAPI NTSTATUS NTAPI NtDeleteBootEntry( - IN ULONG Id + _In_ ULONG Id ); NTSYSCALLAPI NTSTATUS NTAPI NtDeleteFile( - IN POBJECT_ATTRIBUTES ObjectAttributes + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtDeviceIoControlFile( - IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferSize + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG IoControlCode, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateBootEntries( - IN PVOID Buffer, - IN PULONG BufferLength + _In_ PVOID Buffer, + _In_ PULONG BufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateDriverEntries( - IN PVOID Buffer, - IN PULONG BufferLength + _In_ PVOID Buffer, + _In_ PULONG BufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtFlushBuffersFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); NTSYSCALLAPI @@ -217,308 +219,316 @@ NTSTATUS NTAPI NtFlushWriteBuffer(VOID); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtFsControlFile( - IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferSize + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG FsControlCode, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtLoadDriver( - IN PUNICODE_STRING DriverServiceName + _In_ PUNICODE_STRING DriverServiceName ); NTSYSCALLAPI NTSTATUS NTAPI NtLockFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Length, - IN ULONG Key, - IN BOOLEAN FailImmediatedly, - IN BOOLEAN ExclusiveLock + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ PLARGE_INTEGER ByteOffset, + _In_ PLARGE_INTEGER Length, + _In_ ULONG Key, + _In_ BOOLEAN FailImmediatedly, + _In_ BOOLEAN ExclusiveLock ); NTSYSCALLAPI NTSTATUS NTAPI NtModifyBootEntry( - IN PBOOT_ENTRY BootEntry + _In_ PBOOT_ENTRY BootEntry ); NTSYSCALLAPI NTSTATUS NTAPI NtModifyDriverEntry( - IN PEFI_DRIVER_ENTRY DriverEntry + _In_ PEFI_DRIVER_ENTRY DriverEntry ); NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeDirectoryFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG BufferSize, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenFile( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG OpenOptions + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG ShareAccess, + _In_ ULONG OpenOptions ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenIoCompletion( - OUT PHANDLE CompetionPort, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE CompetionPort, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryAttributesFile( - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PFILE_BASIC_INFORMATION FileInformation + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PFILE_BASIC_INFORMATION FileInformation ); NTSTATUS NTAPI NtQueryDriverEntryOrder( - IN PULONG Ids, - IN PULONG Count + _In_ PULONG Ids, + _In_ PULONG Count ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootEntryOrder( - IN PULONG Ids, - IN PULONG Count + _In_ PULONG Ids, + _In_ PULONG Count ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootOptions( - IN PBOOT_OPTIONS BootOptions, - IN PULONG BootOptionsLength + _In_ PBOOT_OPTIONS BootOptions, + _In_ PULONG BootOptionsLength ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryDirectoryFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN BOOLEAN ReturnSingleEntry, - IN PUNICODE_STRING FileName OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass, + _In_ BOOLEAN ReturnSingleEntry, + _In_opt_ PUNICODE_STRING FileName, + _In_ BOOLEAN RestartScan ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryEaFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN PVOID EaList OPTIONAL, - IN ULONG EaListLength, - IN PULONG EaIndex OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_ PVOID Buffer, + _In_ ULONG Length, + _In_ BOOLEAN ReturnSingleEntry, + _In_opt_ PVOID EaList, + _In_ ULONG EaListLength, + _In_opt_ PULONG EaIndex, + _In_ BOOLEAN RestartScan ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryFullAttributesFile( - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PFILE_NETWORK_OPEN_INFORMATION FileInformation ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryIoCompletion( - IN HANDLE IoCompletionHandle, - IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, - OUT PVOID IoCompletionInformation, - IN ULONG IoCompletionInformationLength, - OUT PULONG ResultLength OPTIONAL + _In_ HANDLE IoCompletionHandle, + _In_ IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, + _Out_ PVOID IoCompletionInformation, + _In_ ULONG IoCompletionInformationLength, + _Out_opt_ PULONG ResultLength ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryQuotaInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN PVOID SidList OPTIONAL, - IN ULONG SidListLength, - IN PSID StartSid OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_ BOOLEAN ReturnSingleEntry, + _In_reads_bytes_opt_(SidListLength) PVOID SidList, + _In_ ULONG SidListLength, + _In_reads_bytes_opt_((8 + (4 * ((SID *)StartSid)->SubAuthorityCount))) // SeLengthSid() + PSID StartSid, + _In_ BOOLEAN RestartScan ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryVolumeInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FsInformation, + _In_ ULONG Length, + _In_ FS_INFORMATION_CLASS FsInformationClass ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtReadFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset OPTIONAL, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_opt_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSCALLAPI NTSTATUS NTAPI NtReadFileScatter( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK UserIoStatusBlock, - IN FILE_SEGMENT_ELEMENT BufferDescription[], - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE UserApcRoutine, + _In_opt_ PVOID UserApcContext, + _Out_ PIO_STATUS_BLOCK UserIoStatusBlock, + _In_ FILE_SEGMENT_ELEMENT BufferDescription[], + _In_ ULONG BufferLength, + _In_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSCALLAPI NTSTATUS NTAPI NtRemoveIoCompletion( - IN HANDLE IoCompletionHandle, - OUT PVOID *CompletionKey, - OUT PVOID *CompletionContext, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE IoCompletionHandle, + _Out_ PVOID *CompletionKey, + _Out_ PVOID *CompletionContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSCALLAPI NTSTATUS NTAPI NtSetBootEntryOrder( - IN PULONG Ids, - IN PULONG Count + _In_ PULONG Ids, + _In_ PULONG Count ); NTSYSCALLAPI NTSTATUS NTAPI NtSetBootOptions( - IN PBOOT_OPTIONS BootOptions, - IN ULONG FieldsToChange + _In_ PBOOT_OPTIONS BootOptions, + _In_ ULONG FieldsToChange ); NTSTATUS NTAPI NtSetDriverEntryOrder( - IN PULONG Ids, - IN PULONG Count + _In_ PULONG Ids, + _In_ PULONG Count ); NTSYSCALLAPI NTSTATUS NTAPI NtSetEaFile( - IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, + _In_ HANDLE FileHandle, + _In_ PIO_STATUS_BLOCK IoStatusBlock, PVOID EaBuffer, ULONG EaBufferSize ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationFile( - IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass ); NTSYSCALLAPI NTSTATUS NTAPI NtSetIoCompletion( - IN HANDLE IoCompletionPortHandle, - IN PVOID CompletionKey, - IN PVOID CompletionContext, - IN NTSTATUS CompletionStatus, - IN ULONG CompletionInformation + _In_ HANDLE IoCompletionPortHandle, + _In_ PVOID CompletionKey, + _In_ PVOID CompletionContext, + _In_ NTSTATUS CompletionStatus, + _In_ ULONG CompletionInformation ); NTSYSCALLAPI @@ -531,15 +541,16 @@ NtSetQuotaInformationFile( ULONG BufferLength ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetVolumeInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID FsInformation, + _In_ ULONG Length, + _In_ FS_INFORMATION_CLASS FsInformationClass ); NTSYSCALLAPI @@ -556,164 +567,169 @@ NTSYSCALLAPI NTSTATUS NTAPI NtUnloadDriver( - IN PUNICODE_STRING DriverServiceName + _In_ PUNICODE_STRING DriverServiceName ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtUnlockFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Lenght, - OUT ULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ PLARGE_INTEGER ByteOffset, + _In_ PLARGE_INTEGER Length, + _In_ ULONG Key ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtWriteFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID Buffer, - IN ULONG Length, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_opt_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSCALLAPI NTSTATUS NTAPI NtWriteFileGather( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN FILE_SEGMENT_ELEMENT BufferDescription[], - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ FILE_SEGMENT_ELEMENT BufferDescription[], + _In_ ULONG BufferLength, + _In_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSAPI NTSTATUS NTAPI ZwAddBootEntry( - IN PUNICODE_STRING EntryName, - IN PUNICODE_STRING EntryValue + _In_ PUNICODE_STRING EntryName, + _In_ PUNICODE_STRING EntryValue ); NTSYSAPI NTSTATUS NTAPI ZwCancelIoFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwCreateFile( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions, - IN PVOID EaBuffer OPTIONAL, - IN ULONG EaLength + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength ); NTSYSAPI NTSTATUS NTAPI ZwCreateIoCompletion( - OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG NumberOfConcurrentThreads + _Out_ PHANDLE IoCompletionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG NumberOfConcurrentThreads ); NTSYSAPI NTSTATUS NTAPI ZwCreateMailslotFile( - OUT PHANDLE MailSlotFileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG MaxMessageSize, - IN PLARGE_INTEGER TimeOut + _Out_ PHANDLE MailSlotFileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG MaxMessageSize, + _In_ PLARGE_INTEGER TimeOut ); NTSYSAPI NTSTATUS NTAPI ZwCreateNamedPipeFile( - OUT PHANDLE NamedPipeFileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions, - IN ULONG WriteModeMessage, - IN ULONG ReadModeMessage, - IN ULONG NonBlocking, - IN ULONG MaxInstances, - IN ULONG InBufferSize, - IN ULONG OutBufferSize, - IN PLARGE_INTEGER DefaultTimeOut + _Out_ PHANDLE NamedPipeFileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_ ULONG WriteModeMessage, + _In_ ULONG ReadModeMessage, + _In_ ULONG NonBlocking, + _In_ ULONG MaxInstances, + _In_ ULONG InBufferSize, + _In_ ULONG OutBufferSize, + _In_ PLARGE_INTEGER DefaultTimeOut ); NTSYSAPI NTSTATUS NTAPI ZwDeleteBootEntry( - IN PUNICODE_STRING EntryName, - IN PUNICODE_STRING EntryValue + _In_ PUNICODE_STRING EntryName, + _In_ PUNICODE_STRING EntryValue ); NTSYSAPI NTSTATUS NTAPI ZwDeleteFile( - IN POBJECT_ATTRIBUTES ObjectAttributes + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwDeviceIoControlFile( - IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferSize + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG IoControlCode, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwFlushBuffersFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock ); NTSYSAPI @@ -721,20 +737,21 @@ NTSTATUS NTAPI ZwFlushWriteBuffer(VOID); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwFsControlFile( - IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferSize + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG FsControlCode, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); #ifdef NTOS_MODE_USER @@ -742,7 +759,7 @@ NTSYSAPI NTSTATUS NTAPI ZwLoadDriver( - IN PUNICODE_STRING DriverServiceName + _In_ PUNICODE_STRING DriverServiceName ); #endif @@ -750,77 +767,78 @@ NTSYSAPI NTSTATUS NTAPI ZwLockFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Length, - IN ULONG Key, - IN BOOLEAN FailImmediatedly, - IN BOOLEAN ExclusiveLock + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ PLARGE_INTEGER ByteOffset, + _In_ PLARGE_INTEGER Length, + _In_ ULONG Key, + _In_ BOOLEAN FailImmediatedly, + _In_ BOOLEAN ExclusiveLock ); NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeDirectoryFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG BufferSize, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree ); NTSYSAPI NTSTATUS NTAPI ZwOpenFile( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG OpenOptions + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG ShareAccess, + _In_ ULONG OpenOptions ); NTSYSAPI NTSTATUS NTAPI ZwOpenIoCompletion( - OUT PHANDLE CompetionPort, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE CompetionPort, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwQueryAttributesFile( - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PFILE_BASIC_INFORMATION FileInformation + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PFILE_BASIC_INFORMATION FileInformation ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN BOOLEAN ReturnSingleEntry, - IN PUNICODE_STRING FileName OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass, + _In_ BOOLEAN ReturnSingleEntry, + _In_opt_ PUNICODE_STRING FileName, + _In_ BOOLEAN RestartScan ); #ifdef NTOS_MODE_USER @@ -828,15 +846,15 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryEaFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN PVOID EaList OPTIONAL, - IN ULONG EaListLength, - IN PULONG EaIndex OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_ PVOID Buffer, + _In_ ULONG Length, + _In_ BOOLEAN ReturnSingleEntry, + _In_opt_ PVOID EaList, + _In_ ULONG EaListLength, + _In_opt_ PULONG EaIndex, + _In_ BOOLEAN RestartScan ); #endif @@ -844,97 +862,100 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryFullAttributesFile( - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PFILE_NETWORK_OPEN_INFORMATION FileInformation ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwQueryInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass ); NTSYSAPI NTSTATUS NTAPI ZwQueryIoCompletion( - IN HANDLE IoCompletionHandle, - IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, - OUT PVOID IoCompletionInformation, - IN ULONG IoCompletionInformationLength, - OUT PULONG ResultLength OPTIONAL + _In_ HANDLE IoCompletionHandle, + _In_ IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, + _Out_ PVOID IoCompletionInformation, + _In_ ULONG IoCompletionInformationLength, + _Out_opt_ PULONG ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryQuotaInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN PVOID SidList OPTIONAL, - IN ULONG SidListLength, - IN PSID StartSid OPTIONAL, - IN BOOLEAN RestartScan + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_ PVOID Buffer, + _In_ ULONG Length, + _In_ BOOLEAN ReturnSingleEntry, + _In_opt_ PVOID SidList, + _In_ ULONG SidListLength, + _In_opt_ PSID StartSid, + _In_ BOOLEAN RestartScan ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwQueryVolumeInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID FsInformation, + _In_ ULONG Length, + _In_ FS_INFORMATION_CLASS FsInformationClass ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwReadFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset OPTIONAL, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_opt_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSAPI NTSTATUS NTAPI ZwReadFileScatter( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK UserIoStatusBlock, - IN FILE_SEGMENT_ELEMENT BufferDescription[], - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE UserApcRoutine, + _In_opt_ PVOID UserApcContext, + _Out_ PIO_STATUS_BLOCK UserIoStatusBlock, + _In_ FILE_SEGMENT_ELEMENT BufferDescription[], + _In_ ULONG BufferLength, + _In_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSAPI NTSTATUS NTAPI ZwRemoveIoCompletion( - IN HANDLE IoCompletionHandle, - OUT PVOID *CompletionKey, - OUT PVOID *CompletionContext, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE IoCompletionHandle, + _Out_ PVOID *CompletionKey, + _Out_ PVOID *CompletionContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER Timeout ); #ifdef NTOS_MODE_USER @@ -942,102 +963,105 @@ NTSYSAPI NTSTATUS NTAPI ZwSetEaFile( - IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, + _In_ HANDLE FileHandle, + _In_ PIO_STATUS_BLOCK IoStatusBlock, PVOID EaBuffer, ULONG EaBufferSize ); #endif +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwSetInformationFile( - IN HANDLE FileHandle, - IN PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FileInformation, - IN ULONG Length, - IN FILE_INFORMATION_CLASS FileInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID FileInformation, + _In_ ULONG Length, + _In_ FILE_INFORMATION_CLASS FileInformationClass ); NTSYSAPI NTSTATUS NTAPI ZwSetIoCompletion( - IN HANDLE IoCompletionPortHandle, - IN PVOID CompletionKey, - IN PVOID CompletionContext, - IN NTSTATUS CompletionStatus, - IN ULONG CompletionInformation + _In_ HANDLE IoCompletionPortHandle, + _In_ PVOID CompletionKey, + _In_ PVOID CompletionContext, + _In_ NTSTATUS CompletionStatus, + _In_ ULONG CompletionInformation ); NTSYSAPI NTSTATUS NTAPI ZwSetQuotaInformationFile( - HANDLE FileHandle, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID Buffer, - ULONG BufferLength + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ PVOID Buffer, + _In_ ULONG BufferLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwSetVolumeInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID FsInformation, + _In_ ULONG Length, + _In_ FS_INFORMATION_CLASS FsInformationClass ); NTSYSAPI NTSTATUS NTAPI ZwUnloadDriver( - IN PUNICODE_STRING DriverServiceName + _In_ PUNICODE_STRING DriverServiceName ); NTSYSAPI NTSTATUS NTAPI ZwUnlockFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Lenght, - OUT ULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ PLARGE_INTEGER ByteOffset, + _In_ PLARGE_INTEGER Lenght, + _In_opt_ ULONG Key ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwWriteFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID Buffer, - IN ULONG Length, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _In_opt_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); NTSYSAPI NTSTATUS NTAPI ZwWriteFileGather( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN FILE_SEGMENT_ELEMENT BufferDescription[], - IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset, - IN PULONG Key OPTIONAL + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ FILE_SEGMENT_ELEMENT BufferDescription[], + _In_ ULONG BufferLength, + _In_ PLARGE_INTEGER ByteOffset, + _In_opt_ PULONG Key ); #endif diff --git a/reactos/include/ndk/iotypes.h b/reactos/include/ndk/iotypes.h index b76b050165c..32e634946bc 100644 --- a/reactos/include/ndk/iotypes.h +++ b/reactos/include/ndk/iotypes.h @@ -1208,9 +1208,9 @@ typedef struct _EFI_DRIVER_ENTRY // typedef VOID (NTAPI *PIO_APC_ROUTINE)( - IN PVOID ApcContext, - IN PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG Reserved); + _In_ PVOID ApcContext, + _In_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG Reserved); // // Mailslot IOCTL Codes diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h index defe6ffbfe2..1c65e27fd88 100644 --- a/reactos/include/ndk/kefuncs.h +++ b/reactos/include/ndk/kefuncs.h @@ -33,31 +33,31 @@ Author: VOID NTAPI KeInitializeApc( - IN PKAPC Apc, - IN PKTHREAD Thread, - IN KAPC_ENVIRONMENT TargetEnvironment, - IN PKKERNEL_ROUTINE KernelRoutine, - IN PKRUNDOWN_ROUTINE RundownRoutine OPTIONAL, - IN PKNORMAL_ROUTINE NormalRoutine, - IN KPROCESSOR_MODE Mode, - IN PVOID Context + _In_ PKAPC Apc, + _In_ PKTHREAD Thread, + _In_ KAPC_ENVIRONMENT TargetEnvironment, + _In_ PKKERNEL_ROUTINE KernelRoutine, + _In_opt_ PKRUNDOWN_ROUTINE RundownRoutine, + _In_ PKNORMAL_ROUTINE NormalRoutine, + _In_ KPROCESSOR_MODE Mode, + _In_ PVOID Context ); BOOLEAN NTAPI KeInsertQueueApc( - IN PKAPC Apc, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2, - IN KPRIORITY PriorityBoost + _In_ PKAPC Apc, + _In_ PVOID SystemArgument1, + _In_ PVOID SystemArgument2, + _In_ KPRIORITY PriorityBoost ); VOID NTAPI KiDeliverApc( - IN KPROCESSOR_MODE PreviousMode, - IN PKEXCEPTION_FRAME ExceptionFrame, - IN PKTRAP_FRAME TrapFrame + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKEXCEPTION_FRAME ExceptionFrame, + _In_ PKTRAP_FRAME TrapFrame ); // @@ -66,7 +66,7 @@ KiDeliverApc( VOID NTAPI KeTerminateThread( - IN KPRIORITY Increment + _In_ KPRIORITY Increment ); BOOLEAN @@ -78,15 +78,15 @@ KeIsAttachedProcess( VOID NTAPI KeSetEventBoostPriority( - IN PKEVENT Event, - IN PKTHREAD *Thread OPTIONAL + _In_ PKEVENT Event, + _In_opt_ PKTHREAD *Thread ); KAFFINITY NTAPI KeSetAffinityThread( - PKTHREAD Thread, - KAFFINITY Affinity + _Inout_ PKTHREAD Thread, + _In_ KAFFINITY Affinity ); PKPROCESS @@ -98,11 +98,11 @@ KeGetCurrentProcess( BOOLEAN NTAPI KeAddSystemServiceTable( - PULONG_PTR Base, - PULONG Count OPTIONAL, - ULONG Limit, - PUCHAR Number, - ULONG Index + _In_ PULONG_PTR Base, + _In_opt_ PULONG Count, + _In_ ULONG Limit, + _In_ PUCHAR Number, + _In_ ULONG Index ); // @@ -111,33 +111,33 @@ KeAddSystemServiceTable( VOID FASTCALL KiAcquireSpinLock( - PKSPIN_LOCK SpinLock + _Inout_ PKSPIN_LOCK SpinLock ); VOID FASTCALL KiReleaseSpinLock( - PKSPIN_LOCK SpinLock + _Inout_ PKSPIN_LOCK SpinLock ); KIRQL FASTCALL KeAcquireQueuedSpinLockRaiseToSynch( - IN KSPIN_LOCK_QUEUE_NUMBER LockNumber + _In_ KSPIN_LOCK_QUEUE_NUMBER LockNumber ); BOOLEAN FASTCALL KeTryToAcquireQueuedSpinLockRaiseToSynch( - IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - IN PKIRQL OldIrql + _In_ KSPIN_LOCK_QUEUE_NUMBER LockNumber, + _In_ PKIRQL OldIrql ); VOID FASTCALL KeAcquireInStackQueuedSpinLockRaiseToSynch( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle + _In_ PKSPIN_LOCK SpinLock, + _In_ PKLOCK_QUEUE_HANDLE LockHandle ); @@ -147,29 +147,29 @@ KeAcquireInStackQueuedSpinLockRaiseToSynch( VOID NTAPI KeInitializeInterrupt( - PKINTERRUPT InterruptObject, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - CHAR ProcessorNumber, - BOOLEAN FloatingSave + _Out_ PKINTERRUPT InterruptObject, + _In_ PKSERVICE_ROUTINE ServiceRoutine, + _In_ PVOID ServiceContext, + _In_ PKSPIN_LOCK SpinLock, + _In_ ULONG Vector, + _In_ KIRQL Irql, + _In_ KIRQL SynchronizeIrql, + _In_ KINTERRUPT_MODE InterruptMode, + _In_ BOOLEAN ShareVector, + _In_ CHAR ProcessorNumber, + _In_ BOOLEAN FloatingSave ); BOOLEAN NTAPI KeConnectInterrupt( - PKINTERRUPT InterruptObject + _Inout_ PKINTERRUPT InterruptObject ); BOOLEAN NTAPI KeDisconnectInterrupt( - PKINTERRUPT InterruptObject + _Inout_ PKINTERRUPT InterruptObject ); VOID @@ -204,8 +204,8 @@ KeIsExecutingDpc( BOOLEAN NTAPI KiIpiServiceRoutine( - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame ); // @@ -214,20 +214,20 @@ KiIpiServiceRoutine( VOID NTAPI KeGenericCallDpc( - IN PKDEFERRED_ROUTINE Routine, - IN PVOID Context + _In_ PKDEFERRED_ROUTINE Routine, + _In_ PVOID Context ); VOID NTAPI KeSignalCallDpcDone( - IN PVOID SystemArgument1 + _In_ PVOID SystemArgument1 ); BOOLEAN NTAPI KeSignalCallDpcSynchronize( - IN PVOID SystemArgument2 + _In_ PVOID SystemArgument2 ); // @@ -237,20 +237,20 @@ KeSignalCallDpcSynchronize( PCONFIGURATION_COMPONENT_DATA NTAPI KeFindConfigurationNextEntry( - IN PCONFIGURATION_COMPONENT_DATA Child, - IN CONFIGURATION_CLASS Class, - IN CONFIGURATION_TYPE Type, - IN PULONG ComponentKey OPTIONAL, - IN PCONFIGURATION_COMPONENT_DATA *NextLink + _In_ PCONFIGURATION_COMPONENT_DATA Child, + _In_ CONFIGURATION_CLASS Class, + _In_ CONFIGURATION_TYPE Type, + _In_opt_ PULONG ComponentKey, + _In_ PCONFIGURATION_COMPONENT_DATA *NextLink ); PCONFIGURATION_COMPONENT_DATA NTAPI KeFindConfigurationEntry( - IN PCONFIGURATION_COMPONENT_DATA Child, - IN CONFIGURATION_CLASS Class, - IN CONFIGURATION_TYPE Type, - IN PULONG ComponentKey OPTIONAL + _In_ PCONFIGURATION_COMPONENT_DATA Child, + _In_ CONFIGURATION_CLASS Class, + _In_ CONFIGURATION_TYPE Type, + _In_opt_ PULONG ComponentKey ); #endif @@ -260,41 +260,41 @@ KeFindConfigurationEntry( VOID NTAPI KeFlushEntireTb( - IN BOOLEAN Invalid, - IN BOOLEAN AllProcessors + _In_ BOOLEAN Invalid, + _In_ BOOLEAN AllProcessors ); VOID NTAPI KeSetDmaIoCoherency( - IN ULONG Coherency + _In_ ULONG Coherency ); VOID KeSetGdtSelector( - ULONG Entry, - ULONG Value1, - ULONG Value2 + _In_ ULONG Entry, + _In_ ULONG Value1, + _In_ ULONG Value2 ); VOID NTAPI KeSetProfileIrql( - IN KIRQL ProfileIrql + _In_ KIRQL ProfileIrql ); VOID NTAPI KeSetTimeIncrement( - IN ULONG MaxIncrement, - IN ULONG MinIncrement + _In_ ULONG MaxIncrement, + _In_ ULONG MinIncrement ); NTSTATUS NTAPI Ke386CallBios( - IN ULONG BiosCommand, - IN OUT PCONTEXT BiosArguments + _In_ ULONG BiosCommand, + _Inout_ PCONTEXT BiosArguments ); // @@ -303,17 +303,17 @@ Ke386CallBios( NTSTATUS NTAPI KeUserModeCallback( - IN ULONG FunctionID, - IN PVOID InputBuffer, - IN ULONG InputLength, - OUT PVOID *OutputBuffer, - OUT PULONG OutputLength + _In_ ULONG FunctionID, + _In_ PVOID InputBuffer, + _In_ ULONG InputLength, + _Out_ PVOID *OutputBuffer, + _Out_ PULONG OutputLength ); NTSTATUS NTAPI KeRaiseUserException( - IN NTSTATUS ExceptionCode + _In_ NTSTATUS ExceptionCode ); #endif @@ -325,49 +325,49 @@ NTSYSCALLAPI NTSTATUS NTAPI NtContinue( - IN PCONTEXT Context, - IN BOOLEAN TestAlert + _In_ PCONTEXT Context, + _In_ BOOLEAN TestAlert ); NTSYSCALLAPI NTSTATUS NTAPI NtCallbackReturn( - PVOID Result, - ULONG ResultLength, - NTSTATUS Status + _In_ PVOID Result, + _In_ ULONG ResultLength, + _In_ NTSTATUS Status ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateProfile( - OUT PHANDLE ProfileHandle, - IN HANDLE ProcessHandle, - IN PVOID ImageBase, - IN ULONG ImageSize, - IN ULONG Granularity, - OUT PVOID Buffer, - IN ULONG ProfilingSize, - IN KPROFILE_SOURCE Source, - IN KAFFINITY ProcessorMask + _Out_ PHANDLE ProfileHandle, + _In_ HANDLE ProcessHandle, + _In_ PVOID ImageBase, + _In_ ULONG ImageSize, + _In_ ULONG Granularity, + _Out_ PVOID Buffer, + _In_ ULONG ProfilingSize, + _In_ KPROFILE_SOURCE Source, + _In_ KAFFINITY ProcessorMask ); NTSYSCALLAPI NTSTATUS NTAPI NtDelayExecution( - IN BOOLEAN Alertable, - IN LARGE_INTEGER *Interval + _In_ BOOLEAN Alertable, + _In_ LARGE_INTEGER *Interval ); NTSYSCALLAPI NTSTATUS NTAPI NtFlushInstructionCache( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ ULONG NumberOfBytesToFlush ); ULONG @@ -380,8 +380,8 @@ NTSYSCALLAPI NTSTATUS NTAPI NtGetContextThread( - IN HANDLE ThreadHandle, - OUT PCONTEXT Context + _In_ HANDLE ThreadHandle, + _Out_ PCONTEXT Context ); NTSYSCALLAPI @@ -395,109 +395,109 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryIntervalProfile( - IN KPROFILE_SOURCE ProfileSource, - OUT PULONG Interval + _In_ KPROFILE_SOURCE ProfileSource, + _Out_ PULONG Interval ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryPerformanceCounter( - IN PLARGE_INTEGER Counter, - IN PLARGE_INTEGER Frequency + _In_ PLARGE_INTEGER Counter, + _In_ PLARGE_INTEGER Frequency ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime + _Out_ PLARGE_INTEGER CurrentTime ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimerResolution( - OUT PULONG MinimumResolution, - OUT PULONG MaximumResolution, - OUT PULONG ActualResolution + _Out_ PULONG MinimumResolution, + _Out_ PULONG MaximumResolution, + _Out_ PULONG ActualResolution ); NTSYSCALLAPI NTSTATUS NTAPI NtQueueApcThread( - HANDLE ThreadHandle, - PKNORMAL_ROUTINE ApcRoutine, - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2 + _In_ HANDLE ThreadHandle, + _In_ PKNORMAL_ROUTINE ApcRoutine, + _In_ PVOID NormalContext, + _In_ PVOID SystemArgument1, + _In_ PVOID SystemArgument2 ); NTSYSCALLAPI NTSTATUS NTAPI NtRaiseException( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN BOOLEAN SearchFrames + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context, + _In_ BOOLEAN SearchFrames ); NTSYSCALLAPI NTSTATUS NTAPI NtSetContextThread( - IN HANDLE ThreadHandle, - IN PCONTEXT Context + _In_ HANDLE ThreadHandle, + _In_ PCONTEXT Context ); NTSYSCALLAPI NTSTATUS NTAPI NtSetIntervalProfile( - IN ULONG Interval, - IN KPROFILE_SOURCE ClockSource + _In_ ULONG Interval, + _In_ KPROFILE_SOURCE ClockSource ); NTSYSCALLAPI NTSTATUS NTAPI NtSetLdtEntries( - IN ULONG Selector1, - IN LDT_ENTRY LdtEntry1, - IN ULONG Selector2, - IN LDT_ENTRY LdtEntry2 + _In_ ULONG Selector1, + _In_ LDT_ENTRY LdtEntry1, + _In_ ULONG Selector2, + _In_ LDT_ENTRY LdtEntry2 ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemTime( - IN PLARGE_INTEGER SystemTime, - IN PLARGE_INTEGER NewSystemTime OPTIONAL + _In_ PLARGE_INTEGER SystemTime, + _In_opt_ PLARGE_INTEGER NewSystemTime ); NTSYSCALLAPI NTSTATUS NTAPI NtSetTimerResolution( - IN ULONG RequestedResolution, - IN BOOLEAN SetOrUnset, - OUT PULONG ActualResolution + _In_ ULONG RequestedResolution, + _In_ BOOLEAN SetOrUnset, + _Out_ PULONG ActualResolution ); NTSYSCALLAPI NTSTATUS NTAPI NtStartProfile( - IN HANDLE ProfileHandle + _In_ HANDLE ProfileHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtStopProfile( - IN HANDLE ProfileHandle + _In_ HANDLE ProfileHandle ); NTSYSCALLAPI @@ -511,19 +511,19 @@ NTSYSCALLAPI NTSTATUS NTAPI NtVdmControl( - ULONG ControlCode, - PVOID ControlData + _In_ ULONG ControlCode, + _In_ PVOID ControlData ); NTSYSCALLAPI NTSTATUS NTAPI NtW32Call( - IN ULONG RoutineIndex, - IN PVOID Argument, - IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL + _In_ ULONG RoutineIndex, + _In_ PVOID Argument, + _In_ ULONG ArgumentLength, + _Out_opt_ PVOID* Result, + _Out_opt_ PULONG ResultLength ); NTSYSCALLAPI @@ -537,57 +537,57 @@ NTSYSAPI NTSTATUS NTAPI ZwContinue( - IN PCONTEXT Context, - IN BOOLEAN TestAlert + _In_ PCONTEXT Context, + _In_ BOOLEAN TestAlert ); NTSYSAPI NTSTATUS NTAPI ZwCallbackReturn( - PVOID Result, - ULONG ResultLength, - NTSTATUS Status + _In_ PVOID Result, + _In_ ULONG ResultLength, + _In_ NTSTATUS Status ); NTSYSAPI NTSTATUS NTAPI ZwCreateProfile( - OUT PHANDLE ProfileHandle, - IN HANDLE ProcessHandle, - IN PVOID ImageBase, - IN ULONG ImageSize, - IN ULONG Granularity, - OUT PVOID Buffer, - IN ULONG ProfilingSize, - IN KPROFILE_SOURCE Source, - IN KAFFINITY ProcessorMask + _Out_ PHANDLE ProfileHandle, + _In_ HANDLE ProcessHandle, + _In_ PVOID ImageBase, + _In_ ULONG ImageSize, + _In_ ULONG Granularity, + _Out_ PVOID Buffer, + _In_ ULONG ProfilingSize, + _In_ KPROFILE_SOURCE Source, + _In_ KAFFINITY ProcessorMask ); NTSYSAPI NTSTATUS NTAPI ZwDelayExecution( - IN BOOLEAN Alertable, - IN LARGE_INTEGER *Interval + _In_ BOOLEAN Alertable, + _In_ LARGE_INTEGER *Interval ); NTSYSAPI NTSTATUS NTAPI ZwFlushInstructionCache( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ ULONG NumberOfBytesToFlush ); NTSYSAPI NTSTATUS NTAPI ZwGetContextThread( - IN HANDLE ThreadHandle, - OUT PCONTEXT Context + _In_ HANDLE ThreadHandle, + _Out_ PCONTEXT Context ); NTSYSAPI @@ -601,109 +601,109 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryIntervalProfile( - IN KPROFILE_SOURCE ProfileSource, - OUT PULONG Interval + _In_ KPROFILE_SOURCE ProfileSource, + _Out_ PULONG Interval ); NTSYSAPI NTSTATUS NTAPI ZwQueryPerformanceCounter( - IN PLARGE_INTEGER Counter, - IN PLARGE_INTEGER Frequency + _In_ PLARGE_INTEGER Counter, + _In_ PLARGE_INTEGER Frequency ); NTSYSAPI NTSTATUS NTAPI ZwQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime + _Out_ PLARGE_INTEGER CurrentTime ); NTSYSAPI NTSTATUS NTAPI ZwQueryTimerResolution( - OUT PULONG MinimumResolution, - OUT PULONG MaximumResolution, - OUT PULONG ActualResolution + _Out_ PULONG MinimumResolution, + _Out_ PULONG MaximumResolution, + _Out_ PULONG ActualResolution ); NTSYSAPI NTSTATUS NTAPI ZwQueueApcThread( - HANDLE ThreadHandle, - PKNORMAL_ROUTINE ApcRoutine, - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2 + _In_ HANDLE ThreadHandle, + _In_ PKNORMAL_ROUTINE ApcRoutine, + _In_ PVOID NormalContext, + _In_ PVOID SystemArgument1, + _In_ PVOID SystemArgument2 ); NTSYSAPI NTSTATUS NTAPI ZwRaiseException( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN BOOLEAN SearchFrames + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context, + _In_ BOOLEAN SearchFrames ); NTSYSAPI NTSTATUS NTAPI ZwSetContextThread( - IN HANDLE ThreadHandle, - IN PCONTEXT Context + _In_ HANDLE ThreadHandle, + _In_ PCONTEXT Context ); NTSYSAPI NTSTATUS NTAPI ZwSetIntervalProfile( - IN ULONG Interval, - IN KPROFILE_SOURCE ClockSource + _In_ ULONG Interval, + _In_ KPROFILE_SOURCE ClockSource ); NTSYSAPI NTSTATUS NTAPI ZwSetLdtEntries( - IN ULONG Selector1, - IN LDT_ENTRY LdtEntry1, - IN ULONG Selector2, - IN LDT_ENTRY LdtEntry2 + _In_ ULONG Selector1, + _In_ LDT_ENTRY LdtEntry1, + _In_ ULONG Selector2, + _In_ LDT_ENTRY LdtEntry2 ); NTSYSAPI NTSTATUS NTAPI ZwSetSystemTime( - IN PLARGE_INTEGER SystemTime, - IN PLARGE_INTEGER NewSystemTime OPTIONAL + _In_ PLARGE_INTEGER SystemTime, + _In_opt_ PLARGE_INTEGER NewSystemTime ); NTSYSAPI NTSTATUS NTAPI ZwSetTimerResolution( - IN ULONG RequestedResolution, - IN BOOLEAN SetOrUnset, - OUT PULONG ActualResolution + _In_ ULONG RequestedResolution, + _In_ BOOLEAN SetOrUnset, + _Out_ PULONG ActualResolution ); NTSYSAPI NTSTATUS NTAPI ZwStartProfile( - IN HANDLE ProfileHandle + _In_ HANDLE ProfileHandle ); NTSYSAPI NTSTATUS NTAPI ZwStopProfile( - IN HANDLE ProfileHandle + _In_ HANDLE ProfileHandle ); NTSYSAPI @@ -717,19 +717,19 @@ NTSYSAPI NTSTATUS NTAPI ZwVdmControl( - ULONG ControlCode, - PVOID ControlData + _In_ ULONG ControlCode, + _In_ PVOID ControlData ); NTSYSAPI NTSTATUS NTAPI ZwW32Call( - IN ULONG RoutineIndex, - IN PVOID Argument, - IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL + _In_ ULONG RoutineIndex, + _In_ PVOID Argument, + _In_ ULONG ArgumentLength, + _Out_opt_ PVOID* Result, + _Out_opt_ PULONG ResultLength ); NTSYSAPI diff --git a/reactos/include/ndk/ketypes.h b/reactos/include/ndk/ketypes.h index f89773ff2c0..2ca38c3ed0a 100644 --- a/reactos/include/ndk/ketypes.h +++ b/reactos/include/ndk/ketypes.h @@ -385,9 +385,9 @@ typedef enum _VDMSERVICECLASS // typedef VOID (NTAPI *PKNORMAL_ROUTINE)( - IN PVOID NormalContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2 + _In_ PVOID NormalContext, + _In_ PVOID SystemArgument1, + _In_ PVOID SystemArgument2 ); // @@ -395,9 +395,9 @@ typedef VOID // typedef VOID (NTAPI *PTIMER_APC_ROUTINE)( - IN PVOID TimerContext, - IN ULONG TimerLowValue, - IN LONG TimerHighValue + _In_ PVOID TimerContext, + _In_ ULONG TimerLowValue, + _In_ LONG TimerHighValue ); // diff --git a/reactos/include/ndk/ldrfuncs.h b/reactos/include/ndk/ldrfuncs.h index 80bc1c82805..4b628f50f6f 100644 --- a/reactos/include/ndk/ldrfuncs.h +++ b/reactos/include/ndk/ldrfuncs.h @@ -34,52 +34,52 @@ Author: NTSTATUS NTAPI LdrAccessResource( - IN PVOID BaseAddress, - IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, - OUT PVOID *Resource OPTIONAL, - OUT PULONG Size OPTIONAL + _In_ PVOID BaseAddress, + _In_ PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, + _Out_opt_ PVOID *Resource, + _Out_opt_ PULONG Size ); NTSTATUS NTAPI LdrFindResource_U( - IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry + _In_ PVOID BaseAddress, + _In_ PLDR_RESOURCE_INFO ResourceInfo, + _In_ ULONG Level, + _Out_ PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry ); NTSTATUS NTAPI LdrEnumResources( - IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT ULONG *ResourceCount, - OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL + _In_ PVOID BaseAddress, + _In_ PLDR_RESOURCE_INFO ResourceInfo, + _In_ ULONG Level, + _Inout_ ULONG *ResourceCount, + _Out_opt_ PLDR_ENUM_RESOURCE_INFO Resources ); NTSTATUS NTAPI LdrFindResourceDirectory_U( - IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory + _In_ PVOID BaseAddress, + _In_ PLDR_RESOURCE_INFO ResourceInfo, + _In_ ULONG Level, + _Out_ PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory ); NTSTATUS NTAPI LdrLoadAlternateResourceModule( - IN PVOID Module, - IN PWSTR Buffer + _In_ PVOID Module, + _In_ PWSTR Buffer ); BOOLEAN NTAPI LdrUnloadAlternateResourceModule( - IN PVOID BaseAddress + _In_ PVOID BaseAddress ); // @@ -88,60 +88,60 @@ LdrUnloadAlternateResourceModule( NTSTATUS NTAPI LdrGetProcedureAddress( - IN PVOID BaseAddress, - IN PANSI_STRING Name, - IN ULONG Ordinal, - OUT PVOID *ProcedureAddress + _In_ PVOID BaseAddress, + _In_ PANSI_STRING Name, + _In_ ULONG Ordinal, + _Out_ PVOID *ProcedureAddress ); ULONG NTAPI LdrRelocateImage( - IN PVOID NewBase, - IN PUCHAR LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid + _In_ PVOID NewBase, + _In_ PUCHAR LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid ); NTSTATUS NTAPI LdrLockLoaderLock( - IN ULONG Flags, - OUT PULONG Disposition OPTIONAL, - OUT PULONG Cookie OPTIONAL + _In_ ULONG Flags, + _Out_opt_ PULONG Disposition, + _Out_opt_ PULONG Cookie ); NTSTATUS NTAPI LdrUnlockLoaderLock( - IN ULONG Flags, - IN ULONG Cookie OPTIONAL + _In_ ULONG Flags, + _In_opt_ ULONG Cookie ); BOOLEAN NTAPI LdrVerifyMappedImageMatchesChecksum( - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN ULONG FileLength + _In_ PVOID BaseAddress, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG FileLength ); PIMAGE_BASE_RELOCATION NTAPI LdrProcessRelocationBlockLongLong( - IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONGLONG Delta + _In_ ULONG_PTR Address, + _In_ ULONG Count, + _In_ PUSHORT TypeOffset, + _In_ LONGLONG Delta ); NTSTATUS NTAPI LdrEnumerateLoadedModules( - IN BOOLEAN ReservedFlag, - IN PLDR_ENUM_CALLBACK EnumProc, - IN PVOID Context + _In_ BOOLEAN ReservedFlag, + _In_ PLDR_ENUM_CALLBACK EnumProc, + _In_ PVOID Context ); #endif diff --git a/reactos/include/ndk/ldrtypes.h b/reactos/include/ndk/ldrtypes.h index 0cf65b8fa58..8cd6a7d8681 100644 --- a/reactos/include/ndk/ldrtypes.h +++ b/reactos/include/ndk/ldrtypes.h @@ -197,8 +197,8 @@ typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA typedef VOID (NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( - IN BOOLEAN Type, - IN struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data + _In_ BOOLEAN Type, + _In_ struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data ); typedef struct _LDR_DLL_LOADED_NOTIFICATION_ENTRY @@ -228,7 +228,7 @@ typedef struct _ALT_RESOURCE_MODULE // // Callback function for LdrEnumerateLoadedModules // -typedef VOID (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN PVOID Parameter, OUT BOOLEAN *Stop); +typedef VOID (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, _In_ PVOID Parameter, _Out_ BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; // @@ -236,9 +236,9 @@ typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; // typedef BOOLEAN (NTAPI *PDLL_INIT_ROUTINE)( - IN PVOID DllHandle, - IN ULONG Reason, - IN PCONTEXT Context OPTIONAL + _In_ PVOID DllHandle, + _In_ ULONG Reason, + _In_opt_ PCONTEXT Context ); #endif diff --git a/reactos/include/ndk/lgpl.txt b/reactos/include/ndk/lgpl.txt index f166cc57b27..105c3c36e24 100755 --- a/reactos/include/ndk/lgpl.txt +++ b/reactos/include/ndk/lgpl.txt @@ -436,7 +436,7 @@ and reuse of software generally. 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +EXCEPT WHEN OTHERWISE STATED _In_ WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -444,11 +444,11 @@ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + 16. _In_ NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +CONSEQUENTIAL DAMAGES ARISING _Out_ OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF @@ -499,4 +499,4 @@ necessary. Here is a sample; alter the names: , 1 April 1990 Ty Coon, President of Vice -That's all there is to it! \ No newline at end of file +That's all there is to it! diff --git a/reactos/include/ndk/lpcfuncs.h b/reactos/include/ndk/lpcfuncs.h index be089c769b7..e32fa18e59b 100644 --- a/reactos/include/ndk/lpcfuncs.h +++ b/reactos/include/ndk/lpcfuncs.h @@ -32,16 +32,16 @@ NTKERNELAPI NTSTATUS NTAPI LpcRequestWaitReplyPort( - IN PVOID Port, - IN PPORT_MESSAGE LpcMessageRequest, - OUT PPORT_MESSAGE LpcMessageReply + _In_ PVOID Port, + _In_ PPORT_MESSAGE LpcMessageRequest, + _Out_ PPORT_MESSAGE LpcMessageReply ); NTSTATUS NTAPI LpcRequestPort( - IN PVOID Port, - IN PPORT_MESSAGE LpcMessage + _In_ PVOID Port, + _In_ PPORT_MESSAGE LpcMessage ); #endif @@ -52,82 +52,82 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAcceptConnectPort( - PHANDLE PortHandle, - PVOID PortContext OPTIONAL, - PPORT_MESSAGE ConnectionRequest, - BOOLEAN AcceptConnection, - PPORT_VIEW ServerView OPTIONAL, - PREMOTE_PORT_VIEW ClientView OPTIONAL + _In_ PHANDLE PortHandle, + _In_opt_ PVOID PortContext, + _In_ PPORT_MESSAGE ConnectionRequest, + _In_ BOOLEAN AcceptConnection, + _In_opt_ PPORT_VIEW ServerView, + _In_opt_ PREMOTE_PORT_VIEW ClientView ); NTSYSCALLAPI NTSTATUS NTAPI NtCompleteConnectPort( - HANDLE PortHandle + _In_ HANDLE PortHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtConnectPort( - PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW ClientView OPTIONAL, - PREMOTE_PORT_VIEW ServerView OPTIONAL, - PULONG MaxMessageLength OPTIONAL, - PVOID ConnectionInformation OPTIONAL, - PULONG ConnectionInformationLength OPTIONAL + _In_ PHANDLE PortHandle, + _In_ PUNICODE_STRING PortName, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, + _In_opt_ PPORT_VIEW ClientView, + _In_opt_ PREMOTE_PORT_VIEW ServerViewONAL, + _In_opt_ PULONG MaxMessageLength, + _In_opt_ PVOID ConnectionInformation, + _In_opt_ PULONG ConnectionInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtCreatePort( - PHANDLE PortHandle, - POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectionInfoLength, - ULONG MaxMessageLength, - ULONG MaxPoolUsage + _In_ PHANDLE PortHandle, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG MaxConnectionInfoLength, + _In_ ULONG MaxMessageLength, + _In_ ULONG MaxPoolUsage ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateWaitablePort( - PHANDLE PortHandle, - POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectInfoLength, - ULONG MaxDataLength, - ULONG NPMessageQueueSize OPTIONAL + _In_ PHANDLE PortHandle, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG MaxConnectInfoLength, + _In_ ULONG MaxDataLength, + _In_opt_ ULONG NPMessageQueueSize ); NTSYSCALLAPI NTSTATUS NTAPI NtImpersonateClientOfPort( - HANDLE PortHandle, - PPORT_MESSAGE ClientMessage + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE ClientMessage ); NTSYSCALLAPI NTSTATUS NTAPI NtListenPort( - HANDLE PortHandle, - PPORT_MESSAGE ConnectionRequest + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE ConnectionRequest ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationPort( - HANDLE PortHandle, - PORT_INFORMATION_CLASS PortInformationClass, - PVOID PortInformation, - ULONG PortInformationLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PORT_INFORMATION_CLASS PortInformationClass, + _Out_bytecap_(PortInformationLength) PVOID PortInformation, + _In_ ULONG PortInformationLength, + _Out_ PULONG ReturnLength ); NTSTATUS @@ -140,66 +140,66 @@ NTSYSCALLAPI NTSTATUS NTAPI NtReadRequestData( - HANDLE PortHandle, - PPORT_MESSAGE Message, - ULONG Index, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE Message, + _In_ ULONG Index, + _Out_bytecap_(BufferLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnLength ); NTSYSCALLAPI NTSTATUS NTAPI NtReplyPort( - IN HANDLE PortHandle, - IN PPORT_MESSAGE LpcReply + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE LpcReply ); NTSYSCALLAPI NTSTATUS NTAPI NtReplyWaitReceivePort( - IN HANDLE PortHandle, - OUT PVOID *PortContext OPTIONAL, - IN PPORT_MESSAGE ReplyMessage OPTIONAL, - OUT PPORT_MESSAGE ReceiveMessage + _In_ HANDLE PortHandle, + _Out_opt_ PVOID *PortContext, + _In_opt_ PPORT_MESSAGE ReplyMessage, + _Out_ PPORT_MESSAGE ReceiveMessage ); NTSYSCALLAPI NTSTATUS NTAPI NtReplyWaitReceivePortEx( - IN HANDLE PortHandle, - OUT PVOID *PortContext OPTIONAL, - IN PPORT_MESSAGE ReplyMessage OPTIONAL, - OUT PPORT_MESSAGE ReceiveMessage, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE PortHandle, + _Out_opt_ PVOID *PortContext, + _In_opt_ PPORT_MESSAGE ReplyMessage, + _Out_ PPORT_MESSAGE ReceiveMessage, + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSCALLAPI NTSTATUS NTAPI NtReplyWaitReplyPort( - IN HANDLE PortHandle, - OUT PPORT_MESSAGE ReplyMessage + _In_ HANDLE PortHandle, + _Out_ PPORT_MESSAGE ReplyMessage ); NTSYSCALLAPI NTSTATUS NTAPI NtRequestPort( - IN HANDLE PortHandle, - IN PPORT_MESSAGE LpcMessage + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE LpcMessage ); NTSYSCALLAPI NTSTATUS NTAPI NtRequestWaitReplyPort( - IN HANDLE PortHandle, - OUT PPORT_MESSAGE LpcReply, - IN PPORT_MESSAGE LpcRequest + _In_ HANDLE PortHandle, + _Out_ PPORT_MESSAGE LpcReply, + _In_ PPORT_MESSAGE LpcRequest ); NTSYSCALLAPI @@ -209,199 +209,199 @@ NtSecureConnectPort( PHANDLE PortHandle, PUNICODE_STRING PortName, PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW ClientView OPTIONAL, - PSID Sid OPTIONAL, - PREMOTE_PORT_VIEW ServerView OPTIONAL, - PULONG MaxMessageLength OPTIONAL, - PVOID ConnectionInformation OPTIONAL, - PULONG ConnectionInformationLength OPTIONAL + _In_opt_ PPORT_VIEW ClientView, + _In_opt_ PSID Sid, + _In_opt_ PREMOTE_PORT_VIEW ServerView, + _In_opt_ PULONG MaxMessageLength, + _In_opt_ PVOID ConnectionInformation, + _Out_opt_ PULONG ConnectionInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtWriteRequestData( - HANDLE PortHandle, - PPORT_MESSAGE Message, - ULONG Index, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE Message, + _In_ ULONG Index, + _In_bytecount_(BufferLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwAcceptConnectPort( - PHANDLE PortHandle, - PVOID PortContext OPTIONAL, - PPORT_MESSAGE ConnectionRequest, - BOOLEAN AcceptConnection, - PPORT_VIEW ServerView OPTIONAL, - PREMOTE_PORT_VIEW ClientView OPTIONAL + _Out_ PHANDLE PortHandle, + _In_opt_ PVOID PortContext, + _In_ PPORT_MESSAGE ConnectionRequest, + _In_ BOOLEAN AcceptConnection, + _In_opt_ PPORT_VIEW ServerView, + _In_opt_ PREMOTE_PORT_VIEW ClientView ); NTSYSAPI NTSTATUS NTAPI ZwCompleteConnectPort( - HANDLE PortHandle + _In_ HANDLE PortHandle ); NTSYSAPI NTSTATUS NTAPI ZwConnectPort( - PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW ClientView OPTIONAL, - PREMOTE_PORT_VIEW ServerView OPTIONAL, - PULONG MaxMessageLength OPTIONAL, - PVOID ConnectionInformation OPTIONAL, - PULONG ConnectionInformationLength OPTIONAL + _Out_ PHANDLE PortHandle, + _In_ PUNICODE_STRING PortName, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, + _In_opt_ PPORT_VIEW ClientView, + _In_opt_ PREMOTE_PORT_VIEW ServerView, + _In_opt_ PULONG MaxMessageLength, + _In_opt_ PVOID ConnectionInformation, + _In_opt_ PULONG ConnectionInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwCreatePort( - PHANDLE PortHandle, - POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectionInfoLength, - ULONG MaxMessageLength, - ULONG MaxPoolUsage + _Out_ PHANDLE PortHandle, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG MaxConnectionInfoLength, + _In_ ULONG MaxMessageLength, + _In_ ULONG MaxPoolUsage ); NTSYSAPI NTSTATUS NTAPI ZwCreateWaitablePort( - PHANDLE PortHandle, - POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectInfoLength, - ULONG MaxDataLength, - ULONG NPMessageQueueSize OPTIONAL + _Out_ PHANDLE PortHandle, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG MaxConnectInfoLength, + _In_ ULONG MaxDataLength, + _In_opt_ ULONG NPMessageQueueSize ); NTSYSAPI NTSTATUS NTAPI ZwImpersonateClientOfPort( - HANDLE PortHandle, - PPORT_MESSAGE ClientMessage + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE ClientMessage ); NTSYSAPI NTSTATUS NTAPI ZwListenPort( - HANDLE PortHandle, - PPORT_MESSAGE ConnectionRequest + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE ConnectionRequest ); NTSYSAPI NTSTATUS NTAPI ZwQueryInformationPort( - HANDLE PortHandle, - PORT_INFORMATION_CLASS PortInformationClass, - PVOID PortInformation, - ULONG PortInformationLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PORT_INFORMATION_CLASS PortInformationClass, + _Out_bytecap_(PortInformationLength) PVOID PortInformation, + _In_ ULONG PortInformationLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwReadRequestData( - HANDLE PortHandle, - PPORT_MESSAGE Message, - ULONG Index, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE Message, + _In_ ULONG Index, + _Out_bytecap_(BufferLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwReplyPort( - IN HANDLE PortHandle, - IN PPORT_MESSAGE LpcReply + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE LpcReply ); NTSYSAPI NTSTATUS NTAPI ZwReplyWaitReceivePort( - IN HANDLE PortHandle, - OUT PVOID *PortContext OPTIONAL, - IN PPORT_MESSAGE ReplyMessage OPTIONAL, - OUT PPORT_MESSAGE ReceiveMessage + _In_ HANDLE PortHandle, + _Out_opt_ PVOID *PortContext, + _In_opt_ PPORT_MESSAGE ReplyMessage, + _Out_ PPORT_MESSAGE ReceiveMessage ); NTSYSAPI NTSTATUS NTAPI ZwReplyWaitReceivePortEx( - IN HANDLE PortHandle, - OUT PVOID *PortContext OPTIONAL, - IN PPORT_MESSAGE ReplyMessage OPTIONAL, - OUT PPORT_MESSAGE ReceiveMessage, - IN PLARGE_INTEGER Timeout OPTIONAL + _In_ HANDLE PortHandle, + _Out_opt_ PVOID *PortContext, + _In_opt_ PPORT_MESSAGE ReplyMessage, + _Out_ PPORT_MESSAGE ReceiveMessage, + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSAPI NTSTATUS NTAPI ZwReplyWaitReplyPort( - IN HANDLE PortHandle, - OUT PPORT_MESSAGE ReplyMessage + _In_ HANDLE PortHandle, + _Out_ PPORT_MESSAGE ReplyMessage ); NTSYSAPI NTSTATUS NTAPI ZwRequestPort( - IN HANDLE PortHandle, - IN PPORT_MESSAGE LpcMessage + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE LpcMessage ); NTSYSAPI NTSTATUS NTAPI ZwRequestWaitReplyPort( - IN HANDLE PortHandle, - OUT PPORT_MESSAGE LpcReply, - IN PPORT_MESSAGE LpcRequest + _In_ HANDLE PortHandle, + _Out_ PPORT_MESSAGE LpcReply, + _In_ PPORT_MESSAGE LpcRequest ); NTSYSAPI NTSTATUS NTAPI ZwSecureConnectPort( - PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW ClientView OPTIONAL, - PSID Sid OPTIONAL, - PREMOTE_PORT_VIEW ServerView OPTIONAL, - PULONG MaxMessageLength OPTIONAL, - PVOID ConnectionInformation OPTIONAL, - PULONG ConnectionInformationLength OPTIONAL + _Out_ PHANDLE PortHandle, + _In_ PUNICODE_STRING PortName, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, + _Inout_opt_ PPORT_VIEW ClientView, + _In_opt_ PSID Sid, + _Inout_opt_ PREMOTE_PORT_VIEW ServerView, + _Out_opt_ PULONG MaxMessageLength, + _Inout_opt_ PVOID ConnectionInformation, + _Inout_opt_ PULONG ConnectionInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwWriteRequestData( - HANDLE PortHandle, - PPORT_MESSAGE Message, - ULONG Index, - PVOID Buffer, - ULONG BufferLength, - PULONG ReturnLength + _In_ HANDLE PortHandle, + _In_ PPORT_MESSAGE Message, + _In_ ULONG Index, + _In_bytecount_(BufferLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnLength ); #endif diff --git a/reactos/include/ndk/mmfuncs.h b/reactos/include/ndk/mmfuncs.h index 667995a25d7..9ee2d7a19f6 100644 --- a/reactos/include/ndk/mmfuncs.h +++ b/reactos/include/ndk/mmfuncs.h @@ -33,36 +33,36 @@ Author: NTSTATUS NTAPI MmCreateSection( - OUT PVOID *SectionObject, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN PLARGE_INTEGER MaximumSize, - IN ULONG SectionPageProtection, - IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL, - IN PFILE_OBJECT File OPTIONAL + _Out_ PVOID *SectionObject, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PLARGE_INTEGER MaximumSize, + _In_ ULONG SectionPageProtection, + _In_ ULONG AllocationAttributes, + _In_opt_ HANDLE FileHandle, + _In_opt_ PFILE_OBJECT File ); NTSTATUS NTAPI MmMapViewOfSection( - IN PVOID SectionObject, - IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, - IN SIZE_T CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PSIZE_T ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType, - IN ULONG Protect + _In_ PVOID SectionObject, + _In_ PEPROCESS Process, + _Inout_ PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _In_ SIZE_T CommitSize, + _Inout_opt_ PLARGE_INTEGER SectionOffset, + _Inout_ PSIZE_T ViewSize, + _In_ SECTION_INHERIT InheritDisposition, + _In_ ULONG AllocationType, + _In_ ULONG Protect ); NTSTATUS NTAPI MmUnmapViewOfSection( - struct _EPROCESS* Process, - PVOID BaseAddress + _In_ struct _EPROCESS* Process, + _In_ PVOID BaseAddress ); #endif @@ -74,403 +74,413 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAreMappedFilesTheSame( - IN PVOID File1MappedAsAnImage, - IN PVOID File2MappedAsFile + _In_ PVOID File1MappedAsAnImage, + _In_ PVOID File2MappedAsFile ); NTSTATUS NTAPI NtAllocateUserPhysicalPages( - IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray + _In_ HANDLE ProcessHandle, + _Inout_ PULONG_PTR NumberOfPages, + _Inout_ PULONG_PTR UserPfnArray ); +_Must_inspect_result_ +__drv_allocatesMem(Mem) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtAllocateVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, - IN OUT PSIZE_T RegionSize, - IN ULONG AllocationType, - IN ULONG Protect + _In_ HANDLE ProcessHandle, + _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect ); NTSYSCALLAPI NTSTATUS NTAPI NtCreatePagingFile( - IN PUNICODE_STRING FileName, - IN PLARGE_INTEGER InitialSize, - IN PLARGE_INTEGER MaxiumSize, - IN ULONG Reserved + _In_ PUNICODE_STRING FileName, + _In_ PLARGE_INTEGER InitialSize, + _In_ PLARGE_INTEGER MaxiumSize, + _In_ ULONG Reserved ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtCreateSection( - OUT PHANDLE SectionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN PLARGE_INTEGER MaximumSize OPTIONAL, - IN ULONG SectionPageProtection OPTIONAL, - IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL + _Out_ PHANDLE SectionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ PLARGE_INTEGER MaximumSize, + _In_ ULONG SectionPageProtection, + _In_ ULONG AllocationAttributes, + _In_opt_ HANDLE FileHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtExtendSection( - IN HANDLE SectionHandle, - IN PLARGE_INTEGER NewMaximumSize + _In_ HANDLE SectionHandle, + _In_ PLARGE_INTEGER NewMaximumSize ); NTSYSCALLAPI NTSTATUS NTAPI NtFlushVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T RegionSize, - OUT PIO_STATUS_BLOCK IoStatus + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _Out_ PIO_STATUS_BLOCK IoStatus ); NTSTATUS NTAPI NtFreeUserPhysicalPages( - IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray + _In_ HANDLE ProcessHandle, + _Inout_ PULONG_PTR NumberOfPages, + _Inout_ PULONG_PTR UserPfnArray ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtFreeVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID *BaseAddress, - IN PSIZE_T RegionSize, - IN ULONG FreeType + _In_ HANDLE ProcessHandle, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType ); - NTSTATUS NTAPI NtGetWriteWatch( - IN HANDLE ProcessHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - IN SIZE_T RegionSize, - IN PVOID *UserAddressArray, - OUT PULONG_PTR EntriesInUserAddressArray, - OUT PULONG Granularity + _In_ HANDLE ProcessHandle, + _In_ ULONG Flags, + _In_ PVOID BaseAddress, + _In_ SIZE_T RegionSize, + _In_ PVOID *UserAddressArray, + _Out_ PULONG_PTR EntriesInUserAddressArray, + _Out_ PULONG Granularity ); NTSYSCALLAPI NTSTATUS NTAPI NtLockVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToLock, - IN ULONG MapType + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T NumberOfBytesToLock, + _In_ ULONG MapType ); NTSTATUS NTAPI NtMapUserPhysicalPages( - IN PVOID VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray + _In_ PVOID VirtualAddresses, + _In_ ULONG_PTR NumberOfPages, + _Inout_ PULONG_PTR UserPfnArray ); NTSTATUS NTAPI NtMapUserPhysicalPagesScatter( - IN PVOID *VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray + _In_ PVOID *VirtualAddresses, + _In_ ULONG_PTR NumberOfPages, + _Inout_ PULONG_PTR UserPfnArray ); NTSYSCALLAPI NTSTATUS NTAPI NtMapViewOfSection( - IN HANDLE SectionHandle, - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, - IN SIZE_T CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PSIZE_T ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType, - IN ULONG AccessProtection + _In_ HANDLE SectionHandle, + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _In_ SIZE_T CommitSize, + _Inout_opt_ PLARGE_INTEGER SectionOffset, + _Inout_ PSIZE_T ViewSize, + _In_ SECTION_INHERIT InheritDisposition, + _In_ ULONG AllocationType, + _In_ ULONG AccessProtection ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenSection( - OUT PHANDLE SectionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SectionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtProtectVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID *BaseAddress, - IN SIZE_T *NumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG OldAccessProtection + _In_ HANDLE ProcessHandle, + _In_ PVOID *BaseAddress, + _In_ SIZE_T *NumberOfBytesToProtect, + _In_ ULONG NewAccessProtection, + _Out_ PULONG OldAccessProtection ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySection( - IN HANDLE SectionHandle, - IN SECTION_INFORMATION_CLASS SectionInformationClass, - OUT PVOID SectionInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + _In_ HANDLE SectionHandle, + _In_ SECTION_INFORMATION_CLASS SectionInformationClass, + _Out_ PVOID SectionInformation, + _In_ SIZE_T Length, + _Out_ PSIZE_T ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + _In_ HANDLE ProcessHandle, + _In_ PVOID Address, + _In_ MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + _Out_ PVOID VirtualMemoryInformation, + _In_ SIZE_T Length, + _Out_ PSIZE_T ResultLength ); NTSYSCALLAPI NTSTATUS NTAPI NtReadVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - OUT PVOID Buffer, - IN SIZE_T NumberOfBytesToRead, - OUT PSIZE_T NumberOfBytesRead + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _Out_ PVOID Buffer, + _In_ SIZE_T NumberOfBytesToRead, + _Out_ PSIZE_T NumberOfBytesRead ); NTSTATUS NTAPI NtResetWriteWatch( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T RegionSize + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ SIZE_T RegionSize ); NTSYSCALLAPI NTSTATUS NTAPI NtUnlockVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToUnlock, - IN ULONG MapType + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T NumberOfBytesToUnlock, + _In_ ULONG MapType ); NTSYSCALLAPI NTSTATUS NTAPI NtUnmapViewOfSection( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress ); NTSYSCALLAPI NTSTATUS NTAPI NtWriteVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN PVOID Buffer, - IN SIZE_T NumberOfBytesToWrite, - OUT PSIZE_T NumberOfBytesWritten + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ PVOID Buffer, + _In_ SIZE_T NumberOfBytesToWrite, + _Out_ PSIZE_T NumberOfBytesWritten ); NTSYSAPI NTSTATUS NTAPI ZwAreMappedFilesTheSame( - IN PVOID File1MappedAsAnImage, - IN PVOID File2MappedAsFile + _In_ PVOID File1MappedAsAnImage, + _In_ PVOID File2MappedAsFile ); NTSYSAPI NTSTATUS NTAPI ZwAllocateVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, - IN OUT PSIZE_T RegionSize, - IN ULONG AllocationType, - IN ULONG Protect + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect ); NTSYSAPI NTSTATUS NTAPI ZwCreatePagingFile( - IN PUNICODE_STRING FileName, - IN PLARGE_INTEGER InitialSize, - IN PLARGE_INTEGER MaxiumSize, - IN ULONG Reserved + _In_ PUNICODE_STRING FileName, + _In_ PLARGE_INTEGER InitialSize, + _In_ PLARGE_INTEGER MaxiumSize, + _In_ ULONG Reserved ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwCreateSection( - OUT PHANDLE SectionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN PLARGE_INTEGER MaximumSize OPTIONAL, - IN ULONG SectionPageProtection OPTIONAL, - IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL + _Out_ PHANDLE SectionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ PLARGE_INTEGER MaximumSize, + _In_ ULONG SectionPageProtection, + _In_ ULONG AllocationAttributes, + _In_opt_ HANDLE FileHandle ); NTSYSAPI NTSTATUS NTAPI ZwExtendSection( - IN HANDLE SectionHandle, - IN PLARGE_INTEGER NewMaximumSize + _In_ HANDLE SectionHandle, + _In_ PLARGE_INTEGER NewMaximumSize ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(return==0, __drv_freesMem(Region)) NTSYSAPI NTSTATUS NTAPI ZwFreeVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID *BaseAddress, - IN PSIZE_T RegionSize, - IN ULONG FreeType + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType ); NTSYSAPI NTSTATUS NTAPI ZwLockVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToLock, - IN ULONG MapType + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T NumberOfBytesToLock, + _In_ ULONG MapType ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwMapViewOfSection( - IN HANDLE SectionHandle, - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG_PTR ZeroBits, - IN SIZE_T CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PSIZE_T ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType, - IN ULONG AccessProtection + _In_ HANDLE SectionHandle, + _In_ HANDLE ProcessHandle, + _Outptr_result_bytebuffer_(*ViewSize) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _In_ SIZE_T CommitSize, + _Inout_opt_ PLARGE_INTEGER SectionOffset, + _Inout_ PSIZE_T ViewSize, + _In_ SECTION_INHERIT InheritDisposition, + _In_ ULONG AllocationType, + _In_ ULONG Win32Protect ); NTSYSAPI NTSTATUS NTAPI ZwOpenSection( - OUT PHANDLE SectionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SectionHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwProtectVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID *BaseAddress, - IN SIZE_T *NumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG OldAccessProtection + _In_ HANDLE ProcessHandle, + _In_ PVOID *BaseAddress, + _In_ SIZE_T *NumberOfBytesToProtect, + _In_ ULONG NewAccessProtection, + _Out_ PULONG OldAccessProtection ); NTSYSAPI NTSTATUS NTAPI ZwQuerySection( - IN HANDLE SectionHandle, - IN SECTION_INFORMATION_CLASS SectionInformationClass, - OUT PVOID SectionInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + _In_ HANDLE SectionHandle, + _In_ SECTION_INFORMATION_CLASS SectionInformationClass, + _Out_ PVOID SectionInformation, + _In_ SIZE_T Length, + _Out_ PSIZE_T ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwQueryVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN SIZE_T Length, - OUT PSIZE_T ResultLength + _In_ HANDLE ProcessHandle, + _In_ PVOID Address, + _In_ MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + _Out_ PVOID VirtualMemoryInformation, + _In_ SIZE_T Length, + _Out_ PSIZE_T ResultLength ); NTSYSAPI NTSTATUS NTAPI ZwReadVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - OUT PVOID Buffer, - IN SIZE_T NumberOfBytesToRead, - OUT PSIZE_T NumberOfBytesRead + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _Out_ PVOID Buffer, + _In_ SIZE_T NumberOfBytesToRead, + _Out_ PSIZE_T NumberOfBytesRead ); NTSYSAPI NTSTATUS NTAPI ZwUnlockVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToUnlock, - IN ULONG MapType + _In_ HANDLE ProcessHandle, + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T NumberOfBytesToUnlock, + _In_ ULONG MapType ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwUnmapViewOfSection( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress + _In_ HANDLE ProcessHandle, + _In_opt_ PVOID BaseAddress ); NTSYSAPI NTSTATUS NTAPI ZwWriteVirtualMemory( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN PVOID Buffer, - IN SIZE_T NumberOfBytesToWrite, - OUT PSIZE_T NumberOfBytesWritten + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ PVOID Buffer, + _In_ SIZE_T NumberOfBytesToWrite, + _Out_ PSIZE_T NumberOfBytesWritten ); #endif diff --git a/reactos/include/ndk/ndk.txt b/reactos/include/ndk/ndk.txt index a4a63878e46..44c71be6862 100755 --- a/reactos/include/ndk/ndk.txt +++ b/reactos/include/ndk/ndk.txt @@ -14,16 +14,16 @@ the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY ALEX IONESCU ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS +ARE DISCLAIMED. _In_ NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +WHETHER _In_ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING _In_ ANY WAY _Out_ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Alex Ionescu or -the NDK Project Contributors. \ No newline at end of file +the NDK Project Contributors. diff --git a/reactos/include/ndk/no_sal2.h b/reactos/include/ndk/no_sal2.h new file mode 100644 index 00000000000..95df5583685 --- /dev/null +++ b/reactos/include/ndk/no_sal2.h @@ -0,0 +1,525 @@ + +#pragma once + +#define _NO_SAL_2_H_ + +#undef _Acquires_exclusive_lock_ +#undef _Acquires_lock_ +#undef _Acquires_nonreentrant_lock_ +#undef _Acquires_shared_lock_ +#undef _Always_ +#undef _Analysis_assume_ +#undef _Analysis_assume_lock_acquired_ +#undef _Analysis_assume_lock_held_ +#undef _Analysis_assume_lock_not_held_ +#undef _Analysis_assume_lock_released_ +#undef _Analysis_assume_same_lock_ +#undef _Analysis_mode_ +#undef _Analysis_noreturn_ +#undef _Analysis_suppress_lock_checking_ +#undef _At_ +#undef _At_buffer_ +#undef _Benign_race_begin_ +#undef _Benign_race_end_ +#undef _Check_return_ +#undef _COM_Outptr_ +#undef _COM_Outptr_opt_ +#undef _COM_Outptr_opt_result_maybenull_ +#undef _COM_Outptr_result_maybenull_ +#undef _Const_ +#undef _Create_lock_level_ +#undef _Deref_ +#undef _Deref_in_range_ +#undef _Deref_inout_range_ +#undef _Deref_out_range_ +#undef _Enum_is_bitflag_ +#undef _Field_range_ +#undef _Field_size_ +#undef _Field_size_bytes_ +#undef _Field_size_bytes_full_ +#undef _Field_size_bytes_full_opt_ +#undef _Field_size_bytes_opt_ +#undef _Field_size_bytes_part_ +#undef _Field_size_bytes_part_opt_ +#undef _Field_size_full_ +#undef _Field_size_full_opt_ +#undef _Field_size_opt_ +#undef _Field_size_part_ +#undef _Field_size_part_opt_ +#undef _Function_class_ +#undef _Function_ignore_lock_checking_ +#undef _Group_ +#undef _Guarded_by_ +#undef _Has_lock_kind_ +#undef _Has_lock_level_ +#undef _In_ +#undef _In_defensive_ +#undef _In_opt_ +#undef _In_opt_z_ +#undef _In_range_ +#undef _In_reads_ +#undef _In_reads_bytes_ +#undef _In_reads_bytes_opt_ +#undef _In_reads_opt_ +#undef _In_reads_opt_z_ +#undef _In_reads_or_z_ +#undef _In_reads_to_ptr_ +#undef _In_reads_to_ptr_opt_ +#undef _In_reads_to_ptr_opt_z_ +#undef _In_reads_to_ptr_z_ +#undef _In_reads_z_ +#undef _In_z_ +#undef _Inout_ +#undef _Inout_defensive_ +#undef _Inout_opt_ +#undef _Inout_opt_z_ +#undef _Inout_updates_ +#undef _Inout_updates_all_ +#undef _Inout_updates_all_opt_ +#undef _Inout_updates_bytes_ +#undef _Inout_updates_bytes_all_ +#undef _Inout_updates_bytes_all_opt_ +#undef _Inout_updates_bytes_opt_ +#undef _Inout_updates_bytes_to_ +#undef _Inout_updates_bytes_to_opt_ +#undef _Inout_updates_opt_ +#undef _Inout_updates_opt_z_ +#undef _Inout_updates_to_ +#undef _Inout_updates_to_opt_ +#undef _Inout_updates_z_ +#undef _Inout_z_ +#undef _Interlocked_ +#undef _Interlocked_operand_ +#undef _IRQL_always_function_max_ +#undef _IRQL_always_function_min_ +#undef _IRQL_is_cancel_ +#undef _IRQL_raises_ +#undef _IRQL_requires_ +#undef _IRQL_requires_max_ +#undef _IRQL_requires_min_ +#undef _IRQL_requires_same_ +#undef _IRQL_restores_ +#undef _IRQL_restores_global_ +#undef _IRQL_saves_ +#undef _IRQL_saves_global_ +#undef _IRQL_uses_cancel_ +#undef _Kernel_acquires_resource_ +#undef _Kernel_clear_do_init_ +#undef _Kernel_float_restored_ +#undef _Kernel_float_saved_ +#undef _Kernel_float_used_ +#undef _Kernel_IoGetDmaAdapter_ +#undef _Kernel_releases_resource_ +#undef _Kernel_requires_resource_held_ +#undef _Kernel_requires_resource_not_held_ +#undef _Literal_ +#undef _Lock_level_order_ +#undef _Maybe_raises_SEH_exception_ +#undef _Maybenull_ +#undef _Must_inspect_result_ +#undef _No_competing_thread_ +#undef _No_competing_thread_begin_ +#undef _No_competing_thread_end_ +#undef _Notliteral_ +#undef _Notnull_ +#undef _Notvalid_ +#undef _Null_ +#undef _Null_terminated_ +#undef _NullNull_terminated_ +#undef _On_failure_ +#undef _Out_ +#undef _Out_defensive_ +#undef _Out_opt_ +#undef _Out_range_ +#undef _Out_writes_ +#undef _Out_writes_all_ +#undef _Out_writes_all_opt_ +#undef _Out_writes_bytes_ +#undef _Out_writes_bytes_all_ +#undef _Out_writes_bytes_all_opt_ +#undef _Out_writes_bytes_opt_ +#undef _Out_writes_bytes_to_ +#undef _Out_writes_bytes_to_opt_ +#undef _Out_writes_opt_ +#undef _Out_writes_opt_z_ +#undef _Out_writes_to_ +#undef _Out_writes_to_opt_ +#undef _Out_writes_to_ptr_ +#undef _Out_writes_to_ptr_opt_ +#undef _Out_writes_to_ptr_opt_z_ +#undef _Out_writes_to_ptr_z_ +#undef _Out_writes_z_ +#undef _Outptr_ +#undef _Outptr_opt_ +#undef _Outptr_opt_result_buffer_ +#undef _Outptr_opt_result_buffer_to_ +#undef _Outptr_opt_result_bytebuffer_ +#undef _Outptr_opt_result_bytebuffer_to_ +#undef _Outptr_opt_result_maybenull_ +#undef _Outptr_opt_result_maybenull_z_ +#undef _Outptr_opt_result_nullonfailure_ +#undef _Outptr_opt_result_z_ +#undef _Outptr_result_buffer_ +#undef _Outptr_result_buffer_to_ +#undef _Outptr_result_bytebuffer_ +#undef _Outptr_result_bytebuffer_to_ +#undef _Outptr_result_maybenull_ +#undef _Outptr_result_maybenull_z_ +#undef _Outptr_result_nullonfailure_ +#undef _Outptr_result_z_ +#undef _Outref_ +#undef _Outref_result_buffer_ +#undef _Outref_result_buffer_all_ +#undef _Outref_result_buffer_all_maybenull_ +#undef _Outref_result_buffer_maybenull_ +#undef _Outref_result_buffer_to_ +#undef _Outref_result_buffer_to_maybenull_ +#undef _Outref_result_bytebuffer_ +#undef _Outref_result_bytebuffer_all_ +#undef _Outref_result_bytebuffer_all_maybenull_ +#undef _Outref_result_bytebuffer_maybenull_ +#undef _Outref_result_bytebuffer_to_ +#undef _Outref_result_bytebuffer_to_maybenull_ +#undef _Outref_result_maybenull_ +#undef _Outref_result_nullonfailure_ +#undef _Points_to_data_ +#undef _Post_ +#undef _Post_defensive_ +#undef _Post_equal_to_ +#undef _Post_invalid_ +#undef _Post_ptr_invalid_ +#undef _Post_readable_byte_size_ +#undef _Post_readable_size_ +#undef _Post_same_lock_ +#undef _Post_satisfies_ +#undef _Post_valid_ +#undef _Post_writable_byte_size_ +#undef _Post_writable_size_ +#undef _Post_z_ +#undef _Pre_ +#undef _Pre_defensive_ +#undef _Pre_equal_to_ +#undef _Pre_maybenull_ +#undef _Pre_notnull_ +#undef _Pre_null_ +#undef _Pre_opt_valid_ +#undef _Pre_readable_byte_size_ +#undef _Pre_readable_size_ +#undef _Pre_satisfies_ +#undef _Pre_unknown_ +#undef _Pre_valid_ +#undef _Pre_writable_byte_size_ +#undef _Pre_writable_size_ +#undef _Pre_z_ +#undef _Prepost_z_ +#undef _Printf_format_string_ +#undef _Printf_format_string_params_ +#undef _Raises_SEH_exception_ +#undef _Readable_bytes_ +#undef _Readable_elements_ +#undef _Releases_exclusive_lock_ +#undef _Releases_lock_ +#undef _Releases_nonreentrant_lock_ +#undef _Releases_shared_lock_ +#undef _Requires_exclusive_lock_held_ +#undef _Requires_lock_held_ +#undef _Requires_lock_not_held_ +#undef _Requires_no_locks_held_ +#undef _Requires_shared_lock_held_ +#undef _Reserved_ +#undef _Result_nullonfailure_ +#undef _Result_zeroonfailure_ +#undef _Ret_ +#undef _Ret_maybenull_ +#undef _Ret_maybenull_z_ +#undef _Ret_notnull_ +#undef _Ret_null_ +#undef _Ret_range_ +#undef _Ret_valid_ +#undef _Ret_writes_ +#undef _Ret_writes_bytes_ +#undef _Ret_writes_bytes_maybenull_ +#undef _Ret_writes_bytes_to_ +#undef _Ret_writes_bytes_to_maybenull_ +#undef _Ret_writes_maybenull_ +#undef _Ret_writes_maybenull_z_ +#undef _Ret_writes_to_ +#undef _Ret_writes_to_maybenull_ +#undef _Ret_writes_to_ptr_ +#undef _Ret_writes_to_ptr_z_ +#undef _Ret_writes_z_ +#undef _Ret_z_ +#undef _Return_type_success_ +#undef _Scanf_format_string_ +#undef _Scanf_format_string_params_ +#undef _Scanf_s_format_string_ +#undef _Scanf_s_format_string_params_ +#undef _Strict_type_match_ +#undef _Struct_size_bytes_ +#undef _Success_ +#undef _Use_decl_annotations_ +#undef _Valid_ +#undef _When_ +#undef _Writable_bytes_ +#undef _Writable_elements_ +#undef _Write_guarded_by_ +#define _Acquires_exclusive_lock_(e) +#define _Acquires_lock_(e) +#define _Acquires_nonreentrant_lock_(e) +#define _Acquires_shared_lock_(e) +#define _Always_(a) +#define _Analysis_assume_ +#define _Analysis_assume_lock_acquired_(e) +#define _Analysis_assume_lock_held_(e) +#define _Analysis_assume_lock_not_held_(e) +#define _Analysis_assume_lock_released_(e) +#define _Analysis_assume_same_lock_(e) +#define _Analysis_mode_(m) +#define _Analysis_noreturn_ +#define _Analysis_suppress_lock_checking_(e) +#define _At_(t,a) +#define _At_buffer_(t,i,c,a) +#define _Benign_race_begin_ +#define _Benign_race_end_ +#define _Check_return_ +#define _COM_Outptr_ +#define _COM_Outptr_opt_ +#define _COM_Outptr_opt_result_maybenull_ +#define _COM_Outptr_result_maybenull_ +#define _Const_ +#define _Create_lock_level_(n) +#define _Deref_ +#define _Deref_in_range_(l,h) +#define _Deref_inout_range_(l,h) +#define _Deref_out_range_(l,h) +#define _Enum_is_bitflag_ +#define _Field_range_(l,h) +#define _Field_size_(s) +#define _Field_size_bytes_(s) +#define _Field_size_bytes_full_(s) +#define _Field_size_bytes_full_opt_(s) +#define _Field_size_bytes_opt_(s) +#define _Field_size_bytes_part_(s,c) +#define _Field_size_bytes_part_opt_(s,c) +#define _Field_size_full_(s) +#define _Field_size_full_opt_(s) +#define _Field_size_opt_(s) +#define _Field_size_part_(s,c) +#define _Field_size_part_opt_(s,c) +#define _Function_class_(n) +#define _Function_ignore_lock_checking_(e) +#define _Group_(a) +#define _Guarded_by_(e) +#define _Has_lock_kind_(n) +#define _Has_lock_level_(n) +#define _In_ +#define _In_defensive_(a) +#define _In_opt_ +#define _In_opt_z_ +#define _In_range_(l,h) +#define _In_reads_(s) +#define _In_reads_bytes_(s) +#define _In_reads_bytes_opt_(s) +#define _In_reads_opt_(s) +#define _In_reads_opt_z_(s) +#define _In_reads_or_z_(s) +#define _In_reads_to_ptr_(p) +#define _In_reads_to_ptr_opt_(p) +#define _In_reads_to_ptr_opt_z_(p) +#define _In_reads_to_ptr_z_(p) +#define _In_reads_z_(s) +#define _In_z_ +#define _Inout_ +#define _Inout_defensive_(a) +#define _Inout_opt_ +#define _Inout_opt_z_ +#define _Inout_updates_(s) +#define _Inout_updates_all_(s) +#define _Inout_updates_all_opt_(s) +#define _Inout_updates_bytes_(s) +#define _Inout_updates_bytes_all_(s) +#define _Inout_updates_bytes_all_opt_(s) +#define _Inout_updates_bytes_opt_(s) +#define _Inout_updates_bytes_to_(s,c) +#define _Inout_updates_bytes_to_opt_(s,c) +#define _Inout_updates_opt_(s) +#define _Inout_updates_opt_z_(s) +#define _Inout_updates_to_(s,c) +#define _Inout_updates_to_opt_(s,c) +#define _Inout_updates_z_(s) +#define _Inout_z_ +#define _Interlocked_ +#define _Interlocked_operand_ +#define _IRQL_always_function_max_(i) +#define _IRQL_always_function_min_(i) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(i) +#define _IRQL_requires_(i) +#define _IRQL_requires_max_(i) +#define _IRQL_requires_min_(i) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(k,s) +#define _IRQL_saves_ +#define _IRQL_saves_global_(k,s) +#define _IRQL_uses_cancel_ +#define _Kernel_acquires_resource_(k) +#define _Kernel_clear_do_init_(yn) +#define _Kernel_float_restored_ +#define _Kernel_float_saved_ +#define _Kernel_float_used_ +#define _Kernel_IoGetDmaAdapter_ +#define _Kernel_releases_resource_(k) +#define _Kernel_requires_resource_held_(k) +#define _Kernel_requires_resource_not_held_(k) +#define _Literal_ +#define _Lock_level_order_(n1,n2) +#define _Maybe_raises_SEH_exception_ +#define _Maybenull_ +#define _Must_inspect_result_ +#define _No_competing_thread_ +#define _No_competing_thread_begin_ +#define _No_competing_thread_end_ +#define _Notliteral_ +#define _Notnull_ +#define _Notvalid_ +#define _Null_ +#define _Null_terminated_ +#define _NullNull_terminated_ +#define _On_failure_(a) +#define _Out_ +#define _Out_defensive_(a) +#define _Out_opt_ +#define _Out_range_(l,h) +#define _Out_writes_(s) +#define _Out_writes_all_(s) +#define _Out_writes_all_opt_(s) +#define _Out_writes_bytes_(s) +#define _Out_writes_bytes_all_(s) +#define _Out_writes_bytes_all_opt_(s) +#define _Out_writes_bytes_opt_(s) +#define _Out_writes_bytes_to_(s,c) +#define _Out_writes_bytes_to_opt_(s,c) +#define _Out_writes_opt_(s) +#define _Out_writes_opt_z_(s) +#define _Out_writes_to_(s,c) +#define _Out_writes_to_opt_(s,c) +#define _Out_writes_to_ptr_(p) +#define _Out_writes_to_ptr_opt_(p) +#define _Out_writes_to_ptr_opt_z_(p) +#define _Out_writes_to_ptr_z_(p) +#define _Out_writes_z_(s) +#define _Outptr_ +#define _Outptr_opt_ +#define _Outptr_opt_result_buffer_(s) +#define _Outptr_opt_result_buffer_to_(s,c) +#define _Outptr_opt_result_bytebuffer_(s) +#define _Outptr_opt_result_bytebuffer_to_(s,c) +#define _Outptr_opt_result_maybenull_ +#define _Outptr_opt_result_maybenull_z_ +#define _Outptr_opt_result_nullonfailure_ +#define _Outptr_opt_result_z_ +#define _Outptr_result_buffer_(s) +#define _Outptr_result_buffer_to_(s,c) +#define _Outptr_result_bytebuffer_(s) +#define _Outptr_result_bytebuffer_to_(s,c) +#define _Outptr_result_maybenull_ +#define _Outptr_result_maybenull_z_ +#define _Outptr_result_nullonfailure_ +#define _Outptr_result_z_ +#define _Outref_ +#define _Outref_result_buffer_(s) +#define _Outref_result_buffer_all_(s) +#define _Outref_result_buffer_all_maybenull_(s) +#define _Outref_result_buffer_maybenull_(s) +#define _Outref_result_buffer_to_(s,c) +#define _Outref_result_buffer_to_maybenull_(s,c) +#define _Outref_result_bytebuffer_(s) +#define _Outref_result_bytebuffer_all_(s) +#define _Outref_result_bytebuffer_all_maybenull_(s) +#define _Outref_result_bytebuffer_maybenull_(s) +#define _Outref_result_bytebuffer_to_(s,c) +#define _Outref_result_bytebuffer_to_maybenull_(s,c) +#define _Outref_result_maybenull_ +#define _Outref_result_nullonfailure_ +#define _Points_to_data_ +#define _Post_ +#define _Post_defensive_ +#define _Post_equal_to_(e) +#define _Post_invalid_ _Post_ _Deref_ _Notvalid_ +#define _Post_ptr_invalid_ _Post_ _Notvalid_ +#define _Post_readable_byte_size_(s) _Post_ _Readable_bytes_(s) _Post_ _Valid_ +#define _Post_readable_size_(s) _Post_ _Readable_elements_(s) _Post_ _Valid_ +#define _Post_same_lock_(e1,e2) +#define _Post_satisfies_(e) +#define _Post_valid_ _Post_ _Valid_ +#define _Post_writable_byte_size_(s) _Post_ _Writable_bytes_(s) +#define _Post_writable_size_(s) _Post_ _Writable_elements_(s) +#define _Post_z_ _Post_ _Null_terminated_ +#define _Pre_ +#define _Pre_defensive_ +#define _Pre_equal_to_(e) +#define _Pre_maybenull_ _Pre_ _Maybenull_ +#define _Pre_notnull_ _Pre_ _Notnull_ +#define _Pre_null_ _Pre_ _Null_ +#define _Pre_opt_valid_ _Pre_maybenull_ _Pre_ _Valid_ +#define _Pre_readable_byte_size_(s) _Pre_ _Readable_bytes_(s) _Pre_ _Valid_ +#define _Pre_readable_size_(s) _Pre_ _Readable_elements_(s) _Pre_ _Valid_ +#define _Pre_satisfies_(e) +#define _Pre_unknown_ +#define _Pre_valid_ _Pre_notnull_ _Pre_ _Valid_ +#define _Pre_writable_byte_size_(s) _Pre_ _Writable_bytes_(s) +#define _Pre_writable_size_(s) _Pre_ _Writable_elements_(s) +#define _Pre_z_ _Pre_ _Null_terminated_ +#define _Prepost_z_ _Pre_z_ _Post_z_ +#define _Printf_format_string_ +#define _Printf_format_string_params_(x) +#define _Raises_SEH_exception_ +#define _Readable_bytes_(s) +#define _Readable_elements_(s) +#define _Releases_exclusive_lock_(e) +#define _Releases_lock_(e) +#define _Releases_nonreentrant_lock_(e) +#define _Releases_shared_lock_(e) +#define _Requires_exclusive_lock_held_(e) +#define _Requires_lock_held_(e) +#define _Requires_lock_not_held_(e) +#define _Requires_no_locks_held_ +#define _Requires_shared_lock_held_(e) +#define _Reserved_ _Pre_equal_to_(0) _Pre_ _Null_ +#define _Result_nullonfailure_ +#define _Result_zeroonfailure_ +#define _Ret_ +#define _Ret_maybenull_ +#define _Ret_maybenull_z_ +#define _Ret_notnull_ +#define _Ret_null_ +#define _Ret_range_(l,h) +#define _Ret_valid_ +#define _Ret_writes_(s) +#define _Ret_writes_bytes_(s) +#define _Ret_writes_bytes_maybenull_(s) +#define _Ret_writes_bytes_to_(s,c) +#define _Ret_writes_bytes_to_maybenull_(s,c) +#define _Ret_writes_maybenull_(s) +#define _Ret_writes_maybenull_z_(s) +#define _Ret_writes_to_(s,c) +#define _Ret_writes_to_maybenull_(s,c) +#define _Ret_writes_to_ptr_(p) +#define _Ret_writes_to_ptr_z_(p) +#define _Ret_writes_z_(s) +#define _Ret_z_ +#define _Return_type_success_(c) +#define _Scanf_format_string_ +#define _Scanf_format_string_params_(x) +#define _Scanf_s_format_string_ +#define _Scanf_s_format_string_params_(x) +#define _Strict_type_match_ +#define _Struct_size_bytes_(s) +#define _Success_(c) +#define _Use_decl_annotations_ +#define _Valid_ +#define _When_(c,a) +#define _Writable_bytes_(s) +#define _Writable_elements_(s) +#define _Write_guarded_by_(e) diff --git a/reactos/include/ndk/ntndk.h b/reactos/include/ndk/ntndk.h index 93019adb617..2e5e92a74a6 100644 --- a/reactos/include/ndk/ntndk.h +++ b/reactos/include/ndk/ntndk.h @@ -31,6 +31,14 @@ Author: #pragma warning(disable:4214) #endif +// +// Use dummy macros, if SAL 2 is not available +// +#include +#if (_SAL_VERSION < 20) +#include +#endif + // // Headers needed for NDK // diff --git a/reactos/include/ndk/obfuncs.h b/reactos/include/ndk/obfuncs.h index 4835bfcfd2d..0b2c527b7ea 100644 --- a/reactos/include/ndk/obfuncs.h +++ b/reactos/include/ndk/obfuncs.h @@ -35,129 +35,129 @@ NTKERNELAPI NTSTATUS NTAPI ObAssignSecurity( - IN PACCESS_STATE AccessState, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PVOID Object, - IN POBJECT_TYPE Type + _In_ PACCESS_STATE AccessState, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PVOID Object, + _In_ POBJECT_TYPE Type ); NTKERNELAPI NTSTATUS NTAPI ObCloseHandle( - IN HANDLE Handle, - IN KPROCESSOR_MODE AccessMode + _In_ HANDLE Handle, + _In_ KPROCESSOR_MODE AccessMode ); NTKERNELAPI NTSTATUS NTAPI ObCreateObject( - IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - IN ULONG ObjectSize, - IN ULONG PagedPoolCharge OPTIONAL, - IN ULONG NonPagedPoolCharge OPTIONAL, - OUT PVOID *Object + _In_opt_ KPROCESSOR_MODE ObjectAttributesAccessMode, + _In_ POBJECT_TYPE ObjectType, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _In_ ULONG ObjectSize, + _In_opt_ ULONG PagedPoolCharge, + _In_opt_ ULONG NonPagedPoolCharge, + _Out_ PVOID *Object ); NTKERNELAPI NTSTATUS NTAPI ObCreateObjectType( - IN PUNICODE_STRING TypeName, - IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - IN PVOID Reserved, - OUT POBJECT_TYPE *ObjectType + _In_ PUNICODE_STRING TypeName, + _In_ POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + _In_ PVOID Reserved, + _Out_ POBJECT_TYPE *ObjectType ); NTKERNELAPI VOID NTAPI ObDereferenceSecurityDescriptor( - PSECURITY_DESCRIPTOR SecurityDescriptor, - ULONG Count + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ULONG Count ); NTKERNELAPI ULONG NTAPI ObGetObjectPointerCount( - IN PVOID Object + _In_ PVOID Object ); NTKERNELAPI NTSTATUS NTAPI ObLogSecurityDescriptor( - IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, - IN ULONG RefBias + _In_ PSECURITY_DESCRIPTOR InputSecurityDescriptor, + _Out_ PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + _In_ ULONG RefBias ); NTKERNELAPI NTSTATUS NTAPI ObOpenObjectByName( - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN POBJECT_TYPE ObjectType, - IN KPROCESSOR_MODE AccessMode, - IN PACCESS_STATE PassedAccessState, - IN ACCESS_MASK DesiredAccess, - IN OUT PVOID ParseContext, - OUT PHANDLE Handle + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ POBJECT_TYPE ObjectType, + _In_ KPROCESSOR_MODE AccessMode, + _In_ PACCESS_STATE PassedAccessState, + _In_ ACCESS_MASK DesiredAccess, + _Inout_ PVOID ParseContext, + _Out_ PHANDLE Handle ); NTKERNELAPI NTSTATUS NTAPI ObReferenceObjectByName( - IN PUNICODE_STRING ObjectName, - IN ULONG Attributes, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - OUT PVOID *Object + _In_ PUNICODE_STRING ObjectName, + _In_ ULONG Attributes, + _In_opt_ PACCESS_STATE PassedAccessState, + _In_opt_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_TYPE ObjectType, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _Out_ PVOID *Object ); NTKERNELAPI VOID NTAPI ObReferenceSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Count + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ULONG Count ); NTKERNELAPI NTSTATUS NTAPI ObSetSecurityObjectByPointer( - IN PVOID Object, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor + _In_ PVOID Object, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor ); NTKERNELAPI BOOLEAN NTAPI ObFindHandleForObject( - IN PEPROCESS Process, - IN PVOID Object, - IN POBJECT_TYPE ObjectType, - IN POBJECT_HANDLE_INFORMATION HandleInformation, - OUT PHANDLE Handle + _In_ PEPROCESS Process, + _In_ PVOID Object, + _In_ POBJECT_TYPE ObjectType, + _In_ POBJECT_HANDLE_INFORMATION HandleInformation, + _Out_ PHANDLE Handle ); NTKERNELAPI VOID NTAPI ObDereferenceObjectDeferDelete( - IN PVOID Object + _In_ PVOID Object ); #endif @@ -169,392 +169,411 @@ NTSYSCALLAPI NTSTATUS NTAPI NtClose( - IN HANDLE Handle + _In_ HANDLE Handle ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtCloseObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateDirectoryObject( - OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE DirectoryHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateSymbolicLinkObject( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING Name + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PUNICODE_STRING Name ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtDeleteObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose ); NTSYSCALLAPI NTSTATUS NTAPI NtDuplicateObject( - IN HANDLE SourceProcessHandle, - IN HANDLE SourceHandle, - IN HANDLE TargetProcessHandle, - OUT PHANDLE TargetHandle, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - IN ULONG Options + _In_ HANDLE SourceProcessHandle, + _In_ HANDLE SourceHandle, + _In_ HANDLE TargetProcessHandle, + _Out_ PHANDLE TargetHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ULONG HandleAttributes, + _In_ ULONG Options ); NTSYSCALLAPI NTSTATUS NTAPI NtMakePermanentObject( - IN HANDLE Object + _In_ HANDLE Object ); NTSYSCALLAPI NTSTATUS NTAPI NtMakeTemporaryObject( - IN HANDLE Handle + _In_ HANDLE Handle ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenDirectoryObject( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenJobObject( - PHANDLE JobHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE JobHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenSymbolicLinkObject( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryDirectoryObject( - IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - OUT PVOID ObjectInformation, - IN ULONG Length, - OUT PULONG ResultLength OPTIONAL + _In_opt_ HANDLE Handle, + _In_ OBJECT_INFORMATION_CLASS ObjectInformationClass, + _Out_writes_bytes_opt_(ObjectInformationLength) PVOID ObjectInformation, + _In_ ULONG ObjectInformationLength, + _Out_opt_ PULONG ReturnLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQuerySecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Length, - OUT PULONG ResultLength + _In_ HANDLE Handle, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_writes_bytes_opt_(Length) PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ULONG Length, + _Out_ PULONG LengthNeeded ); NTSYSCALLAPI NTSTATUS NTAPI NtQuerySymbolicLinkObject( - IN HANDLE SymLinkObjHandle, - OUT PUNICODE_STRING LinkTarget, - OUT PULONG DataWritten OPTIONAL + _In_ HANDLE SymLinkObjHandle, + _Out_ PUNICODE_STRING LinkTarget, + _Out_opt_ PULONG DataWritten ); NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - IN PVOID ObjectInformation, - IN ULONG Length + _In_ HANDLE ObjectHandle, + _In_ OBJECT_INFORMATION_CLASS ObjectInformationClass, + _In_ PVOID ObjectInformation, + _In_ ULONG Length ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor + _In_ HANDLE Handle, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor ); NTSYSCALLAPI NTSTATUS NTAPI NtSignalAndWaitForSingleObject( - IN HANDLE SignalObject, - IN HANDLE WaitObject, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ HANDLE SignalObject, + _In_ HANDLE WaitObject, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitForMultipleObjects( - IN ULONG Count, - IN HANDLE Object[], - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ ULONG Count, + _In_ HANDLE Object[], + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); NTSTATUS NTAPI NtWaitForMultipleObjects32( - IN ULONG ObjectCount, - IN PLONG Handles, - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL + _In_ ULONG ObjectCount, + _In_ PLONG Handles, + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER TimeOut ); NTSYSCALLAPI NTSTATUS NTAPI NtWaitForSingleObject( - IN HANDLE Object, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ HANDLE Object, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); NTSYSAPI NTSTATUS NTAPI ZwClose( - IN HANDLE Handle + _In_ HANDLE Handle ); NTSYSAPI NTSTATUS NTAPI ZwCloseObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose ); NTSYSAPI NTSTATUS NTAPI ZwCreateDirectoryObject( - OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE DirectoryHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwCreateSymbolicLinkObject( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING Name + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PUNICODE_STRING Name ); NTSYSAPI NTSTATUS NTAPI ZwDeleteObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwDuplicateObject( - IN HANDLE SourceProcessHandle, - IN HANDLE SourceHandle, - IN HANDLE TargetProcessHandle, - OUT PHANDLE TargetHandle, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - IN ULONG Options + _In_ HANDLE SourceProcessHandle, + _In_ HANDLE SourceHandle, + _In_opt_ HANDLE TargetProcessHandle, + _Out_opt_ PHANDLE TargetHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ULONG HandleAttributes, + _In_ ULONG Options ); NTSYSAPI NTSTATUS NTAPI ZwMakePermanentObject( - IN HANDLE Object + _In_ HANDLE Object ); NTSYSAPI NTSTATUS NTAPI ZwMakeTemporaryObject( - IN HANDLE Handle + _In_ HANDLE Handle ); NTSYSAPI NTSTATUS NTAPI ZwOpenDirectoryObject( - OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwOpenJobObject( - PHANDLE JobHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE JobHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwOpenSymbolicLinkObject( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryObject( - IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - OUT PVOID ObjectInformation, - IN ULONG Length, - OUT PULONG ResultLength OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQuerySecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Length, - OUT PULONG ResultLength -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQuerySymbolicLinkObject( - IN HANDLE SymLinkObjHandle, - OUT PUNICODE_STRING LinkTarget, - OUT PULONG DataWritten OPTIONAL + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - IN PVOID ObjectInformation, - IN ULONG Length -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetSecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor + _In_ HANDLE ObjectHandle, + _In_ OBJECT_INFORMATION_CLASS ObjectInformationClass, + _In_ PVOID ObjectInformation, + _In_ ULONG Length ); NTSYSAPI NTSTATUS NTAPI ZwSignalAndWaitForSingleObject( - IN HANDLE SignalObject, - IN HANDLE WaitObject, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ HANDLE SignalObject, + _In_ HANDLE WaitObject, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); NTSYSAPI NTSTATUS NTAPI ZwWaitForMultipleObjects( - IN ULONG Count, - IN HANDLE Object[], - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ ULONG Count, + _In_ HANDLE Object[], + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Time ); +#ifdef NTOS_MODE_USER + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryObject( + _In_opt_ HANDLE Handle, + _In_ OBJECT_INFORMATION_CLASS ObjectInformationClass, + _Out_writes_bytes_opt_(ObjectInformationLength) PVOID ObjectInformation, + _In_ ULONG ObjectInformationLength, + _Out_opt_ PULONG ReturnLength +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwQuerySecurityObject( + _In_ HANDLE Handle, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_writes_bytes_to_(Length,*LengthNeeded) PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ULONG Length, + _Out_ PULONG LengthNeeded +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwQuerySymbolicLinkObject( + _In_ HANDLE LinkHandle, + _Inout_ PUNICODE_STRING LinkTarget, + _Out_opt_ PULONG ReturnedLength +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwSetSecurityObject( + _In_ HANDLE Handle, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor +); + +_When_(Timeout == NULL, _IRQL_requires_max_(APC_LEVEL)) +_When_(Timeout->QuadPart != 0, _IRQL_requires_max_(APC_LEVEL)) +_When_(Timeout->QuadPart == 0, _IRQL_requires_max_(DISPATCH_LEVEL)) NTSYSAPI NTSTATUS NTAPI ZwWaitForSingleObject( - IN HANDLE Object, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + _In_ HANDLE Handle, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout ); +#endif /* NTOS_MODE_USER */ + #endif diff --git a/reactos/include/ndk/obtypes.h b/reactos/include/ndk/obtypes.h index 281d5a723e1..eb9d9199a2c 100644 --- a/reactos/include/ndk/obtypes.h +++ b/reactos/include/ndk/obtypes.h @@ -173,75 +173,75 @@ typedef struct _OB_DUMP_CONTROL // typedef VOID (NTAPI *OB_DUMP_METHOD)( - IN PVOID Object, - IN POB_DUMP_CONTROL Control OPTIONAL + _In_ PVOID Object, + _In_opt_ POB_DUMP_CONTROL Control ); typedef NTSTATUS (NTAPI *OB_OPEN_METHOD)( - IN OB_OPEN_REASON Reason, - IN PEPROCESS Process OPTIONAL, - IN PVOID ObjectBody, - IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount + _In_ OB_OPEN_REASON Reason, + _In_opt_ PEPROCESS Process, + _In_ PVOID ObjectBody, + _In_ ACCESS_MASK GrantedAccess, + _In_ ULONG HandleCount ); typedef VOID (NTAPI *OB_CLOSE_METHOD)( - IN PEPROCESS Process OPTIONAL, - IN PVOID Object, - IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount + _In_opt_ PEPROCESS Process, + _In_ PVOID Object, + _In_ ACCESS_MASK GrantedAccess, + _In_ ULONG ProcessHandleCount, + _In_ ULONG SystemHandleCount ); typedef VOID (NTAPI *OB_DELETE_METHOD)( - IN PVOID Object + _In_ PVOID Object ); typedef NTSTATUS (NTAPI *OB_PARSE_METHOD)( - IN PVOID ParseObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING CompleteName, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *Object + _In_ PVOID ParseObject, + _In_ PVOID ObjectType, + _Inout_ PACCESS_STATE AccessState, + _In_ KPROCESSOR_MODE AccessMode, + _In_ ULONG Attributes, + _Inout_ PUNICODE_STRING CompleteName, + _Inout_ PUNICODE_STRING RemainingName, + _Inout_opt_ PVOID Context, + _In_opt_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, + _Out_ PVOID *Object ); typedef NTSTATUS (NTAPI *OB_SECURITY_METHOD)( - IN PVOID Object, - IN SECURITY_OPERATION_CODE OperationType, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PULONG CapturedLength, - IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, - IN POOL_TYPE PoolType, - IN PGENERIC_MAPPING GenericMapping + _In_ PVOID Object, + _In_ SECURITY_OPERATION_CODE OperationType, + _In_ PSECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PULONG CapturedLength, + _Inout_ PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping ); typedef NTSTATUS (NTAPI *OB_QUERYNAME_METHOD)( - IN PVOID Object, - IN BOOLEAN HasObjectName, - OUT POBJECT_NAME_INFORMATION ObjectNameInfo, - IN ULONG Length, - OUT PULONG ReturnLength, - IN KPROCESSOR_MODE AccessMode + _In_ PVOID Object, + _In_ BOOLEAN HasObjectName, + _Out_ POBJECT_NAME_INFORMATION ObjectNameInfo, + _In_ ULONG Length, + _Out_ PULONG ReturnLength, + _In_ KPROCESSOR_MODE AccessMode ); typedef BOOLEAN (NTAPI *OB_OKAYTOCLOSE_METHOD)( - IN PEPROCESS Process OPTIONAL, - IN PVOID Object, - IN HANDLE Handle, - IN KPROCESSOR_MODE AccessMode + _In_opt_ PEPROCESS Process, + _In_ PVOID Object, + _In_ HANDLE Handle, + _In_ KPROCESSOR_MODE AccessMode ); #else diff --git a/reactos/include/ndk/pofuncs.h b/reactos/include/ndk/pofuncs.h index a1e677f3b4d..e4f85e2e95a 100644 --- a/reactos/include/ndk/pofuncs.h +++ b/reactos/include/ndk/pofuncs.h @@ -32,45 +32,45 @@ NTSYSCALLAPI NTSTATUS NTAPI NtInitiatePowerAction( - POWER_ACTION SystemAction, - SYSTEM_POWER_STATE MinSystemState, - ULONG Flags, - BOOLEAN Asynchronous + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous ); NTSYSCALLAPI NTSTATUS NTAPI NtPowerInformation( - POWER_INFORMATION_LEVEL PowerInformationLevel, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength + _In_ POWER_INFORMATION_LEVEL PowerInformationLevel, + _In_bytecount_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_bytecap_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemPowerState( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags ); NTSYSCALLAPI NTSTATUS NTAPI NtGetDevicePowerState( - IN HANDLE Device, - IN PDEVICE_POWER_STATE PowerState + _In_ HANDLE Device, + _In_ PDEVICE_POWER_STATE PowerState ); NTSYSCALLAPI NTSTATUS NTAPI NtRequestWakeupLatency( - IN LATENCY_TIME latency + _In_ LATENCY_TIME latency ); NTSYSCALLAPI @@ -82,61 +82,63 @@ NTSYSCALLAPI NTSTATUS NTAPI NtSetThreadExecutionState( - IN EXECUTION_STATE esFlags, - OUT EXECUTION_STATE *PreviousFlags + _In_ EXECUTION_STATE esFlags, + _Out_ EXECUTION_STATE *PreviousFlags ); NTSYSCALLAPI NTSTATUS NTAPI NtInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous ); NTSYSCALLAPI NTSTATUS NTAPI NtRequestDeviceWakeup( - IN HANDLE Device + _In_ HANDLE Device ); NTSYSCALLAPI NTSTATUS NTAPI NtCancelDeviceWakeupRequest( - IN HANDLE Device + _In_ HANDLE Device ); #endif -NTSYSCALLAPI + +NTSYSAPI NTSTATUS NTAPI ZwInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI NTSTATUS NTAPI ZwPowerInformation( - IN POWER_INFORMATION_LEVEL PowerInformationLevel, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength + _In_ POWER_INFORMATION_LEVEL InformationLevel, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength ); NTSYSCALLAPI NTSTATUS NTAPI ZwSetSystemPowerState( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags ); #endif diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h index 77a6b3ad945..5a89ae028e6 100644 --- a/reactos/include/ndk/psfuncs.h +++ b/reactos/include/ndk/psfuncs.h @@ -52,22 +52,22 @@ NTKERNELAPI PVOID NTAPI PsGetProcessWin32Process( - PEPROCESS Process + _In_ PEPROCESS Process ); NTKERNELAPI VOID NTAPI PsSetProcessWin32Process( - PEPROCESS Process, - PVOID Win32Process + _Inout_ PEPROCESS Process, + _In_ PVOID Win32Process ); NTKERNELAPI VOID NTAPI PsSetThreadWin32Thread( - PETHREAD Thread, + _Inout_ PETHREAD Thread, PVOID Win32Thread ); @@ -75,66 +75,66 @@ NTKERNELAPI PVOID NTAPI PsGetThreadWin32Thread( - PETHREAD Thread + _In_ PETHREAD Thread ); NTKERNELAPI PVOID NTAPI PsGetProcessWin32WindowStation( - PEPROCESS Process + _In_ PEPROCESS Process ); NTKERNELAPI VOID NTAPI PsSetProcessWindowStation( - PEPROCESS Process, - PVOID WindowStation + _Inout_ PEPROCESS Process, + _In_ PVOID WindowStation ); NTKERNELAPI PTEB NTAPI PsGetThreadTeb( - IN PETHREAD Thread + _In_ PETHREAD Thread ); NTKERNELAPI HANDLE NTAPI PsGetThreadId( - IN PETHREAD Thread + _In_ PETHREAD Thread ); NTKERNELAPI BOOLEAN NTAPI PsGetThreadHardErrorsAreDisabled( - PETHREAD Thread + _In_ PETHREAD Thread ); NTKERNELAPI VOID NTAPI PsSetThreadHardErrorsAreDisabled( - PETHREAD Thread, - IN BOOLEAN Disabled + _Inout_ PETHREAD Thread, + _In_ BOOLEAN Disabled ); NTKERNELAPI VOID NTAPI PsEstablishWin32Callouts( - PWIN32_CALLOUTS_FPNS CalloutData + _In_ PWIN32_CALLOUTS_FPNS CalloutData ); NTKERNELAPI VOID NTAPI PsReturnProcessNonPagedPoolQuota( - IN PEPROCESS Process, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ SIZE_T Amount ); NTKERNELAPI @@ -151,7 +151,7 @@ NTKERNELAPI VOID NTAPI PsRevertThreadToSelf( - IN PETHREAD Thread + _Inout_ PETHREAD Thread ); // @@ -161,55 +161,55 @@ NTKERNELAPI NTSTATUS NTAPI PsLookupProcessThreadByCid( - IN PCLIENT_ID Cid, - OUT PEPROCESS *Process OPTIONAL, - OUT PETHREAD *Thread + _In_ PCLIENT_ID Cid, + _Out_opt_ PEPROCESS *Process, + _Out_ PETHREAD *Thread ); BOOLEAN NTAPI PsIsProtectedProcess( - IN PEPROCESS Process + _In_ PEPROCESS Process ); NTKERNELAPI BOOLEAN NTAPI PsIsSystemProcess( - IN PEPROCESS Process + _In_ PEPROCESS Process ); VOID NTAPI PsSetProcessPriorityByClass( - IN PEPROCESS Process, - IN PSPROCESSPRIORITYMODE Type + _In_ PEPROCESS Process, + _In_ PSPROCESSPRIORITYMODE Type ); HANDLE NTAPI PsGetProcessInheritedFromUniqueProcessId( - IN PEPROCESS Process + _In_ PEPROCESS Process ); NTKERNELAPI NTSTATUS NTAPI PsGetProcessExitStatus( - PEPROCESS Process + _In_ PEPROCESS Process ); HANDLE NTAPI PsGetProcessSessionId( - IN PEPROCESS Process + _In_ PEPROCESS Process ); NTKERNELAPI BOOLEAN NTAPI PsGetProcessExitProcessCalled( - PEPROCESS Process + _In_ PEPROCESS Process ); // @@ -219,59 +219,59 @@ NTKERNELAPI VOID NTAPI PsChargePoolQuota( - IN PEPROCESS Process, - IN POOL_TYPE PoolType, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ POOL_TYPE PoolType, + _In_ SIZE_T Amount ); NTKERNELAPI NTSTATUS NTAPI PsChargeProcessNonPagedPoolQuota( - IN PEPROCESS Process, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ SIZE_T Amount ); NTKERNELAPI NTSTATUS NTAPI PsChargeProcessPagedPoolQuota( - IN PEPROCESS Process, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ SIZE_T Amount ); NTKERNELAPI NTSTATUS NTAPI PsChargeProcessPoolQuota( - IN PEPROCESS Process, - IN POOL_TYPE PoolType, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ POOL_TYPE PoolType, + _In_ SIZE_T Amount ); NTKERNELAPI VOID NTAPI PsReturnPoolQuota( - IN PEPROCESS Process, - IN POOL_TYPE PoolType, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ POOL_TYPE PoolType, + _In_ SIZE_T Amount ); NTKERNELAPI VOID NTAPI PsReturnProcessNonPagedPoolQuota( - IN PEPROCESS Process, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ SIZE_T Amount ); NTKERNELAPI VOID NTAPI PsReturnProcessPagedPoolQuota( - IN PEPROCESS Process, - IN SIZE_T Amount + _In_ PEPROCESS Process, + _In_ SIZE_T Amount ); #endif @@ -283,8 +283,8 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAlertResumeThread( - IN HANDLE ThreadHandle, - OUT PULONG SuspendCount + _In_ HANDLE ThreadHandle, + _Out_ PULONG SuspendCount ); typedef ULONG APPHELPCACHESERVICECLASS; @@ -292,83 +292,83 @@ NTSYSCALLAPI NTSTATUS NTAPI NtApphelpCacheControl( - IN APPHELPCACHESERVICECLASS Service, - IN PVOID ServiceData + _In_ APPHELPCACHESERVICECLASS Service, + _In_ PVOID ServiceData ); NTSYSCALLAPI NTSTATUS NTAPI NtAlertThread( - IN HANDLE ThreadHandle + _In_ HANDLE ThreadHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtAssignProcessToJobObject( - HANDLE JobHandle, - HANDLE ProcessHandle + _In_ HANDLE JobHandle, + _In_ HANDLE ProcessHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateJobObject( - PHANDLE JobHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE JobHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSTATUS NTAPI NtCreateJobSet( - IN ULONG NumJob, - IN PJOB_SET_ARRAY UserJobSet, - IN ULONG Flags + _In_ ULONG NumJob, + _In_ PJOB_SET_ARRAY UserJobSet, + _In_ ULONG Flags ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateProcess( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ParentProcess, - IN BOOLEAN InheritObjectTable, - IN HANDLE SectionHandle OPTIONAL, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL + _Out_ PHANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE ParentProcess, + _In_ BOOLEAN InheritObjectTable, + _In_opt_ HANDLE SectionHandle, + _In_opt_ HANDLE DebugPort, + _In_opt_ HANDLE ExceptionPort ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateProcessEx( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ParentProcess, - IN ULONG Flags, - IN HANDLE SectionHandle OPTIONAL, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL, - IN BOOLEAN InJob + _Out_ PHANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE ParentProcess, + _In_ ULONG Flags, + _In_opt_ HANDLE SectionHandle, + _In_opt_ HANDLE DebugPort, + _In_opt_ HANDLE ExceptionPort, + _In_ BOOLEAN InJob ); NTSYSCALLAPI NTSTATUS NTAPI NtCreateThread( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ProcessHandle, - OUT PCLIENT_ID ClientId, - IN PCONTEXT ThreadContext, - IN PINITIAL_TEB UserStack, - IN BOOLEAN CreateSuspended + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE ProcessHandle, + _Out_ PCLIENT_ID ClientId, + _In_ PCONTEXT ThreadContext, + _In_ PINITIAL_TEB UserStack, + _In_ BOOLEAN CreateSuspended ); #ifndef _M_ARM @@ -390,69 +390,81 @@ NTSYSCALLAPI NTSTATUS NTAPI NtImpersonateThread( - IN HANDLE ThreadHandle, - IN HANDLE ThreadToImpersonate, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService + _In_ HANDLE ThreadHandle, + _In_ HANDLE ThreadToImpersonate, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); NTSYSCALLAPI NTSTATUS NTAPI NtIsProcessInJob( - IN HANDLE ProcessHandle, - IN HANDLE JobHandle OPTIONAL + _In_ HANDLE ProcessHandle, + _In_opt_ HANDLE JobHandle ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtOpenProcess( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId + _Out_ PHANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ PCLIENT_ID ClientId +); + +_Must_inspect_result_ +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtOpenProcessToken( + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE TokenHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenThread( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PCLIENT_ID ClientId ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenThreadToken( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - OUT PHANDLE TokenHandle + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _Out_ PHANDLE TokenHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenThreadTokenEx( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - IN ULONG HandleAttributes, - OUT PHANDLE TokenHandle + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _In_ ULONG HandleAttributes, + _Out_ PHANDLE TokenHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationJobObject( - HANDLE JobHandle, - JOBOBJECTINFOCLASS JobInformationClass, - PVOID JobInformation, - ULONG JobInformationLength, - PULONG ReturnLength + _In_ HANDLE JobHandle, + _In_ JOBOBJECTINFOCLASS JobInformationClass, + _Out_bytecap_(JobInformationLength) PVOID JobInformation, + _In_ ULONG JobInformationLength, + _Out_ PULONG ReturnLength ); #ifndef _NTDDK_ @@ -460,11 +472,11 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength OPTIONAL ); #endif @@ -472,231 +484,233 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationThread( - IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE ThreadHandle, + _In_ THREADINFOCLASS ThreadInformationClass, + _Out_ PVOID ThreadInformation, + _In_ ULONG ThreadInformationLength, + _Out_ PULONG ReturnLength ); NTSYSCALLAPI NTSTATUS NTAPI NtRegisterThreadTerminatePort( - HANDLE TerminationPort + _In_ HANDLE TerminationPort ); NTSYSCALLAPI NTSTATUS NTAPI NtResumeThread( - IN HANDLE ThreadHandle, - OUT PULONG SuspendCount + _In_ HANDLE ThreadHandle, + _Out_ PULONG SuspendCount ); NTSYSCALLAPI NTSTATUS NTAPI NtResumeProcess( - IN HANDLE ProcessHandle + _In_ HANDLE ProcessHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationJobObject( - HANDLE JobHandle, - JOBOBJECTINFOCLASS JobInformationClass, - PVOID JobInformation, - ULONG JobInformationLength + _In_ HANDLE JobHandle, + _In_ JOBOBJECTINFOCLASS JobInformationClass, + _In_bytecount_(JobInformationLength) PVOID JobInformation, + _In_ ULONG JobInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - IN PVOID ProcessInformation, - IN ULONG ProcessInformationLength + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _In_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationThread( - IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength + _In_ HANDLE ThreadHandle, + _In_ THREADINFOCLASS ThreadInformationClass, + _In_reads_bytes_(ThreadInformationLength) PVOID ThreadInformation, + _In_ ULONG ThreadInformationLength ); NTSYSCALLAPI NTSTATUS NTAPI NtSuspendProcess( - IN HANDLE ProcessHandle + _In_ HANDLE ProcessHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtSuspendThread( - IN HANDLE ThreadHandle, - IN PULONG PreviousSuspendCount + _In_ HANDLE ThreadHandle, + _In_ PULONG PreviousSuspendCount ); NTSYSCALLAPI NTSTATUS NTAPI NtTerminateProcess( - IN HANDLE ProcessHandle, - IN NTSTATUS ExitStatus + _In_ HANDLE ProcessHandle, + _In_ NTSTATUS ExitStatus ); NTSYSCALLAPI NTSTATUS NTAPI NtTerminateThread( - IN HANDLE ThreadHandle, - IN NTSTATUS ExitStatus + _In_ HANDLE ThreadHandle, + _In_ NTSTATUS ExitStatus ); NTSYSCALLAPI NTSTATUS NTAPI NtTerminateJobObject( - HANDLE JobHandle, - NTSTATUS ExitStatus + _In_ HANDLE JobHandle, + _In_ NTSTATUS ExitStatus ); NTSYSAPI NTSTATUS NTAPI ZwAlertResumeThread( - IN HANDLE ThreadHandle, - OUT PULONG SuspendCount + _In_ HANDLE ThreadHandle, + _Out_ PULONG SuspendCount ); NTSYSAPI NTSTATUS NTAPI ZwAlertThread( - IN HANDLE ThreadHandle + _In_ HANDLE ThreadHandle ); NTSYSAPI NTSTATUS NTAPI ZwAssignProcessToJobObject( - HANDLE JobHandle, - HANDLE ProcessHandle + _In_ HANDLE JobHandle, + _In_ HANDLE ProcessHandle ); NTSYSAPI NTSTATUS NTAPI ZwCreateJobObject( - PHANDLE JobHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes + _Out_ PHANDLE JobHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes ); NTSYSAPI NTSTATUS NTAPI ZwCreateProcess( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ParentProcess, - IN BOOLEAN InheritObjectTable, - IN HANDLE SectionHandle OPTIONAL, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL + _Out_ PHANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE ParentProcess, + _In_ BOOLEAN InheritObjectTable, + _In_opt_ HANDLE SectionHandle, + _In_opt_ HANDLE DebugPort, + _In_opt_ HANDLE ExceptionPort ); NTSYSAPI NTSTATUS NTAPI ZwCreateThread( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ProcessHandle, - OUT PCLIENT_ID ClientId, - IN PCONTEXT ThreadContext, - IN PINITIAL_TEB UserStack, - IN BOOLEAN CreateSuspended + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ HANDLE ProcessHandle, + _Out_ PCLIENT_ID ClientId, + _In_ PCONTEXT ThreadContext, + _In_ PINITIAL_TEB UserStack, + _In_ BOOLEAN CreateSuspended ); NTSYSAPI NTSTATUS NTAPI ZwImpersonateThread( - IN HANDLE ThreadHandle, - IN HANDLE ThreadToImpersonate, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService + _In_ HANDLE ThreadHandle, + _In_ HANDLE ThreadToImpersonate, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); NTSYSAPI NTSTATUS NTAPI ZwIsProcessInJob( - IN HANDLE ProcessHandle, - IN HANDLE JobHandle OPTIONAL + _In_ HANDLE ProcessHandle, + _In_opt_ HANDLE JobHandle ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -ZwOpenProcess( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId +ZwOpenProcessTokenEx( + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ULONG HandleAttributes, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwOpenThread( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PCLIENT_ID ClientId ); NTSYSAPI NTSTATUS NTAPI ZwOpenThreadToken( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - OUT PHANDLE TokenHandle + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwOpenThreadTokenEx( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - IN ULONG HandleAttributes, - OUT PHANDLE TokenHandle + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _In_ ULONG HandleAttributes, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwQueryInformationJobObject( - HANDLE JobHandle, - JOBOBJECTINFOCLASS JobInformationClass, - PVOID JobInformation, - ULONG JobInformationLength, - PULONG ReturnLength + _In_ HANDLE JobHandle, + _In_ JOBOBJECTINFOCLASS JobInformationClass, + _Out_bytecap_(JobInformationLength) PVOID JobInformation, + _In_ ULONG JobInformationLength, + _Out_ PULONG ReturnLength ); #ifndef _NTDDK_ @@ -704,11 +718,11 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength ); #endif @@ -716,102 +730,104 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryInformationThread( - IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE ThreadHandle, + _In_ THREADINFOCLASS ThreadInformationClass, + _Out_ PVOID ThreadInformation, + _In_ ULONG ThreadInformationLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwRegisterThreadTerminatePort( - HANDLE TerminationPort + _In_ HANDLE TerminationPort ); NTSYSAPI NTSTATUS NTAPI ZwResumeThread( - IN HANDLE ThreadHandle, - OUT PULONG SuspendCount + _In_ HANDLE ThreadHandle, + _Out_ PULONG SuspendCount ); NTSYSAPI NTSTATUS NTAPI ZwResumeProcess( - IN HANDLE ProcessHandle + _In_ HANDLE ProcessHandle ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationJobObject( - HANDLE JobHandle, - JOBOBJECTINFOCLASS JobInformationClass, - PVOID JobInformation, - ULONG JobInformationLength + _In_ HANDLE JobHandle, + _In_ JOBOBJECTINFOCLASS JobInformationClass, + _In_ PVOID JobInformation, + _In_ ULONG JobInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - IN PVOID ProcessInformation, - IN ULONG ProcessInformationLength + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _In_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwSetInformationThread( - IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength + _In_ HANDLE ThreadHandle, + _In_ THREADINFOCLASS ThreadInformationClass, + _In_reads_bytes_(ThreadInformationLength) PVOID ThreadInformation, + _In_ ULONG ThreadInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwSuspendProcess( - IN HANDLE ProcessHandle + _In_ HANDLE ProcessHandle ); NTSYSAPI NTSTATUS NTAPI ZwSuspendThread( - IN HANDLE ThreadHandle, - IN PULONG PreviousSuspendCount + _In_ HANDLE ThreadHandle, + _In_ PULONG PreviousSuspendCount ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -ZwTerminateProcess( - IN HANDLE ProcessHandle, - IN NTSTATUS ExitStatus -); +ZwTerminateProcess ( + _In_opt_ HANDLE ProcessHandle, + _In_ NTSTATUS ExitStatus + ); NTSYSAPI NTSTATUS NTAPI ZwTerminateThread( - IN HANDLE ThreadHandle, - IN NTSTATUS ExitStatus + _In_ HANDLE ThreadHandle, + _In_ NTSTATUS ExitStatus ); NTSYSAPI NTSTATUS NTAPI ZwTerminateJobObject( - HANDLE JobHandle, - NTSTATUS ExitStatus + _In_ HANDLE JobHandle, + _In_ NTSTATUS ExitStatus ); #ifdef __cplusplus diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h index 65b88141cec..5b5cacb2ce5 100644 --- a/reactos/include/ndk/pstypes.h +++ b/reactos/include/ndk/pstypes.h @@ -501,15 +501,15 @@ struct _WIN32_PARSEMETHOD_PARAMETERS; typedef NTSTATUS (NTAPI *PKWIN32_PROCESS_CALLOUT)( - struct _EPROCESS *Process, - BOOLEAN Create + _In_ struct _EPROCESS *Process, + _In_ BOOLEAN Create ); typedef NTSTATUS (NTAPI *PKWIN32_THREAD_CALLOUT)( - struct _ETHREAD *Thread, - PSW32THREADCALLOUTTYPE Type + _In_ struct _ETHREAD *Thread, + _In_ PSW32THREADCALLOUTTYPE Type ); typedef @@ -521,19 +521,19 @@ NTSTATUS typedef NTSTATUS (NTAPI *PKWIN32_POWEREVENT_CALLOUT)( - struct _WIN32_POWEREVENT_PARAMETERS *Parameters + _In_ struct _WIN32_POWEREVENT_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_POWERSTATE_CALLOUT)( - struct _WIN32_POWERSTATE_PARAMETERS *Parameters + _In_ struct _WIN32_POWERSTATE_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_JOB_CALLOUT)( - struct _WIN32_JOBCALLOUT_PARAMETERS *Parameters + _In_ struct _WIN32_JOBCALLOUT_PARAMETERS *Parameters ); typedef @@ -545,39 +545,39 @@ NTSTATUS typedef NTSTATUS (NTAPI *PKWIN32_OPENMETHOD_CALLOUT)( - struct _WIN32_OPENMETHOD_PARAMETERS *Parameters + _In_ struct _WIN32_OPENMETHOD_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_OKTOCLOSEMETHOD_CALLOUT)( - struct _WIN32_OKAYTOCLOSEMETHOD_PARAMETERS *Parameters + _In_ struct _WIN32_OKAYTOCLOSEMETHOD_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_CLOSEMETHOD_CALLOUT)( - struct _WIN32_CLOSEMETHOD_PARAMETERS *Parameters + _In_ struct _WIN32_CLOSEMETHOD_PARAMETERS *Parameters ); typedef VOID (NTAPI *PKWIN32_DELETEMETHOD_CALLOUT)( - struct _WIN32_DELETEMETHOD_PARAMETERS *Parameters + _In_ struct _WIN32_DELETEMETHOD_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_PARSEMETHOD_CALLOUT)( - struct _WIN32_PARSEMETHOD_PARAMETERS *Parameters + _In_ struct _WIN32_PARSEMETHOD_PARAMETERS *Parameters ); typedef NTSTATUS (NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( - struct _EPROCESS *Process, - PVOID Callback, - PVOID Context + _In_ struct _EPROCESS *Process, + _In_ PVOID Callback, + _In_ PVOID Context ); // @@ -586,7 +586,7 @@ NTSTATUS typedef VOID (NTAPI *PLEGO_NOTIFY_ROUTINE)( - IN PKTHREAD Thread + _In_ PKTHREAD Thread ); #endif @@ -1392,7 +1392,7 @@ typedef struct _WIN32_PARSEMETHOD_PARAMETERS PACCESS_STATE AccessState; KPROCESSOR_MODE AccessMode; ULONG Attributes; - OUT PUNICODE_STRING CompleteName; + _Out_ PUNICODE_STRING CompleteName; PUNICODE_STRING RemainingName; PVOID Context; PSECURITY_QUALITY_OF_SERVICE SecurityQos; diff --git a/reactos/include/ndk/readme.txt b/reactos/include/ndk/readme.txt index 0b67c2dd0bc..cf1898a6ba9 100644 --- a/reactos/include/ndk/readme.txt +++ b/reactos/include/ndk/readme.txt @@ -42,7 +42,7 @@ software. You MUST read GPL.TXT or LGPL.TXT after your decision. Violating your chosen license voids your usage rights of the NDK and will lead to legal action on the part of the author. Using this software with any later version of the GNU GPL or LGPL in no way -changes your obligations under the versions listed above. You MUST still release the +changes your obligations under the versions listed above. You MUST still release the NDK and its changes under the terms of the original licenses (either GPLv2 or LGPLv2.1) as listed above. This DOES NOT AFFECT the license of a software package released under a later version and ONLY serves to clarify that using the NDK with a later version is @@ -152,36 +152,36 @@ remain anonymous, simply do not include this statement. 3.1 ORGANIZATION - * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). - * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). + * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). + * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). * The NDK can either be included on-demand (#include ) or globally (#include ). - The former is recommended to reduce compile time. + The former is recommended to reduce compile time. * The NDK is structured by function and type. Every Subsystem Component has an associated "xxfuncs.h" and - "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) + "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) * The NDK has a special file called "umtypes.h" which exports to User-Mode or Native-Mode Applications the basic NT types which are present in ntdef.h. This file cannot be included since it would conflict with winnt.h and/or windef.h. Thus, umtypes.h provides the missing types. This file is automatically included - in a User-Mode NDK project. + in a User-Mode NDK project. * The NDK also includes a file called "umfuncs.h" which exports to User-Mode or Native-Mode Applications - undocumented functions which can only be accessed from ntdll.dll. + undocumented functions which can only be accessed from ntdll.dll. * The NDK has another special file called "ifssupp.h", which exports to Kernel-Mode drivers a few types which are only documented in the IFS kit, and are part of some native definitions. It will be deprecated next year - with the release of the WDK. + with the release of the WDK. -3.2 USING IN YOUR PROJECT +3.2 USING _In_ YOUR PROJECT - * User Mode Application requiring Native Types: + * User Mode Application requiring Native Types: #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ #include "windows.h" /* Declare Windows Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ - * Native Mode Application: + * Native Mode Application: #include "windows.h" /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ #include "ntndk.h" /* Declare the NDK Headers */ - * Kernel Mode Driver: + * Kernel Mode Driver: #include "ntddk.h" /* Declare DDK Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index fb4a8a0e402..815e815542c 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -42,7 +42,7 @@ extern "C" { FORCEINLINE VOID InitializeListHead( - IN PLIST_ENTRY ListHead + _Out_ PLIST_ENTRY ListHead ) { ListHead->Flink = ListHead->Blink = ListHead; @@ -51,8 +51,8 @@ InitializeListHead( FORCEINLINE VOID InsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry + _Inout_ PLIST_ENTRY ListHead, + _Inout_ PLIST_ENTRY Entry ) { PLIST_ENTRY OldFlink; @@ -66,8 +66,8 @@ InsertHeadList( FORCEINLINE VOID InsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY Entry + _Inout_ PLIST_ENTRY ListHead, + _Inout_ PLIST_ENTRY Entry ) { PLIST_ENTRY OldBlink; @@ -78,10 +78,11 @@ InsertTailList( ListHead->Blink = Entry; } +_Must_inspect_result_ FORCEINLINE BOOLEAN IsListEmpty( - IN const LIST_ENTRY * ListHead + _In_ const LIST_ENTRY * ListHead ) { return (BOOLEAN)(ListHead->Flink == ListHead); @@ -90,7 +91,7 @@ IsListEmpty( FORCEINLINE PSINGLE_LIST_ENTRY PopEntryList( - PSINGLE_LIST_ENTRY ListHead + _Inout_ PSINGLE_LIST_ENTRY ListHead ) { PSINGLE_LIST_ENTRY FirstEntry; @@ -105,8 +106,8 @@ PopEntryList( FORCEINLINE VOID PushEntryList( - PSINGLE_LIST_ENTRY ListHead, - PSINGLE_LIST_ENTRY Entry + _Inout_ PSINGLE_LIST_ENTRY ListHead, + _Inout_ PSINGLE_LIST_ENTRY Entry ) { Entry->Next = ListHead->Next; @@ -116,7 +117,7 @@ PushEntryList( FORCEINLINE BOOLEAN RemoveEntryList( - IN PLIST_ENTRY Entry) + _In_ PLIST_ENTRY Entry) { PLIST_ENTRY OldFlink; PLIST_ENTRY OldBlink; @@ -131,7 +132,7 @@ RemoveEntryList( FORCEINLINE PLIST_ENTRY RemoveHeadList( - IN PLIST_ENTRY ListHead) + _Inout_ PLIST_ENTRY ListHead) { PLIST_ENTRY Flink; PLIST_ENTRY Entry; @@ -146,7 +147,7 @@ RemoveHeadList( FORCEINLINE PLIST_ENTRY RemoveTailList( - IN PLIST_ENTRY ListHead) + _Inout_ PLIST_ENTRY ListHead) { PLIST_ENTRY Blink; PLIST_ENTRY Entry; @@ -161,22 +162,30 @@ RemoveTailList( // // Unicode string macros // +_At_(UnicodeString->Buffer, _Post_equal_to_(Buffer)) +_At_(UnicodeString->Length, _Post_equal_to_(0)) +_At_(UnicodeString->MaximumLength, _Post_equal_to_(BufferSize)) FORCEINLINE VOID -RtlInitEmptyUnicodeString(OUT PUNICODE_STRING UnicodeString, - IN PWSTR Buffer, - IN USHORT BufferSize) +RtlInitEmptyUnicodeString( + _Out_ PUNICODE_STRING UnicodeString, + _When_(BufferSize != 0, _Notnull_) _Writable_bytes_(BufferSize) __drv_aliasesMem PWCHAR Buffer, + _In_ USHORT BufferSize) { UnicodeString->Length = 0; UnicodeString->MaximumLength = BufferSize; UnicodeString->Buffer = Buffer; } +_At_(AnsiString->Buffer, _Post_equal_to_(Buffer)) +_At_(AnsiString->Length, _Post_equal_to_(0)) +_At_(AnsiString->MaximumLength, _Post_equal_to_(BufferSize)) FORCEINLINE VOID -RtlInitEmptyAnsiString(OUT PANSI_STRING AnsiString, - IN PSTR Buffer, - IN USHORT BufferSize) +RtlInitEmptyAnsiString( + _Out_ PANSI_STRING AnsiString, + _When_(BufferSize != 0, _Notnull_) _Writable_bytes_(BufferSize) __drv_aliasesMem PCHAR Buffer, + _In_ USHORT BufferSize) { AnsiString->Length = 0; AnsiString->MaximumLength = BufferSize; @@ -191,7 +200,8 @@ RtlInitEmptyAnsiString(OUT PANSI_STRING AnsiString, FORCEINLINE LUID NTAPI_INLINE -RtlConvertUlongToLuid(ULONG Ulong) +RtlConvertUlongToLuid( + _In_ ULONG Ulong) { LUID TempLuid; @@ -250,97 +260,102 @@ NTSYSAPI VOID NTAPI RtlInitializeGenericTable( - OUT PRTL_GENERIC_TABLE Table, - IN PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, - IN PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, - IN PRTL_GENERIC_FREE_ROUTINE FreeRoutine, - IN PVOID TableContext OPTIONAL + _Out_ PRTL_GENERIC_TABLE Table, + _In_ PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, + _In_opt_ PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, + _In_opt_ PRTL_GENERIC_FREE_ROUTINE FreeRoutine, + _In_opt_ PVOID TableContext ); NTSYSAPI PVOID NTAPI RtlInsertElementGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - IN CLONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL + _In_ PRTL_GENERIC_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement ); NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableFull( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - IN CLONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL, - IN PVOID NodeOrParent, - IN TABLE_SEARCH_RESULT SearchResult + _In_ PRTL_GENERIC_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement, + _In_ PVOID NodeOrParent, + _In_ TABLE_SEARCH_RESULT SearchResult ); NTSYSAPI BOOLEAN NTAPI RtlDeleteElementGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer + _In_ PRTL_GENERIC_TABLE Table, + _In_ PVOID Buffer ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlLookupElementGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer + _In_ PRTL_GENERIC_TABLE Table, + _In_ PVOID Buffer ); NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableFull( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult + _In_ PRTL_GENERIC_TABLE Table, + _In_ PVOID Buffer, + _Out_ PVOID *NodeOrParent, + _Out_ TABLE_SEARCH_RESULT *SearchResult ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlEnumerateGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN BOOLEAN Restart + _In_ PRTL_GENERIC_TABLE Table, + _In_ BOOLEAN Restart ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlEnumerateGenericTableWithoutSplaying( - IN PRTL_GENERIC_TABLE Table, - IN OUT PVOID *RestartKey + _In_ PRTL_GENERIC_TABLE Table, + _Inout_ PVOID *RestartKey ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlGetElementGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN ULONG I + _In_ PRTL_GENERIC_TABLE Table, + _In_ ULONG I ); NTSYSAPI ULONG NTAPI RtlNumberGenericTableElements( - IN PRTL_GENERIC_TABLE Table + _In_ PRTL_GENERIC_TABLE Table ); +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlIsGenericTableEmpty( - IN PRTL_GENERIC_TABLE Table + _In_ PRTL_GENERIC_TABLE Table ); #endif /* !RTL_USE_AVL_TABLES */ @@ -349,50 +364,54 @@ NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlSplay( - IN PRTL_SPLAY_LINKS Links + _Inout_ PRTL_SPLAY_LINKS Links ); NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlDelete( - IN PRTL_SPLAY_LINKS Links + _In_ PRTL_SPLAY_LINKS Links ); NTSYSAPI VOID NTAPI RtlDeleteNoSplay( - IN PRTL_SPLAY_LINKS Links, - OUT PRTL_SPLAY_LINKS *Root + _In_ PRTL_SPLAY_LINKS Links, + _Inout_ PRTL_SPLAY_LINKS *Root ); +_Must_inspect_result_ NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlSubtreeSuccessor( - IN PRTL_SPLAY_LINKS Links + _In_ PRTL_SPLAY_LINKS Links ); +_Must_inspect_result_ NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlSubtreePredecessor( - IN PRTL_SPLAY_LINKS Links + _In_ PRTL_SPLAY_LINKS Links ); +_Must_inspect_result_ NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlRealSuccessor( - IN PRTL_SPLAY_LINKS Links + _In_ PRTL_SPLAY_LINKS Links ); +_Must_inspect_result_ NTSYSAPI PRTL_SPLAY_LINKS NTAPI RtlRealPredecessor( - IN PRTL_SPLAY_LINKS Links + _In_ PRTL_SPLAY_LINKS Links ); #define RtlIsLeftChild(Links) \ @@ -413,6 +432,8 @@ RtlRealPredecessor( #define RtlParent(Links) \ ((PRTL_SPLAY_LINKS)(Links))->Parent +// FIXME: use inline function + #define RtlInitializeSplayLinks(Links) \ { \ PRTL_SPLAY_LINKS _SplayLinks; \ @@ -449,119 +470,126 @@ NTSYSAPI VOID NTAPI RtlInitializeGenericTableAvl( - OUT PRTL_AVL_TABLE Table, - IN PRTL_AVL_COMPARE_ROUTINE CompareRoutine, - IN PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, - IN PRTL_AVL_FREE_ROUTINE FreeRoutine, - IN PVOID TableContext OPTIONAL + _Out_ PRTL_AVL_TABLE Table, + _In_ PRTL_AVL_COMPARE_ROUTINE CompareRoutine, + _In_opt_ PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, + _In_opt_ PRTL_AVL_FREE_ROUTINE FreeRoutine, + _In_opt_ PVOID TableContext ); NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - IN CLONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL + _In_ PRTL_AVL_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement ); NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableFullAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - IN CLONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL, - IN PVOID NodeOrParent, - IN TABLE_SEARCH_RESULT SearchResult + _In_ PRTL_AVL_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement, + _In_ PVOID NodeOrParent, + _In_ TABLE_SEARCH_RESULT SearchResult ); NTSYSAPI BOOLEAN NTAPI RtlDeleteElementGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID Buffer ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID Buffer ); NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableFullAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID Buffer, + _Out_ PVOID *NodeOrParent, + _Out_ TABLE_SEARCH_RESULT *SearchResult ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlEnumerateGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN BOOLEAN Restart + _In_ PRTL_AVL_TABLE Table, + _In_ BOOLEAN Restart ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlEnumerateGenericTableWithoutSplayingAvl( - IN PRTL_AVL_TABLE Table, - IN OUT PVOID *RestartKey + _In_ PRTL_AVL_TABLE Table, + _Inout_ PVOID *RestartKey ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlLookupFirstMatchingElementGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN PVOID Buffer, - OUT PVOID *RestartKey + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID Buffer, + _Out_ PVOID *RestartKey ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlEnumerateGenericTableLikeADirectory( - IN PRTL_AVL_TABLE Table, - IN PRTL_AVL_MATCH_FUNCTION MatchFunction OPTIONAL, - IN PVOID MatchData OPTIONAL, - IN ULONG NextFlag, - IN OUT PVOID *RestartKey, - IN OUT PULONG DeleteCount, - IN PVOID Buffer + _In_ PRTL_AVL_TABLE Table, + _In_opt_ PRTL_AVL_MATCH_FUNCTION MatchFunction, + _In_opt_ PVOID MatchData, + _In_ ULONG NextFlag, + _Inout_ PVOID *RestartKey, + _Inout_ PULONG DeleteCount, + _In_ PVOID Buffer ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlGetElementGenericTableAvl( - IN PRTL_AVL_TABLE Table, - IN ULONG I + _In_ PRTL_AVL_TABLE Table, + _In_ ULONG I ); NTSYSAPI ULONG NTAPI RtlNumberGenericTableElementsAvl( - IN PRTL_AVL_TABLE Table + _In_ PRTL_AVL_TABLE Table ); +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlIsGenericTableEmptyAvl( - IN PRTL_AVL_TABLE Table + _In_ PRTL_AVL_TABLE Table ); #ifdef RTL_USE_AVL_TABLES @@ -589,8 +617,8 @@ NTSYSAPI PVOID NTAPI RtlAddVectoredExceptionHandler( - IN ULONG FirstHandler, - IN PVECTORED_EXCEPTION_HANDLER VectoredHandler + _In_ ULONG FirstHandler, + _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler ); __analysis_noreturn @@ -598,88 +626,93 @@ NTSYSAPI VOID NTAPI RtlAssert( - IN PVOID FailedAssertion, - IN PVOID FileName, - IN ULONG LineNumber, - IN PCHAR Message + _In_ PVOID FailedAssertion, + _In_ PVOID FileName, + _In_ ULONG LineNumber, + _In_opt_z_ PCHAR Message ); NTSYSAPI VOID NTAPI RtlSetUnhandledExceptionFilter( - IN PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter + _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter ); NTSYSAPI VOID NTAPI RtlCaptureContext( - OUT PCONTEXT ContextRecord + _Out_ PCONTEXT ContextRecord ); NTSYSAPI PVOID NTAPI RtlEncodePointer( - IN PVOID Pointer + _In_ PVOID Pointer ); NTSYSAPI PVOID NTAPI RtlDecodePointer( - IN PVOID Pointer + _In_ PVOID Pointer ); NTSYSAPI PVOID NTAPI RtlEncodeSystemPointer( - IN PVOID Pointer + _In_ PVOID Pointer ); NTSYSAPI PVOID NTAPI RtlDecodeSystemPointer( - IN PVOID Pointer + _In_ PVOID Pointer ); NTSYSAPI BOOLEAN NTAPI RtlDispatchException( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context ); +_IRQL_requires_max_(APC_LEVEL) +_When_(Status < 0, _Out_range_(>, 0)) +_When_(Status >= 0, _Out_range_(==, 0)) NTSYSAPI ULONG NTAPI RtlNtStatusToDosError( - IN NTSTATUS Status + _In_ NTSTATUS Status ); +_When_(Status < 0, _Out_range_(>, 0)) +_When_(Status >= 0, _Out_range_(==, 0)) NTSYSAPI ULONG NTAPI RtlNtStatusToDosErrorNoTeb( - IN NTSTATUS Status + _In_ NTSTATUS Status ); NTSYSAPI VOID NTAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( - IN NTSTATUS Status + _In_ NTSTATUS Status ); NTSYSAPI VOID NTAPI RtlRaiseException( - IN PEXCEPTION_RECORD ExceptionRecord + _In_ PEXCEPTION_RECORD ExceptionRecord ); DECLSPEC_NORETURN @@ -687,26 +720,28 @@ NTSYSAPI VOID NTAPI RtlRaiseStatus( - IN NTSTATUS Status + _In_ NTSTATUS Status ); NTSYSAPI LONG NTAPI RtlUnhandledExceptionFilter( - IN struct _EXCEPTION_POINTERS* ExceptionInfo + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI VOID NTAPI RtlUnwind( - IN PVOID TargetFrame OPTIONAL, - IN PVOID TargetIp OPTIONAL, - IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, - IN PVOID ReturnValue + _In_opt_ PVOID TargetFrame, + _In_opt_ PVOID TargetIp, + _In_opt_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PVOID ReturnValue ); +#define RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT 8 + // // Tracing Functions // @@ -714,9 +749,9 @@ NTSYSAPI ULONG NTAPI RtlWalkFrameChain( - OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags + _Out_writes_(Count - (Flags >> RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT)) PVOID *Callers, + _In_ ULONG Count, + _In_ ULONG Flags ); NTSYSAPI @@ -730,227 +765,240 @@ RtlLogStackBackTrace( // // Heap Functions // +_Must_inspect_result_ +_Ret_maybenull_ +_Post_writable_byte_size_(Size) NTSYSAPI PVOID NTAPI RtlAllocateHeap( - IN HANDLE HeapHandle, - IN ULONG Flags, - IN SIZE_T Size + _In_ PVOID HeapHandle, + _In_opt_ ULONG Flags, + _In_ SIZE_T Size ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlCreateHeap( - IN ULONG Flags, - IN PVOID BaseAddress OPTIONAL, - IN SIZE_T SizeToReserve OPTIONAL, - IN SIZE_T SizeToCommit OPTIONAL, - IN PVOID Lock OPTIONAL, - IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL + _In_ ULONG Flags, + _In_opt_ PVOID BaseAddress, + _In_opt_ SIZE_T SizeToReserve, + _In_opt_ SIZE_T SizeToCommit, + _In_opt_ PVOID Lock, + _In_opt_ PRTL_HEAP_PARAMETERS Parameters ); NTSYSAPI ULONG NTAPI RtlCreateTagHeap( - IN HANDLE HeapHandle, - IN ULONG Flags, - IN PWSTR TagName, - IN PWSTR TagSubName + _In_ HANDLE HeapHandle, + _In_ ULONG Flags, + _In_ PWSTR TagName, + _In_ PWSTR TagSubName ); ULONG NTAPI RtlCompactHeap( - HANDLE Heap, - ULONG Flags + _In_ HANDLE Heap, + _In_ ULONG Flags ); +_Must_inspect_result_ NTSYSAPI PVOID NTAPI RtlDebugCreateHeap( - IN ULONG Flags, - IN PVOID BaseAddress OPTIONAL, - IN SIZE_T SizeToReserve OPTIONAL, - IN SIZE_T SizeToCommit OPTIONAL, - IN PVOID Lock OPTIONAL, - IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL + _In_ ULONG Flags, + _In_opt_ PVOID BaseAddress, + _In_opt_ SIZE_T SizeToReserve, + _In_opt_ SIZE_T SizeToCommit, + _In_opt_ PVOID Lock, + _In_opt_ PRTL_HEAP_PARAMETERS Parameters ); NTSYSAPI HANDLE NTAPI RtlDestroyHeap( - IN HANDLE Heap + _In_ _Post_invalid_ HANDLE Heap ); NTSYSAPI ULONG NTAPI RtlExtendHeap( - IN HANDLE Heap, - IN ULONG Flags, - IN PVOID P, - IN SIZE_T Size + _In_ HANDLE Heap, + _In_ ULONG Flags, + _In_ PVOID P, + _In_ SIZE_T Size ); +_Success_(return != 0) NTSYSAPI BOOLEAN NTAPI RtlFreeHeap( - IN HANDLE HeapHandle, - IN ULONG Flags, - IN PVOID P + _In_ HANDLE HeapHandle, + _In_opt_ ULONG Flags, + _In_ _Post_invalid_ PVOID P ); ULONG NTAPI RtlGetProcessHeaps( - ULONG HeapCount, - HANDLE *HeapArray + _In_ ULONG HeapCount, + _Out_cap_(HeapCount) HANDLE *HeapArray ); +_Success_(return != 0) BOOLEAN NTAPI RtlGetUserInfoHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - OUT PVOID *UserValue, - OUT PULONG UserFlags + _In_ PVOID HeapHandle, + _In_ ULONG Flags, + _In_ PVOID BaseAddress, + _Out_opt_ PVOID *UserValue, + _Out_opt_ PULONG UserFlags ); NTSYSAPI PVOID NTAPI RtlProtectHeap( - IN PVOID HeapHandle, - IN BOOLEAN Protect + _In_ PVOID HeapHandle, + _In_ BOOLEAN Protect ); NTSYSAPI NTSTATUS NTAPI RtlQueryHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - OUT PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL, - OUT PSIZE_T ReturnLength OPTIONAL + _In_ PVOID HeapHandle, + _In_ HEAP_INFORMATION_CLASS HeapInformationClass, + _Out_opt_ PVOID HeapInformation, + _In_opt_ SIZE_T HeapInformationLength, + _Out_opt_ PSIZE_T ReturnLength ); +_Ret_opt_z_ NTSYSAPI PWSTR NTAPI RtlQueryTagHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN USHORT TagIndex, - IN BOOLEAN ResetCounters, - OUT PRTL_HEAP_TAG_INFO HeapTagInfo + _In_ PVOID HeapHandle, + _In_ ULONG Flags, + _In_ USHORT TagIndex, + _In_ BOOLEAN ResetCounters, + _Out_ PRTL_HEAP_TAG_INFO HeapTagInfo ); +_Must_inspect_result_ +_Ret_maybenull_ +_Post_writable_byte_size_(Size) NTSYSAPI PVOID NTAPI RtlReAllocateHeap( - HANDLE Heap, - ULONG Flags, - PVOID Ptr, - SIZE_T Size + _In_ HANDLE Heap, + _In_opt_ ULONG Flags, + _In_ _Post_invalid_ PVOID Ptr, + _In_ SIZE_T Size ); +_Success_(return != 0) NTSYSAPI NTSTATUS NTAPI RtlSetHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - IN PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL + _In_ PVOID HeapHandle, + _In_ HEAP_INFORMATION_CLASS HeapInformationClass, + _In_opt_ PVOID HeapInformation, + _In_opt_ SIZE_T HeapInformationLength ); NTSYSAPI BOOLEAN NTAPI RtlLockHeap( - IN HANDLE Heap + _In_ HANDLE Heap ); +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlMultipleAllocateHeap ( - IN PVOID HeapHandle, - IN ULONG Flags, - IN SIZE_T Size, - IN ULONG Count, - OUT PVOID * Array + _In_ HANDLE HeapHandle, + _In_ ULONG Flags, + _In_ SIZE_T Size, + _In_ ULONG Count, + _Out_cap_(Count) _Deref_post_bytecap_(Size) PVOID * Array ); NTSYSAPI NTSTATUS NTAPI RtlMultipleFreeHeap ( - IN PVOID HeapHandle, - IN ULONG Flags, - IN ULONG Count, - OUT PVOID * Array + _In_ HANDLE HeapHandle, + _In_ ULONG Flags, + _In_ ULONG Count, + _In_count_(Count) /* _Deref_ _Post_invalid_ */ PVOID * Array ); NTSYSAPI NTSTATUS NTAPI RtlUsageHeap( - IN HANDLE Heap, - IN ULONG Flags, - OUT PRTL_HEAP_USAGE Usage + _In_ HANDLE Heap, + _In_ ULONG Flags, + _Out_ PRTL_HEAP_USAGE Usage ); NTSYSAPI BOOLEAN NTAPI RtlUnlockHeap( - IN HANDLE Heap + _In_ HANDLE Heap ); BOOLEAN NTAPI RtlSetUserValueHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - IN PVOID UserValue + _In_ PVOID HeapHandle, + _In_ ULONG Flags, + _In_ PVOID BaseAddress, + _In_ PVOID UserValue ); BOOLEAN NTAPI RtlSetUserFlagsHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - IN ULONG UserFlagsReset, - IN ULONG UserFlagsSet + _In_ PVOID HeapHandle, + _In_ ULONG Flags, + _In_ PVOID BaseAddress, + _In_ ULONG UserFlagsReset, + _In_ ULONG UserFlagsSet ); NTSYSAPI BOOLEAN NTAPI RtlValidateHeap( - HANDLE Heap, - ULONG Flags, - PVOID P + _In_ HANDLE Heap, + _In_ ULONG Flags, + _In_ PVOID P ); NTSYSAPI NTSTATUS NTAPI RtlWalkHeap( - IN HANDLE HeapHandle, - IN PVOID HeapEntry + _In_ HANDLE HeapHandle, + _In_ PVOID HeapEntry ); #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap) @@ -961,189 +1009,193 @@ NTSYSAPI SIZE_T NTAPI RtlSizeHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID MemoryPointer + _In_ PVOID HeapHandle, + _In_ ULONG Flags, + _In_ PVOID MemoryPointer ); // // Security Functions // +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlAbsoluteToSelfRelativeSD( - IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, - IN PULONG BufferLength + _In_ PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, + _Out_writes_bytes_to_opt_(*BufferLength, *BufferLength) PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, + _Inout_ PULONG BufferLength ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlAddAccessAllowedAce( - PACL Acl, - ULONG Revision, - ACCESS_MASK AccessMask, - PSID Sid + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlAddAccessAllowedAceEx( - IN OUT PACL pAcl, - IN ULONG dwAceRevision, - IN ULONG AceFlags, - IN ACCESS_MASK AccessMask, - IN PSID pSid + _Inout_ PACL pAcl, + _In_ ULONG dwAceRevision, + _In_ ULONG AceFlags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID pSid ); NTSYSAPI NTSTATUS NTAPI RtlAddAccessAllowedObjectAce( - IN OUT PACL pAcl, - IN ULONG dwAceRevision, - IN ULONG AceFlags, - IN ACCESS_MASK AccessMask, - IN GUID *ObjectTypeGuid OPTIONAL, - IN GUID *InheritedObjectTypeGuid OPTIONAL, - IN PSID pSid + _Inout_ PACL pAcl, + _In_ ULONG dwAceRevision, + _In_ ULONG AceFlags, + _In_ ACCESS_MASK AccessMask, + _In_opt_ GUID *ObjectTypeGuid, + _In_opt_ GUID *InheritedObjectTypeGuid, + _In_ PSID pSid ); NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAce( - PACL Acl, - ULONG Revision, - ACCESS_MASK AccessMask, - PSID Sid + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid ); NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAceEx( - IN OUT PACL Acl, - IN ULONG Revision, - IN ULONG Flags, - IN ACCESS_MASK AccessMask, - IN PSID Sid + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid ); NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedObjectAce( - IN OUT PACL pAcl, - IN ULONG dwAceRevision, - IN ULONG AceFlags, - IN ACCESS_MASK AccessMask, - IN GUID *ObjectTypeGuid OPTIONAL, - IN GUID *InheritedObjectTypeGuid OPTIONAL, - IN PSID pSid + _Inout_ PACL pAcl, + _In_ ULONG dwAceRevision, + _In_ ULONG AceFlags, + _In_ ACCESS_MASK AccessMask, + _In_opt_ GUID *ObjectTypeGuid, + _In_opt_ GUID *InheritedObjectTypeGuid, + _In_ PSID pSid ); NTSYSAPI NTSTATUS NTAPI RtlAddAce( - PACL Acl, - ULONG AceRevision, - ULONG StartingAceIndex, - PVOID AceList, - ULONG AceListLength + _Inout_ PACL Acl, + _In_ ULONG AceRevision, + _In_ ULONG StartingAceIndex, + _In_reads_bytes_(AceListLength) PVOID AceList, + _In_ ULONG AceListLength ); NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAce( - PACL Acl, - ULONG Revision, - ACCESS_MASK AccessMask, - PSID Sid, - BOOLEAN Success, - BOOLEAN Failure + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid, + _In_ BOOLEAN Success, + _In_ BOOLEAN Failure ); NTSYSAPI NTSTATUS NTAPI RtlAcquirePrivilege( - IN PULONG Privilege, - IN ULONG NumPriv, - IN ULONG Flags, - OUT PVOID *ReturnedState + _In_ PULONG Privilege, + _In_ ULONG NumPriv, + _In_ ULONG Flags, + _Out_ PVOID *ReturnedState ); NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAceEx( - IN OUT PACL Acl, - IN ULONG Revision, - IN ULONG Flags, - IN ACCESS_MASK AccessMask, - IN PSID Sid, - IN BOOLEAN Success, - IN BOOLEAN Failure + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid, + _In_ BOOLEAN Success, + _In_ BOOLEAN Failure ); NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessObjectAce( - IN OUT PACL Acl, - IN ULONG Revision, - IN ULONG Flags, - IN ACCESS_MASK AccessMask, - IN GUID *ObjectTypeGuid OPTIONAL, - IN GUID *InheritedObjectTypeGuid OPTIONAL, - IN PSID Sid, - IN BOOLEAN Success, - IN BOOLEAN Failure + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_opt_ GUID *ObjectTypeGuid, + _In_opt_ GUID *InheritedObjectTypeGuid, + _In_ PSID Sid, + _In_ BOOLEAN Success, + _In_ BOOLEAN Failure ); NTSYSAPI NTSTATUS NTAPI RtlAddMandatoryAce( - IN OUT PACL Acl, - IN ULONG Revision, - IN ULONG Flags, - IN ULONG MandatoryFlags, - IN UCHAR AceType, - IN PSID LabelSid); + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ULONG MandatoryFlags, + _In_ UCHAR AceType, + _In_ PSID LabelSid); NTSYSAPI NTSTATUS NTAPI RtlAdjustPrivilege( - IN ULONG Privilege, - IN BOOLEAN NewValue, - IN BOOLEAN ForThread, - OUT PBOOLEAN OldValue + _In_ ULONG Privilege, + _In_ BOOLEAN NewValue, + _In_ BOOLEAN ForThread, + _Out_ PBOOLEAN OldValue ); +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlAllocateAndInitializeSid( - IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, - IN UCHAR SubAuthorityCount, - IN ULONG SubAuthority0, - IN ULONG SubAuthority1, - IN ULONG SubAuthority2, - IN ULONG SubAuthority3, - IN ULONG SubAuthority4, - IN ULONG SubAuthority5, - IN ULONG SubAuthority6, - IN ULONG SubAuthority7, - OUT PSID *Sid + _In_ PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, + _In_ UCHAR SubAuthorityCount, + _In_ ULONG SubAuthority0, + _In_ ULONG SubAuthority1, + _In_ ULONG SubAuthority2, + _In_ ULONG SubAuthority3, + _In_ ULONG SubAuthority4, + _In_ ULONG SubAuthority5, + _In_ ULONG SubAuthority6, + _In_ ULONG SubAuthority7, + _Outptr_ PSID *Sid ); NTSYSAPI @@ -1162,13 +1214,14 @@ RtlAreAnyAccessesGranted( ACCESS_MASK DesiredAccess ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI VOID NTAPI -RtlCopyLuid( - IN PLUID LuidDest, - IN PLUID LuidSrc -); +RtlCopyLuid ( + _Out_ PLUID DestinationLuid, + _In_ PLUID SourceLuid + ); NTSYSAPI VOID @@ -1192,22 +1245,24 @@ RtlCopySidAndAttributesArray( PULONG RemainingSidAreaSize ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlConvertSidToUnicodeString( - OUT PUNICODE_STRING DestinationString, - IN PSID Sid, - IN BOOLEAN AllocateDestinationString + _Inout_ PUNICODE_STRING UnicodeString, + _In_ PSID Sid, + _In_ BOOLEAN AllocateDestinationString ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlCopySid( - IN ULONG Length, - IN PSID Destination, - IN PSID Source + _In_ ULONG DestinationSidLength, + _Out_writes_bytes_(DestinationSidLength) PSID DestinationSid, + _In_ PSID SourceSid ); NTSYSAPI @@ -1223,24 +1278,24 @@ NTSYSAPI NTSTATUS NTAPI RtlCreateSecurityDescriptor( - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Revision + _Out_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ULONG Revision ); NTSYSAPI NTSTATUS NTAPI RtlCreateSecurityDescriptorRelative( - OUT PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, - IN ULONG Revision + _Out_ PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + _In_ ULONG Revision ); NTSYSAPI NTSTATUS NTAPI RtlCopySecurityDescriptor( - IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR *pDestinationSecurityDescriptor + _In_ PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + _Out_ PSECURITY_DESCRIPTOR *pDestinationSecurityDescriptor ); NTSYSAPI @@ -1263,8 +1318,8 @@ NTSYSAPI BOOLEAN NTAPI RtlEqualSid ( - IN PSID Sid1, - IN PSID Sid2 + _In_ PSID Sid1, + _In_ PSID Sid2 ); NTSYSAPI @@ -1278,8 +1333,8 @@ RtlFirstFreeAce( NTSYSAPI PVOID NTAPI -RtlFreeSid ( - IN PSID Sid +RtlFreeSid( + _In_ _Post_invalid_ PSID Sid ); NTSYSAPI @@ -1295,55 +1350,55 @@ NTSYSAPI NTSTATUS NTAPI RtlGetControlSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSECURITY_DESCRIPTOR_CONTROL Control, - OUT PULONG Revision + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PSECURITY_DESCRIPTOR_CONTROL Control, + _Out_ PULONG Revision ); NTSYSAPI NTSTATUS NTAPI RtlGetDaclSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PBOOLEAN DaclPresent, - OUT PACL *Dacl, - OUT PBOOLEAN DaclDefaulted + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PBOOLEAN DaclPresent, + _Out_ PACL *Dacl, + _Out_ PBOOLEAN DaclDefaulted ); NTSYSAPI NTSTATUS NTAPI RtlGetSaclSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PBOOLEAN SaclPresent, - OUT PACL* Sacl, - OUT PBOOLEAN SaclDefaulted + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PBOOLEAN SaclPresent, + _Out_ PACL* Sacl, + _Out_ PBOOLEAN SaclDefaulted ); NTSYSAPI NTSTATUS NTAPI RtlGetGroupSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSID *Group, - OUT PBOOLEAN GroupDefaulted + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PSID *Group, + _Out_ PBOOLEAN GroupDefaulted ); NTSYSAPI NTSTATUS NTAPI RtlGetOwnerSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSID *Owner, - OUT PBOOLEAN OwnerDefaulted + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PSID *Owner, + _Out_ PBOOLEAN OwnerDefaulted ); NTSYSAPI BOOLEAN NTAPI RtlGetSecurityDescriptorRMControl( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PUCHAR RMControl + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PUCHAR RMControl ); NTSYSAPI @@ -1356,13 +1411,14 @@ NTSTATUS NTAPI RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlInitializeSid( - IN OUT PSID Sid, - IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, - IN UCHAR SubAuthorityCount + _Out_ PSID Sid, + _In_ PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, + _In_ UCHAR SubAuthorityCount ); NTSYSAPI @@ -1379,9 +1435,9 @@ NTSYSAPI NTSTATUS NTAPI RtlMakeSelfRelativeSD( - IN PSECURITY_DESCRIPTOR AbsoluteSD, - OUT PSECURITY_DESCRIPTOR SelfRelativeSD, - IN OUT PULONG BufferLength); + _In_ PSECURITY_DESCRIPTOR AbsoluteSD, + _Out_ PSECURITY_DESCRIPTOR SelfRelativeSD, + _Inout_ PULONG BufferLength); NTSYSAPI VOID @@ -1409,69 +1465,70 @@ NTSYSAPI VOID NTAPI RtlReleasePrivilege( - IN PVOID ReturnedState + _In_ PVOID ReturnedState ); NTSYSAPI NTSTATUS NTAPI RtlSelfRelativeToAbsoluteSD( - IN PSECURITY_DESCRIPTOR SelfRelativeSD, - OUT PSECURITY_DESCRIPTOR AbsoluteSD, - IN PULONG AbsoluteSDSize, - IN PACL Dacl, - IN PULONG DaclSize, - IN PACL Sacl, - IN PULONG SaclSize, - IN PSID Owner, - IN PULONG OwnerSize, - IN PSID PrimaryGroup, - IN PULONG PrimaryGroupSize + _In_ PSECURITY_DESCRIPTOR SelfRelativeSD, + _Out_ PSECURITY_DESCRIPTOR AbsoluteSD, + _In_ PULONG AbsoluteSDSize, + _In_ PACL Dacl, + _In_ PULONG DaclSize, + _In_ PACL Sacl, + _In_ PULONG SaclSize, + _In_ PSID Owner, + _In_ PULONG OwnerSize, + _In_ PSID PrimaryGroup, + _In_ PULONG PrimaryGroupSize ); NTSYSAPI NTSTATUS NTAPI RtlSelfRelativeToAbsoluteSD2( - IN OUT PSECURITY_DESCRIPTOR SelfRelativeSD, - OUT PULONG BufferSize + _Inout_ PSECURITY_DESCRIPTOR SelfRelativeSD, + _Out_ PULONG BufferSize ); NTSYSAPI NTSTATUS NTAPI RtlSetAttributesSecurityDescriptor( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN SECURITY_DESCRIPTOR_CONTROL Control, - OUT PULONG Revision + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SECURITY_DESCRIPTOR_CONTROL Control, + _Out_ PULONG Revision ); NTSYSAPI NTSTATUS NTAPI RtlSetControlSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, - IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, + _In_ SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI -RtlSetDaclSecurityDescriptor ( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN DaclPresent, - IN PACL Dacl, - IN BOOLEAN DaclDefaulted +RtlSetDaclSecurityDescriptor( + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN DaclPresent, + _In_opt_ PACL Dacl, + _In_opt_ BOOLEAN DaclDefaulted ); NTSYSAPI NTSTATUS NTAPI RtlSetGroupSecurityDescriptor( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID Group, - IN BOOLEAN GroupDefaulted + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PSID Group, + _In_ BOOLEAN GroupDefaulted ); #ifdef NTOS_MODE_USER @@ -1488,55 +1545,58 @@ RtlSetInformationAcl( #endif +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlSetOwnerSecurityDescriptor( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID Owner, - IN BOOLEAN OwnerDefaulted + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSID Owner, + _In_opt_ BOOLEAN OwnerDefaulted ); NTSYSAPI NTSTATUS NTAPI RtlSetSaclSecurityDescriptor( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN SaclPresent, - IN PACL Sacl, - IN BOOLEAN SaclDefaulted + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN SaclPresent, + _In_ PACL Sacl, + _In_ BOOLEAN SaclDefaulted ); NTSYSAPI VOID NTAPI RtlSetSecurityDescriptorRMControl( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PUCHAR RMControl + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PUCHAR RMControl ); NTSYSAPI PUCHAR NTAPI RtlSubAuthorityCountSid( - IN PSID Sid + _In_ PSID Sid ); NTSYSAPI PULONG NTAPI RtlSubAuthoritySid( - IN PSID Sid, - IN ULONG SubAuthority + _In_ PSID Sid, + _In_ ULONG SubAuthority ); +_IRQL_requires_max_(APC_LEVEL) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlValidRelativeSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, - IN ULONG SecurityDescriptorLength, - IN SECURITY_INFORMATION RequiredInformation + _In_reads_bytes_(SecurityDescriptorLength) PSECURITY_DESCRIPTOR SecurityDescriptorInput, + _In_ ULONG SecurityDescriptorLength, + _In_ SECURITY_INFORMATION RequiredInformation ); NTSYSAPI @@ -1558,41 +1618,41 @@ NTSYSAPI NTSTATUS NTAPI RtlDeleteSecurityObject( - IN PSECURITY_DESCRIPTOR *ObjectDescriptor + _In_ PSECURITY_DESCRIPTOR *ObjectDescriptor ); NTSYSAPI NTSTATUS NTAPI RtlNewSecurityObject( - IN PSECURITY_DESCRIPTOR ParentDescriptor, - IN PSECURITY_DESCRIPTOR CreatorDescriptor, - OUT PSECURITY_DESCRIPTOR *NewDescriptor, - IN BOOLEAN IsDirectoryObject, - IN HANDLE Token, - IN PGENERIC_MAPPING GenericMapping + _In_ PSECURITY_DESCRIPTOR ParentDescriptor, + _In_ PSECURITY_DESCRIPTOR CreatorDescriptor, + _Out_ PSECURITY_DESCRIPTOR *NewDescriptor, + _In_ BOOLEAN IsDirectoryObject, + _In_ HANDLE Token, + _In_ PGENERIC_MAPPING GenericMapping ); NTSYSAPI NTSTATUS NTAPI RtlQuerySecurityObject( - IN PSECURITY_DESCRIPTOR ObjectDescriptor, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR ResultantDescriptor, - IN ULONG DescriptorLength, - OUT PULONG ReturnLength + _In_ PSECURITY_DESCRIPTOR ObjectDescriptor, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PSECURITY_DESCRIPTOR ResultantDescriptor, + _In_ ULONG DescriptorLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI RtlSetSecurityObject( - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR ModificationDescriptor, - OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, - IN PGENERIC_MAPPING GenericMapping, - IN HANDLE Token + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR ModificationDescriptor, + _Out_ PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ HANDLE Token ); // @@ -1602,10 +1662,10 @@ NTSYSAPI NTSTATUS NTAPI RtlLargeIntegerToChar( - IN PLARGE_INTEGER Value, - IN ULONG Base, - IN ULONG Length, - IN OUT PCHAR String + _In_ PLARGE_INTEGER Value, + _In_ ULONG Base, + _In_ ULONG Length, + _Inout_ PCHAR String ); NTSYSAPI @@ -1627,29 +1687,31 @@ NTSYSAPI NTSTATUS NTAPI RtlIntegerToChar( - IN ULONG Value, - IN ULONG Base, - IN ULONG Length, - IN OUT PCHAR String + _In_ ULONG Value, + _In_ ULONG Base, + _In_ ULONG Length, + _Inout_ PCHAR String ); NTSYSAPI NTSTATUS NTAPI RtlIntegerToUnicode( - IN ULONG Value, - IN ULONG Base OPTIONAL, - IN ULONG Length OPTIONAL, - IN OUT LPWSTR String + _In_ ULONG Value, + _In_opt_ ULONG Base, + _In_opt_ ULONG Length, + _Inout_ LPWSTR String ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_At_(String->MaximumLength, _Const_) NTSYSAPI NTSTATUS NTAPI RtlIntegerToUnicodeString( - IN ULONG Value, - IN ULONG Base, - IN OUT PUNICODE_STRING String + _In_ ULONG Value, + _In_opt_ ULONG Base, + _Inout_ PUNICODE_STRING String ); NTSYSAPI @@ -1747,13 +1809,17 @@ RtlUpcaseUnicodeStringToOemString( BOOLEAN AllocateDestinationString ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING DestinationString, - IN PCUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + _When_(AllocateDestinationString, _Out_ _At_(DestinationString->Buffer, __drv_allocatesMem(Mem))) + _When_(!AllocateDestinationString, _Inout_) + POEM_STRING DestinationString, + _In_ PCUNICODE_STRING SourceString, + _In_ BOOLEAN AllocateDestinationString ); NTSYSAPI @@ -1857,15 +1923,16 @@ RtlOemStringToUnicodeString( BOOLEAN AllocateDestinationString ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlOemToUnicodeN( - PWSTR UnicodeString, - ULONG MaxBytesInUnicodeString, - PULONG BytesInUnicodeString, - IN PCCH OemString, - ULONG BytesInOemString + _Out_writes_bytes_to_(MaxBytesInUnicodeString, *BytesInUnicodeString) PWCH UnicodeString, + _In_ ULONG MaxBytesInUnicodeString, + _Out_opt_ PULONG BytesInUnicodeString, + _In_reads_bytes_(BytesInOemString) PCCH OemString, + _In_ ULONG BytesInOemString ); #ifdef NTOS_MODE_USER @@ -1915,8 +1982,8 @@ NTSYSAPI BOOLEAN NTAPI RtlCreateUnicodeStringFromAsciiz( - OUT PUNICODE_STRING Destination, - IN PCSZ Source + _Out_ PUNICODE_STRING Destination, + _In_ PCSZ Source ); // @@ -1969,18 +2036,18 @@ NTSYSAPI NTSTATUS NTAPI RtlDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString + _Inout_ PUNICODE_STRING UniDest, + _In_ PCUNICODE_STRING UniSource, + _In_ BOOLEAN AllocateDestinationString ); NTSYSAPI NTSTATUS NTAPI RtlDuplicateUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING SourceString, - OUT PUNICODE_STRING DestinationString + _In_ ULONG Flags, + _In_ PCUNICODE_STRING SourceString, + _Out_ PUNICODE_STRING DestinationString ); // @@ -1990,18 +2057,18 @@ NTSYSAPI VOID NTAPI RtlFillMemoryUlong( - IN PVOID Destination, - IN SIZE_T Length, - IN ULONG Fill + _In_ PVOID Destination, + _In_ SIZE_T Length, + _In_ ULONG Fill ); NTSYSAPI VOID NTAPI RtlFillMemoryUlonglong( - OUT PVOID Destination, - IN SIZE_T Length, - IN ULONGLONG Pattern + _Out_ PVOID Destination, + _In_ SIZE_T Length, + _In_ ULONGLONG Pattern ); @@ -2009,9 +2076,9 @@ NTSYSAPI SIZE_T NTAPI RtlCompareMemoryUlong( - IN PVOID Source, - IN SIZE_T Length, - IN ULONG Pattern + _In_ PVOID Source, + _In_ SIZE_T Length, + _In_ ULONG Pattern ); #define RtlEqualMemory(Destination, Source, Length) \ @@ -2036,10 +2103,10 @@ NTSYSAPI NTSTATUS NTAPI RtlFindCharInUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING SearchString, - IN PCUNICODE_STRING MatchString, - OUT PUSHORT Position + _In_ ULONG Flags, + _In_ PCUNICODE_STRING SearchString, + _In_ PCUNICODE_STRING MatchString, + _Out_ PUSHORT Position ); NTSYSAPI @@ -2051,26 +2118,31 @@ NTSYSAPI NTSTATUS NTAPI RtlHashUnicodeString( - IN CONST UNICODE_STRING *String, - IN BOOLEAN CaseInSensitive, - IN ULONG HashAlgorithm, - OUT PULONG HashValue + _In_ CONST UNICODE_STRING *String, + _In_ BOOLEAN CaseInSensitive, + _In_ ULONG HashAlgorithm, + _Out_ PULONG HashValue ); +_IRQL_requires_max_(DISPATCH_LEVEL) +_At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) NTSYSAPI VOID NTAPI RtlInitUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PCWSTR SourceString + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString ); +_IRQL_requires_max_(DISPATCH_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlInitUnicodeStringEx( - OUT PUNICODE_STRING DestinationString, - IN PCWSTR SourceString OPTIONAL + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString ); NTSYSAPI @@ -2100,85 +2172,99 @@ RtlPrefixUnicodeString( BOOLEAN CaseInsensitive ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(AllocateDestinationString, _Must_inspect_result_) NTSYSAPI NTSTATUS NTAPI RtlUpcaseUnicodeString( - PUNICODE_STRING DestinationString, - PCUNICODE_STRING SourceString, - BOOLEAN AllocateDestinationString -); + _When_(AllocateDestinationString, _Out_ _At_(DestinationString->Buffer, __drv_allocatesMem(Mem))) + _When_(!AllocateDestinationString, _Inout_) + PUNICODE_STRING DestinationString, + _In_ PCUNICODE_STRING SourceString, + _In_ BOOLEAN AllocateDestinationString + ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlUnicodeStringToInteger( - PCUNICODE_STRING String, - ULONG Base, - PULONG Value + _In_ PCUNICODE_STRING String, + _In_opt_ ULONG Base, + _Out_ PULONG Value ); NTSYSAPI NTSTATUS NTAPI RtlValidateUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING String + _In_ ULONG Flags, + _In_ PCUNICODE_STRING String ); // // Ansi String Functions // +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI VOID NTAPI -RtlFreeAnsiString(IN PANSI_STRING AnsiString); +RtlFreeAnsiString( + _Inout_ _At_(AnsiString->Buffer, __drv_freesMem(Mem)) + PANSI_STRING AnsiString +); NTSYSAPI VOID NTAPI RtlInitAnsiString( - PANSI_STRING DestinationString, - PCSZ SourceString + _Out_ PANSI_STRING DestinationString, + _In_z_ PCSZ SourceString ); NTSYSAPI NTSTATUS NTAPI RtlInitAnsiStringEx( - PANSI_STRING DestinationString, - PCSZ SourceString + _Out_ PANSI_STRING DestinationString, + _In_z_ PCSZ SourceString ); // // OEM String Functions // +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI VOID NTAPI -RtlFreeOemString(IN POEM_STRING OemString); +RtlFreeOemString( + _Inout_ _At_(OemString->Buffer, __drv_freesMem(Mem)) + POEM_STRING OemString +); // // MultiByte->Unicode String Functions // +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlMultiByteToUnicodeN( - PWCHAR UnicodeString, - ULONG UnicodeSize, - PULONG ResultSize, - PCSTR MbString, - ULONG MbSize + _Out_writes_bytes_to_(MaxBytesInUnicodeString, *BytesInUnicodeString) PWCH UnicodeString, + _In_ ULONG MaxBytesInUnicodeString, + _Out_opt_ PULONG BytesInUnicodeString, + _In_reads_bytes_(BytesInMultiByteString) const CHAR *MultiByteString, + _In_ ULONG BytesInMultiByteString ); NTSYSAPI NTSTATUS NTAPI RtlMultiByteToUnicodeSize( - PULONG UnicodeSize, - PCSTR MbString, - ULONG MbSize + _Out_ PULONG UnicodeSize, + _In_z_ PCSTR MbString, + _In_ ULONG MbSize ); // @@ -2188,25 +2274,25 @@ NTSYSAPI NTSTATUS NTAPI RtlAddAtomToAtomTable( - IN PRTL_ATOM_TABLE AtomTable, - IN PWSTR AtomName, - OUT PRTL_ATOM Atom + _In_ PRTL_ATOM_TABLE AtomTable, + _In_ PWSTR AtomName, + _Out_ PRTL_ATOM Atom ); NTSYSAPI NTSTATUS NTAPI RtlCreateAtomTable( - IN ULONG TableSize, - IN OUT PRTL_ATOM_TABLE *AtomTable + _In_ ULONG TableSize, + _Inout_ PRTL_ATOM_TABLE *AtomTable ); NTSYSAPI NTSTATUS NTAPI RtlDeleteAtomFromAtomTable( - IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom + _In_ PRTL_ATOM_TABLE AtomTable, + _In_ RTL_ATOM Atom ); NTSYSAPI @@ -2218,29 +2304,29 @@ NTSYSAPI NTSTATUS NTAPI RtlQueryAtomInAtomTable( - IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom, - IN OUT PULONG RefCount OPTIONAL, - IN OUT PULONG PinCount OPTIONAL, - IN OUT PWSTR AtomName OPTIONAL, - IN OUT PULONG NameLength OPTIONAL + _In_ PRTL_ATOM_TABLE AtomTable, + _In_ RTL_ATOM Atom, + _Inout_opt_ PULONG RefCount, + _Inout_opt_ PULONG PinCount, + _Inout_opt_ PWSTR AtomName, + _Inout_opt_ PULONG NameLength ); NTSYSAPI NTSTATUS NTAPI RtlPinAtomInAtomTable( - IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom + _In_ PRTL_ATOM_TABLE AtomTable, + _In_ RTL_ATOM Atom ); NTSYSAPI NTSTATUS NTAPI RtlLookupAtomInAtomTable( - IN PRTL_ATOM_TABLE AtomTable, - IN PWSTR AtomName, - OUT PRTL_ATOM Atom + _In_ PRTL_ATOM_TABLE AtomTable, + _In_ PWSTR AtomName, + _Out_ PRTL_ATOM Atom ); // @@ -2262,74 +2348,77 @@ NTSYSAPI NTSTATUS NTAPI RtlCreateProcessParameters ( - OUT PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, - IN PUNICODE_STRING ImagePathName OPTIONAL, - IN PUNICODE_STRING DllPath OPTIONAL, - IN PUNICODE_STRING CurrentDirectory OPTIONAL, - IN PUNICODE_STRING CommandLine OPTIONAL, - IN PWSTR Environment OPTIONAL, - IN PUNICODE_STRING WindowTitle OPTIONAL, - IN PUNICODE_STRING DesktopInfo OPTIONAL, - IN PUNICODE_STRING ShellInfo OPTIONAL, - IN PUNICODE_STRING RuntimeInfo OPTIONAL + _Out_ PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, + _In_opt_ PUNICODE_STRING ImagePathName, + _In_opt_ PUNICODE_STRING DllPath, + _In_opt_ PUNICODE_STRING CurrentDirectory, + _In_opt_ PUNICODE_STRING CommandLine, + _In_opt_ PWSTR Environment, + _In_opt_ PUNICODE_STRING WindowTitle, + _In_opt_ PUNICODE_STRING DesktopInfo, + _In_opt_ PUNICODE_STRING ShellInfo, + _In_opt_ PUNICODE_STRING RuntimeInfo ); NTSYSAPI NTSTATUS NTAPI RtlCreateUserProcess( - IN PUNICODE_STRING ImageFileName, - IN ULONG Attributes, - IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters, - IN PSECURITY_DESCRIPTOR ProcessSecutityDescriptor OPTIONAL, - IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL, - IN HANDLE ParentProcess OPTIONAL, - IN BOOLEAN CurrentDirectory, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL, - OUT PRTL_USER_PROCESS_INFORMATION ProcessInfo + _In_ PUNICODE_STRING ImageFileName, + _In_ ULONG Attributes, + _In_ PRTL_USER_PROCESS_PARAMETERS ProcessParameters, + _In_opt_ PSECURITY_DESCRIPTOR ProcessSecutityDescriptor, + _In_opt_ PSECURITY_DESCRIPTOR ThreadSecurityDescriptor, + _In_opt_ HANDLE ParentProcess, + _In_ BOOLEAN CurrentDirectory, + _In_opt_ HANDLE DebugPort, + _In_opt_ HANDLE ExceptionPort, + _Out_ PRTL_USER_PROCESS_INFORMATION ProcessInfo ); NTSYSAPI NTSTATUS NTAPI RtlCreateUserThread( - IN HANDLE ProcessHandle, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN CreateSuspended, - IN ULONG StackZeroBits, - IN SIZE_T StackReserve, - IN SIZE_T StackCommit, - IN PTHREAD_START_ROUTINE StartAddress, - IN PVOID Parameter, - IN OUT PHANDLE ThreadHandle, - IN OUT PCLIENT_ID ClientId + _In_ HANDLE ProcessHandle, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN CreateSuspended, + _In_ ULONG StackZeroBits, + _In_ SIZE_T StackReserve, + _In_ SIZE_T StackCommit, + _In_ PTHREAD_START_ROUTINE StartAddress, + _In_ PVOID Parameter, + _Inout_ PHANDLE ThreadHandle, + _Inout_ PCLIENT_ID ClientId ); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS NTAPI -RtlDeNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); +RtlDeNormalizeProcessParams( + _In_ PRTL_USER_PROCESS_PARAMETERS ProcessParameters); NTSYSAPI NTSTATUS NTAPI -RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); +RtlDestroyProcessParameters( + _In_ PRTL_USER_PROCESS_PARAMETERS ProcessParameters); NTSYSAPI VOID NTAPI -RtlExitUserThread(NTSTATUS Status); +RtlExitUserThread( + _In_ NTSTATUS Status); NTSYSAPI VOID NTAPI RtlInitializeContext( - IN HANDLE ProcessHandle, - OUT PCONTEXT ThreadContext, - IN PVOID ThreadStartParam OPTIONAL, - IN PTHREAD_START_ROUTINE ThreadStartAddress, - IN PINITIAL_TEB InitialTeb + _In_ HANDLE ProcessHandle, + _Out_ PCONTEXT ThreadContext, + _In_opt_ PVOID ThreadStartParam, + _In_ PTHREAD_START_ROUTINE ThreadStartAddress, + _In_ PINITIAL_TEB InitialTeb ); #ifdef _M_AMD64 @@ -2339,8 +2428,8 @@ NTSYSAPI NTSTATUS NTAPI RtlWow64GetThreadContext( - IN HANDLE ThreadHandle, - IN OUT PWOW64_CONTEXT ThreadContext + _In_ HANDLE ThreadHandle, + _Inout_ PWOW64_CONTEXT ThreadContext ); @@ -2348,8 +2437,8 @@ NTSYSAPI NTSTATUS NTAPI RtlWow64SetThreadContext( - IN HANDLE ThreadHandle, - IN PWOW64_CONTEXT ThreadContext + _In_ HANDLE ThreadHandle, + _In_ PWOW64_CONTEXT ThreadContext ); #endif @@ -2361,7 +2450,8 @@ RtlIsThreadWithinLoaderCallout(VOID); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS NTAPI -RtlNormalizeProcessParams(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); +RtlNormalizeProcessParams( + _In_ PRTL_USER_PROCESS_PARAMETERS ProcessParameters); NTSYSAPI VOID @@ -2372,31 +2462,31 @@ NTSYSAPI NTSTATUS NTAPI RtlRemoteCall( - IN HANDLE Process, - IN HANDLE Thread, - IN PVOID CallSite, - IN ULONG ArgumentCount, - IN PULONG Arguments, - IN BOOLEAN PassContext, - IN BOOLEAN AlreadySuspended + _In_ HANDLE Process, + _In_ HANDLE Thread, + _In_ PVOID CallSite, + _In_ ULONG ArgumentCount, + _In_ PULONG Arguments, + _In_ BOOLEAN PassContext, + _In_ BOOLEAN AlreadySuspended ); NTSYSAPI NTSTATUS NTAPI RtlSetProcessIsCritical( - IN BOOLEAN NewValue, - OUT PBOOLEAN OldValue OPTIONAL, - IN BOOLEAN NeedBreaks + _In_ BOOLEAN NewValue, + _Out_opt_ PBOOLEAN OldValue, + _In_ BOOLEAN NeedBreaks ); NTSYSAPI NTSTATUS NTAPI RtlSetThreadIsCritical( - IN BOOLEAN NewValue, - OUT PBOOLEAN OldValue OPTIONAL, - IN BOOLEAN NeedBreaks + _In_ BOOLEAN NewValue, + _Out_opt_ PBOOLEAN OldValue, + _In_ BOOLEAN NeedBreaks ); NTSYSAPI @@ -2415,53 +2505,53 @@ RtlGetCurrentProcessorNumber( NTSTATUS NTAPI RtlSetThreadPoolStartFunc( - IN PRTL_START_POOL_THREAD StartPoolThread, - IN PRTL_EXIT_POOL_THREAD ExitPoolThread + _In_ PRTL_START_POOL_THREAD StartPoolThread, + _In_ PRTL_EXIT_POOL_THREAD ExitPoolThread ); NTSYSAPI NTSTATUS NTAPI RtlDeregisterWaitEx( - IN HANDLE hWaitHandle, - IN HANDLE hCompletionEvent + _In_ HANDLE hWaitHandle, + _In_ HANDLE hCompletionEvent ); NTSYSAPI NTSTATUS NTAPI RtlDeregisterWait( - IN HANDLE hWaitHandle + _In_ HANDLE hWaitHandle ); NTSYSAPI NTSTATUS NTAPI RtlQueueWorkItem( - IN WORKERCALLBACKFUNC Function, - IN PVOID Context OPTIONAL, - IN ULONG Flags + _In_ WORKERCALLBACKFUNC Function, + _In_opt_ PVOID Context, + _In_ ULONG Flags ); NTSYSAPI NTSTATUS NTAPI RtlSetIoCompletionCallback( - IN HANDLE FileHandle, - IN PIO_APC_ROUTINE Callback, - IN ULONG Flags + _In_ HANDLE FileHandle, + _In_ PIO_APC_ROUTINE Callback, + _In_ ULONG Flags ); NTSYSAPI NTSTATUS NTAPI RtlRegisterWait( - IN PHANDLE phNewWaitObject, - IN HANDLE hObject, - IN WAITORTIMERCALLBACKFUNC Callback, - IN PVOID pvContext, - IN ULONG ulMilliseconds, - IN ULONG ulFlags + _In_ PHANDLE phNewWaitObject, + _In_ HANDLE hObject, + _In_ WAITORTIMERCALLBACKFUNC Callback, + _In_ PVOID pvContext, + _In_ ULONG ulMilliseconds, + _In_ ULONG ulFlags ); // @@ -2471,113 +2561,113 @@ NTSYSAPI NTSTATUS NTAPI RtlCreateEnvironment( - BOOLEAN Inherit, - PWSTR *Environment + _In_ BOOLEAN Inherit, + _Out_ PWSTR *Environment ); NTSYSAPI NTSTATUS NTAPI RtlComputePrivatizedDllName_U( - IN PUNICODE_STRING DllName, - OUT PUNICODE_STRING RealName, - OUT PUNICODE_STRING LocalName + _In_ PUNICODE_STRING DllName, + _Out_ PUNICODE_STRING RealName, + _Out_ PUNICODE_STRING LocalName ); NTSYSAPI VOID NTAPI RtlDestroyEnvironment( - IN PWSTR Environment + _In_ PWSTR Environment ); NTSYSAPI BOOLEAN NTAPI RtlDoesFileExists_U( - IN PCWSTR FileName + _In_ PCWSTR FileName ); NTSYSAPI ULONG NTAPI RtlDetermineDosPathNameType_U( - IN PCWSTR Path + _In_ PCWSTR Path ); NTSYSAPI ULONG NTAPI RtlDosSearchPath_U( - IN PCWSTR Path, - IN PCWSTR FileName, - IN PCWSTR Extension, - IN ULONG BufferSize, - OUT PWSTR Buffer, - OUT PWSTR *PartName + _In_ PCWSTR Path, + _In_ PCWSTR FileName, + _In_ PCWSTR Extension, + _In_ ULONG BufferSize, + _Out_ PWSTR Buffer, + _Out_ PWSTR *PartName ); NTSYSAPI NTSTATUS NTAPI RtlDosSearchPath_Ustr( - IN ULONG Flags, - IN PUNICODE_STRING PathString, - IN PUNICODE_STRING FileNameString, - IN PUNICODE_STRING ExtensionString, - IN PUNICODE_STRING CallerBuffer, - IN OUT PUNICODE_STRING DynamicString OPTIONAL, - OUT PUNICODE_STRING* FullNameOut OPTIONAL, - OUT PSIZE_T FilePartSize OPTIONAL, - OUT PSIZE_T LengthNeeded OPTIONAL + _In_ ULONG Flags, + _In_ PUNICODE_STRING PathString, + _In_ PUNICODE_STRING FileNameString, + _In_ PUNICODE_STRING ExtensionString, + _In_ PUNICODE_STRING CallerBuffer, + _Inout_opt_ PUNICODE_STRING DynamicString, + _Out_opt_ PUNICODE_STRING* FullNameOut, + _Out_opt_ PSIZE_T FilePartSize, + _Out_opt_ PSIZE_T LengthNeeded ); NTSYSAPI BOOLEAN NTAPI RtlDosPathNameToNtPathName_U( - IN PCWSTR DosPathName, - OUT PUNICODE_STRING NtPathName, - OUT PCWSTR *NtFileNamePart, - OUT PRTL_RELATIVE_NAME_U DirectoryInfo + _In_ PCWSTR DosPathName, + _Out_ PUNICODE_STRING NtPathName, + _Out_ PCWSTR *NtFileNamePart, + _Out_ PRTL_RELATIVE_NAME_U DirectoryInfo ); NTSYSAPI BOOLEAN NTAPI RtlDosPathNameToRelativeNtPathName_U( - IN PCWSTR DosName, - OUT PUNICODE_STRING NtName, - OUT PCWSTR *PartName, - OUT PRTL_RELATIVE_NAME_U RelativeName + _In_ PCWSTR DosName, + _Out_ PUNICODE_STRING NtName, + _Out_ PCWSTR *PartName, + _Out_ PRTL_RELATIVE_NAME_U RelativeName ); NTSYSAPI NTSTATUS NTAPI RtlExpandEnvironmentStrings_U( - PWSTR Environment, - PUNICODE_STRING Source, - PUNICODE_STRING Destination, - PULONG Length + _In_z_ PWSTR Environment, + _In_ PUNICODE_STRING Source, + _Out_ PUNICODE_STRING Destination, + _Out_ PULONG Length ); NTSYSAPI ULONG NTAPI RtlGetCurrentDirectory_U( - ULONG MaximumLength, - PWSTR Buffer + _In_ ULONG MaximumLength, + _Out_z_bytecap_(MaximumLength) PWSTR Buffer ); NTSYSAPI ULONG NTAPI RtlGetFullPathName_U( - IN PCWSTR FileName, - IN ULONG Size, - IN PWSTR Buffer, - OUT PWSTR *ShortName + _In_ PCWSTR FileName, + _In_ ULONG Size, + _In_ PWSTR Buffer, + _Out_ PWSTR *ShortName ); #if (NTDDI_VERSION >= NTDDI_WIN7) @@ -2585,25 +2675,25 @@ NTSYSAPI NTSTATUS NTAPI RtlGetFullPathName_UEx( - IN PWSTR FileName, - IN ULONG BufferLength, - OUT PWSTR Buffer, - OUT OPTIONAL PWSTR *FilePart, - OUT OPTIONAL RTL_PATH_TYPE *InputPathType + _In_ PWSTR FileName, + _In_ ULONG BufferLength, + _Out_ PWSTR Buffer, + _Out_opt_ PWSTR *FilePart, + _Out_opt_ RTL_PATH_TYPE *InputPathType ); #endif NTSTATUS NTAPI RtlGetFullPathName_UstrEx( - IN PUNICODE_STRING FileName, - IN PUNICODE_STRING StaticString, - IN PUNICODE_STRING DynamicString, - IN PUNICODE_STRING *StringUsed, - IN PSIZE_T FilePartSize, - OUT PBOOLEAN NameInvalid, - OUT RTL_PATH_TYPE* PathType, - OUT PSIZE_T LengthNeeded + _In_ PUNICODE_STRING FileName, + _In_ PUNICODE_STRING StaticString, + _In_ PUNICODE_STRING DynamicString, + _In_ PUNICODE_STRING *StringUsed, + _In_ PSIZE_T FilePartSize, + _Out_ PBOOLEAN NameInvalid, + _Out_ RTL_PATH_TYPE* PathType, + _Out_ PSIZE_T LengthNeeded ); NTSYSAPI @@ -2617,55 +2707,57 @@ NTSYSAPI ULONG NTAPI RtlIsDosDeviceName_U( - IN PCWSTR Name + _In_ PCWSTR Name ); NTSYSAPI ULONG NTAPI RtlIsDosDeviceName_Ustr( - IN PCUNICODE_STRING Name + _In_ PCUNICODE_STRING Name ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlIsNameLegalDOS8Dot3( - IN PCUNICODE_STRING Name, - IN OUT POEM_STRING OemName OPTIONAL, - IN OUT PBOOLEAN NameContainsSpaces OPTIONAL + _In_ PCUNICODE_STRING Name, + _Inout_opt_ POEM_STRING OemName, + _Out_opt_ PBOOLEAN NameContainsSpaces ); NTSYSAPI NTSTATUS NTAPI RtlQueryEnvironmentVariable_U( - IN OPTIONAL PWSTR Environment, - IN PUNICODE_STRING Name, - OUT PUNICODE_STRING Value + _In_opt_ PWSTR Environment, + _In_ PUNICODE_STRING Name, + _Out_ PUNICODE_STRING Value ); VOID NTAPI RtlReleaseRelativeName( - IN PRTL_RELATIVE_NAME_U RelativeName + _In_ PRTL_RELATIVE_NAME_U RelativeName ); NTSYSAPI NTSTATUS NTAPI RtlSetCurrentDirectory_U( - IN PUNICODE_STRING name + _In_ PUNICODE_STRING name ); NTSYSAPI NTSTATUS NTAPI RtlSetEnvironmentVariable( - PWSTR *Environment, - PUNICODE_STRING Name, - PUNICODE_STRING Value + _In_z_ PWSTR *Environment, + _In_ PUNICODE_STRING Name, + _In_ PUNICODE_STRING Value ); // @@ -2675,153 +2767,154 @@ NTSYSAPI NTSTATUS NTAPI RtlDeleteCriticalSection ( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI NTSTATUS NTAPI RtlEnterCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI NTSTATUS NTAPI RtlInitializeCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI NTSTATUS NTAPI RtlInitializeCriticalSectionAndSpinCount( - IN PRTL_CRITICAL_SECTION CriticalSection, - IN ULONG SpinCount + _In_ PRTL_CRITICAL_SECTION CriticalSection, + _In_ ULONG SpinCount ); NTSYSAPI NTSTATUS NTAPI RtlLeaveCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI BOOLEAN NTAPI RtlTryEnterCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI VOID NTAPI RtlpUnWaitCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI NTSTATUS NTAPI RtlpWaitForCriticalSection( - IN PRTL_CRITICAL_SECTION CriticalSection + _In_ PRTL_CRITICAL_SECTION CriticalSection ); NTSYSAPI BOOLEAN NTAPI RtlAcquireResourceExclusive( - IN PRTL_RESOURCE Resource, - IN BOOLEAN Wait + _In_ PRTL_RESOURCE Resource, + _In_ BOOLEAN Wait ); NTSYSAPI BOOLEAN NTAPI RtlAcquireResourceShared( - IN PRTL_RESOURCE Resource, - IN BOOLEAN Wait + _In_ PRTL_RESOURCE Resource, + _In_ BOOLEAN Wait ); NTSYSAPI VOID NTAPI RtlConvertExclusiveToShared( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); NTSYSAPI VOID NTAPI RtlConvertSharedToExclusive( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); NTSYSAPI VOID NTAPI RtlDeleteResource( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); NTSYSAPI VOID NTAPI RtlDumpResource( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); NTSYSAPI VOID NTAPI RtlInitializeResource( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); NTSYSAPI VOID NTAPI RtlReleaseResource( - IN PRTL_RESOURCE Resource + _In_ PRTL_RESOURCE Resource ); // // Compression Functions // -NTSYSAPI +NTSYSAPI //NT_RTL_COMPRESS_API NTSTATUS NTAPI RtlCompressBuffer( - IN USHORT CompressionFormatAndEngine, - IN PUCHAR UncompressedBuffer, - IN ULONG UncompressedBufferSize, - OUT PUCHAR CompressedBuffer, - IN ULONG CompressedBufferSize, - IN ULONG UncompressedChunkSize, - OUT PULONG FinalCompressedSize, - IN PVOID WorkSpace + _In_ USHORT CompressionFormatAndEngine, + _In_reads_bytes_(UncompressedBufferSize) PUCHAR UncompressedBuffer, + _In_ ULONG UncompressedBufferSize, + _Out_writes_bytes_to_(CompressedBufferSize, *FinalCompressedSize) PUCHAR CompressedBuffer, + _In_ ULONG CompressedBufferSize, + _In_ ULONG UncompressedChunkSize, + _Out_ PULONG FinalCompressedSize, + _In_ PVOID WorkSpace ); -NTSYSAPI +_IRQL_requires_max_(APC_LEVEL) +NTSYSAPI //NT_RTL_COMPRESS_API NTSTATUS NTAPI RtlDecompressBuffer( - IN USHORT CompressionFormat, - OUT PUCHAR UncompressedBuffer, - IN ULONG UncompressedBufferSize, - IN PUCHAR CompressedBuffer, - IN ULONG CompressedBufferSize, - OUT PULONG FinalUncompressedSize + _In_ USHORT CompressionFormat, + _Out_writes_bytes_to_(UncompressedBufferSize, *FinalUncompressedSize) PUCHAR UncompressedBuffer, + _In_ ULONG UncompressedBufferSize, + _In_reads_bytes_(CompressedBufferSize) PUCHAR CompressedBuffer, + _In_ ULONG CompressedBufferSize, + _Out_ PULONG FinalUncompressedSize ); NTSYSAPI NTSTATUS NTAPI RtlGetCompressionWorkSpaceSize( - IN USHORT CompressionFormatAndEngine, - OUT PULONG CompressBufferWorkSpaceSize, - OUT PULONG CompressFragmentWorkSpaceSize + _In_ USHORT CompressionFormatAndEngine, + _Out_ PULONG CompressBufferWorkSpaceSize, + _Out_ PULONG CompressFragmentWorkSpaceSize ); // @@ -2831,8 +2924,8 @@ NTSYSAPI PRTL_DEBUG_INFORMATION NTAPI RtlCreateQueryDebugBuffer( - IN ULONG Size, - IN BOOLEAN EventPair + _In_ ULONG Size, + _In_ BOOLEAN EventPair ); NTSYSAPI @@ -2844,9 +2937,9 @@ NTSYSAPI NTSTATUS NTAPI RtlQueryProcessDebugInformation( - IN ULONG ProcessId, - IN ULONG DebugInfoClassMask, - IN OUT PRTL_DEBUG_INFORMATION DebugBuffer + _In_ ULONG ProcessId, + _In_ ULONG DebugInfoClassMask, + _Inout_ PRTL_DEBUG_INFORMATION DebugBuffer ); // @@ -2856,157 +2949,162 @@ NTSYSAPI BOOLEAN NTAPI RtlAreBitsClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG Length + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG StartingIndex, + _In_ ULONG Length ); NTSYSAPI BOOLEAN NTAPI RtlAreBitsSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG Length + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG StartingIndex, + _In_ ULONG Length ); NTSYSAPI VOID NTAPI RtlClearAllBits( - IN OUT PRTL_BITMAP BitMapHeader + _In_ PRTL_BITMAP BitMapHeader ); NTSYSAPI VOID NTAPI RtlClearBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG NumberToClear + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToClear) ULONG StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) ULONG NumberToClear ); NTSYSAPI ULONG NTAPI RtlFindClearBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex ); NTSYSAPI ULONG NTAPI RtlFindClearBitsAndSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex ); NTSYSAPI CCHAR NTAPI RtlFindLeastSignificantBit( - IN ULONGLONG Value + _In_ ULONGLONG Value ); NTSYSAPI CCHAR NTAPI RtlFindMostSignificantBit( - IN ULONGLONG Value + _In_ ULONGLONG Value ); NTSYSAPI ULONG NTAPI RtlFindNextForwardRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex ); NTSYSAPI ULONG NTAPI RtlFindNextForwardRunSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG FromIndex, + _In_ PULONG StartingRunIndex ); NTSYSAPI ULONG NTAPI RtlFindSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex ); NTSYSAPI ULONG NTAPI RtlFindSetBitsAndClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG NumberToFind, + _In_ ULONG HintIndex ); +#ifdef _REACTOS_ // ReactOS improvement +_At_(BitMapHeader->SizeOfBitMap, _Post_equal_to_(SizeOfBitMap)) +_At_(BitMapHeader->Buffer, _Post_equal_to_(BitMapBuffer)) +#endif NTSYSAPI VOID NTAPI RtlInitializeBitMap( - IN PRTL_BITMAP BitMapHeader, - IN PULONG BitMapBuffer, - IN ULONG SizeOfBitMap + _Out_ PRTL_BITMAP BitMapHeader, + _In_opt_ __drv_aliasesMem PULONG BitMapBuffer, + _In_opt_ ULONG SizeOfBitMap ); NTSYSAPI ULONG NTAPI RtlNumberOfClearBits( - IN PRTL_BITMAP BitMapHeader + _In_ PRTL_BITMAP BitMapHeader ); NTSYSAPI ULONG NTAPI RtlNumberOfSetBits( - IN PRTL_BITMAP BitMapHeader + _In_ PRTL_BITMAP BitMapHeader ); NTSYSAPI VOID NTAPI RtlSetBit( - PRTL_BITMAP BitMapHeader, - ULONG BitNumber + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber ); NTSYSAPI VOID NTAPI RtlSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG NumberToSet + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToSet) ULONG StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) ULONG NumberToSet ); NTSYSAPI VOID NTAPI RtlSetAllBits( - PRTL_BITMAP BitMapHeader + _In_ PRTL_BITMAP BitMapHeader ); +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTestBit( - PRTL_BITMAP BitMapHeader, - ULONG BitNumber + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber ); // @@ -3016,13 +3114,13 @@ NTSYSAPI NTSTATUS NTAPI RtlCreateTimer( - HANDLE TimerQueue, - PHANDLE phNewTimer, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Parameter, - ULONG DueTime, - ULONG Period, - ULONG Flags + _In_ HANDLE TimerQueue, + _In_ PHANDLE phNewTimer, + _In_ WAITORTIMERCALLBACKFUNC Callback, + _In_ PVOID Parameter, + _In_ ULONG DueTime, + _In_ ULONG Period, + _In_ ULONG Flags ); NTSYSAPI @@ -3034,27 +3132,27 @@ NTSYSAPI NTSTATUS NTAPI RtlDeleteTimer( - HANDLE TimerQueue, - HANDLE Timer, - HANDLE CompletionEvent + _In_ HANDLE TimerQueue, + _In_ HANDLE Timer, + _In_ HANDLE CompletionEvent ); NTSYSAPI NTSTATUS NTAPI RtlUpdateTimer( - HANDLE TimerQueue, - HANDLE Timer, - ULONG DueTime, - ULONG Period + _In_ HANDLE TimerQueue, + _In_ HANDLE Timer, + _In_ ULONG DueTime, + _In_ ULONG Period ); NTSYSAPI NTSTATUS NTAPI RtlDeleteTimerQueueEx( - HANDLE TimerQueue, - HANDLE CompletionEvent + _In_ HANDLE TimerQueue, + _In_ HANDLE CompletionEvent ); NTSYSAPI @@ -3068,10 +3166,10 @@ RtlDeleteTimerQueue(HANDLE TimerQueue); PSLIST_ENTRY FASTCALL InterlockedPushListSList( - IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY List, - IN PSLIST_ENTRY ListEnd, - IN ULONG Count + _Inout_ PSLIST_HEADER ListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY List, + _Inout_ PSLIST_ENTRY ListEnd, + _In_ ULONG Count ); // @@ -3081,27 +3179,27 @@ NTSYSAPI VOID NTAPI RtlInitializeRangeList( - IN OUT PRTL_RANGE_LIST RangeList + _Inout_ PRTL_RANGE_LIST RangeList ); NTSYSAPI VOID NTAPI RtlFreeRangeList( - IN PRTL_RANGE_LIST RangeList + _In_ PRTL_RANGE_LIST RangeList ); NTSYSAPI NTSTATUS NTAPI RtlAddRange( - IN OUT PRTL_RANGE_LIST RangeList, - IN ULONGLONG Start, - IN ULONGLONG End, - IN UCHAR Attributes, - IN ULONG Flags, - IN PVOID UserData OPTIONAL, - IN PVOID Owner OPTIONAL + _Inout_ PRTL_RANGE_LIST RangeList, + _In_ ULONGLONG Start, + _In_ ULONGLONG End, + _In_ UCHAR Attributes, + _In_ ULONG Flags, + _In_opt_ PVOID UserData, + _In_opt_ PVOID Owner ); // @@ -3110,27 +3208,27 @@ RtlAddRange( ULONG __cdecl DbgPrint( - IN PCCH Format, - IN ... + _In_z_ _Printf_format_string_ PCSTR Format, + ... ); NTSYSAPI ULONG __cdecl DbgPrintEx( - IN ULONG ComponentId, - IN ULONG Level, - IN PCCH Format, - IN ... + _In_ ULONG ComponentId, + _In_ ULONG Level, + _In_z_ _Printf_format_string_ PCSTR Format, + ... ); NTSYSAPI ULONG NTAPI DbgPrompt( - IN PCCH Prompt, - OUT PCH Response, - IN ULONG MaximumResponseLength + _In_z_ PCCH Prompt, + _Out_writes_bytes_(Length) PCH Response, + _In_ ULONG Length ); VOID @@ -3142,24 +3240,24 @@ DbgBreakPoint( VOID NTAPI DbgLoadImageSymbols( - IN PSTRING Name, - IN PVOID Base, - IN ULONG_PTR ProcessId + _In_ PSTRING Name, + _In_ PVOID Base, + _In_ ULONG_PTR ProcessId ); VOID NTAPI DbgUnLoadImageSymbols( - IN PSTRING Name, - IN PVOID Base, - IN ULONG_PTR ProcessId + _In_ PSTRING Name, + _In_ PVOID Base, + _In_ ULONG_PTR ProcessId ); VOID NTAPI DbgCommandString( - IN PCCH Name, - IN PCCH Command + _In_ PCCH Name, + _In_ PCCH Command ); // @@ -3170,39 +3268,39 @@ NTSYSAPI PVOID NTAPI RtlInsertElementGenericTable( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - IN ULONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL + _In_ PRTL_GENERIC_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement ); NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableFull( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - IN ULONG BufferSize, - OUT PBOOLEAN NewElement OPTIONAL, - IN PVOID NodeOrParent, - IN TABLE_SEARCH_RESULT SearchResult + _In_ PRTL_GENERIC_TABLE Table, + _In_reads_bytes_(BufferSize) PVOID Buffer, + _In_ CLONG BufferSize, + _Out_opt_ PBOOLEAN NewElement, + _In_ PVOID NodeOrParent, + _In_ TABLE_SEARCH_RESULT SearchResult ); NTSYSAPI BOOLEAN NTAPI RtlIsGenericTableEmpty( - IN PRTL_GENERIC_TABLE Table + _In_ PRTL_GENERIC_TABLE Table ); NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableFull( - IN PRTL_GENERIC_TABLE Table, - IN PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult + _In_ PRTL_GENERIC_TABLE Table, + _In_ PVOID Buffer, + _Out_ PVOID *NodeOrParent, + _Out_ TABLE_SEARCH_RESULT *SearchResult ); #endif @@ -3213,47 +3311,48 @@ NTSYSAPI PRTL_HANDLE_TABLE_ENTRY NTAPI RtlAllocateHandle( - IN PRTL_HANDLE_TABLE HandleTable, - IN OUT PULONG Index + _In_ PRTL_HANDLE_TABLE HandleTable, + _Inout_ PULONG Index ); NTSYSAPI VOID NTAPI -RtlDestroyHandleTable(IN PRTL_HANDLE_TABLE HandleTable); +RtlDestroyHandleTable( + _Inout_ PRTL_HANDLE_TABLE HandleTable); NTSYSAPI BOOLEAN NTAPI RtlFreeHandle( - IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE_TABLE_ENTRY Handle + _In_ PRTL_HANDLE_TABLE HandleTable, + _In_ PRTL_HANDLE_TABLE_ENTRY Handle ); NTSYSAPI VOID NTAPI RtlInitializeHandleTable( - IN ULONG TableSize, - IN ULONG HandleSize, - IN PRTL_HANDLE_TABLE HandleTable + _In_ ULONG TableSize, + _In_ ULONG HandleSize, + _In_ PRTL_HANDLE_TABLE HandleTable ); NTSYSAPI BOOLEAN NTAPI RtlIsValidHandle( - IN PRTL_HANDLE_TABLE HandleTable, - IN PRTL_HANDLE_TABLE_ENTRY Handle + _In_ PRTL_HANDLE_TABLE HandleTable, + _In_ PRTL_HANDLE_TABLE_ENTRY Handle ); NTSYSAPI BOOLEAN NTAPI RtlIsValidIndexHandle( - IN PRTL_HANDLE_TABLE HandleTable, - IN ULONG Index, - OUT PRTL_HANDLE_TABLE_ENTRY *Handle + _In_ PRTL_HANDLE_TABLE HandleTable, + _In_ ULONG Index, + _Out_ PRTL_HANDLE_TABLE_ENTRY *Handle ); // @@ -3263,11 +3362,11 @@ NTSYSAPI NTSTATUS NTAPI RtlFindMessage( - IN PVOID BaseAddress, - IN ULONG Type, - IN ULONG Language, - IN ULONG MessageId, - OUT PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry + _In_ PVOID BaseAddress, + _In_ ULONG Type, + _In_ ULONG Language, + _In_ ULONG MessageId, + _Out_ PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry ); NTSYSAPI @@ -3279,56 +3378,57 @@ NTSYSAPI PVOID NTAPI RtlImageDirectoryEntryToData( - PVOID BaseAddress, - BOOLEAN MappedAsImage, - USHORT Directory, - PULONG Size + _In_ PVOID BaseAddress, + _In_ BOOLEAN MappedAsImage, + _In_ USHORT Directory, + _Out_ PULONG Size ); NTSYSAPI PVOID NTAPI RtlImageRvaToVa( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva, - PIMAGE_SECTION_HEADER *SectionHeader + _In_ PIMAGE_NT_HEADERS NtHeader, + _In_ PVOID BaseAddress, + _In_ ULONG Rva, + _Out_ PIMAGE_SECTION_HEADER *SectionHeader ); NTSYSAPI PIMAGE_NT_HEADERS NTAPI -RtlImageNtHeader(IN PVOID BaseAddress); +RtlImageNtHeader( + _In_ PVOID BaseAddress); NTSYSAPI NTSTATUS NTAPI RtlImageNtHeaderEx( - IN ULONG Flags, - IN PVOID BaseAddress, - IN ULONGLONG Size, - IN PIMAGE_NT_HEADERS *NtHeader + _In_ ULONG Flags, + _In_ PVOID BaseAddress, + _In_ ULONGLONG Size, + _In_ PIMAGE_NT_HEADERS *NtHeader ); NTSYSAPI PIMAGE_SECTION_HEADER NTAPI RtlImageRvaToSection( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva + _In_ PIMAGE_NT_HEADERS NtHeader, + _In_ PVOID BaseAddress, + _In_ ULONG Rva ); NTSYSAPI ULONG NTAPI LdrRelocateImageWithBias( - IN PVOID NewAddress, - IN LONGLONG AdditionalBias, - IN PCCH LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid + _In_ PVOID NewAddress, + _In_ LONGLONG AdditionalBias, + _In_ PCCH LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid ); // @@ -3339,71 +3439,71 @@ NTSYSAPI NTSTATUS NTAPI RtlActivateActivationContextEx( - IN ULONG Flags, - IN PTEB Teb, - IN PVOID Context, - IN PULONG_PTR Cookie + _In_ ULONG Flags, + _In_ PTEB Teb, + _In_ PVOID Context, + _In_ PULONG_PTR Cookie ); NTSYSAPI NTSTATUS NTAPI RtlActivateActivationContext( - IN ULONG Flags, - IN HANDLE Handle, - OUT PULONG_PTR Cookie + _In_ ULONG Flags, + _In_ HANDLE Handle, + _Out_ PULONG_PTR Cookie ); NTSYSAPI VOID NTAPI RtlAddRefActivationContext( - PVOID Context + _In_ PVOID Context ); NTSYSAPI PRTL_ACTIVATION_CONTEXT_STACK_FRAME FASTCALL RtlActivateActivationContextUnsafeFast( - IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, - IN PVOID Context + _In_ PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, + _In_ PVOID Context ); NTSYSAPI NTSTATUS NTAPI RtlAllocateActivationContextStack( - IN PVOID *Context + _In_ PVOID *Context ); NTSYSAPI NTSTATUS NTAPI RtlCreateActivationContext( - OUT PHANDLE Handle, - IN OUT PVOID ReturnedData + _Out_ PHANDLE Handle, + _Inout_ PVOID ReturnedData ); NTSYSAPI NTSTATUS NTAPI RtlGetActiveActivationContext( - IN PVOID *Context + _In_ PVOID *Context ); NTSYSAPI VOID NTAPI RtlReleaseActivationContext( - IN HANDLE handle + _In_ HANDLE handle ); NTSYSAPI NTSTATUS NTAPI RtlDeactivateActivationContext( - ULONG dwFlags, - ULONG_PTR ulCookie + _In_ ULONG dwFlags, + _In_ ULONG_PTR ulCookie ); NTSYSAPI @@ -3415,46 +3515,46 @@ NTSYSAPI PRTL_ACTIVATION_CONTEXT_STACK_FRAME FASTCALL RtlDeactivateActivationContextUnsafeFast( - IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame + _In_ PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame ); NTSYSAPI NTSTATUS NTAPI RtlDosApplyFileIsolationRedirection_Ustr( - IN ULONG Flags, - IN PUNICODE_STRING OriginalName, - IN PUNICODE_STRING Extension, - IN OUT PUNICODE_STRING StaticString, - IN OUT PUNICODE_STRING DynamicString, - IN OUT PUNICODE_STRING *NewName, - IN PULONG NewFlags, - IN PSIZE_T FileNameSize, - IN PSIZE_T RequiredLength + _In_ ULONG Flags, + _In_ PUNICODE_STRING OriginalName, + _In_ PUNICODE_STRING Extension, + _Inout_ PUNICODE_STRING StaticString, + _Inout_ PUNICODE_STRING DynamicString, + _Inout_ PUNICODE_STRING *NewName, + _In_ PULONG NewFlags, + _In_ PSIZE_T FileNameSize, + _In_ PSIZE_T RequiredLength ); NTSYSAPI NTSTATUS NTAPI RtlFindActivationContextSectionString( - IN ULONG dwFlags, - IN const GUID *ExtensionGuid, - IN ULONG SectionType, - IN PUNICODE_STRING SectionName, - IN OUT PVOID ReturnedData + _In_ ULONG dwFlags, + _In_ const GUID *ExtensionGuid, + _In_ ULONG SectionType, + _In_ PUNICODE_STRING SectionName, + _Inout_ PVOID ReturnedData ); NTSYSAPI NTSTATUS NTAPI RtlQueryInformationActivationContext( - DWORD dwFlags, - PVOID Context, - PVOID pvSubInstance, - ULONG ulInfoClass, - PVOID pvBuffer, - SIZE_T cbBuffer OPTIONAL, - SIZE_T *pcbWrittenOrRequired OPTIONAL + _In_ DWORD dwFlags, + _In_ PVOID Context, + _In_ PVOID pvSubInstance, + _In_ ULONG ulInfoClass, + _Out_bytecap_(cbBufer) PVOID pvBuffer, + _In_opt_ SIZE_T cbBuffer, + _Out_opt_ SIZE_T *pcbWrittenOrRequired ); NTSYSAPI @@ -3471,15 +3571,15 @@ NTSYSAPI NTSTATUS NTAPI RtlWow64EnableFsRedirection( - IN BOOLEAN Wow64FsEnableRedirection + _In_ BOOLEAN Wow64FsEnableRedirection ); NTSYSAPI NTSTATUS NTAPI RtlWow64EnableFsRedirectionEx( - IN PVOID Wow64FsEnableRedirection, - OUT PVOID *OldFsRedirectionLevel + _In_ PVOID Wow64FsEnableRedirection, + _Out_ PVOID *OldFsRedirectionLevel ); #endif @@ -3491,54 +3591,57 @@ NTSYSAPI NTSTATUS NTAPI RtlCheckRegistryKey( - ULONG RelativeTo, - PWSTR Path + _In_ ULONG RelativeTo, + _In_z_ PWSTR Path ); NTSYSAPI NTSTATUS NTAPI RtlCreateRegistryKey( - IN ULONG RelativeTo, - IN PWSTR Path + _In_ ULONG RelativeTo, + _In_ PWSTR Path ); NTSYSAPI NTSTATUS NTAPI RtlFormatCurrentUserKeyPath( - IN OUT PUNICODE_STRING KeyPath + _Inout_ PUNICODE_STRING KeyPath ); NTSYSAPI NTSTATUS NTAPI RtlOpenCurrentUser( - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE KeyHandle + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE KeyHandle ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlQueryRegistryValues( - IN ULONG RelativeTo, - IN PCWSTR Path, - IN PRTL_QUERY_REGISTRY_TABLE QueryTable, - IN PVOID Context, - IN PVOID Environment + _In_ ULONG RelativeTo, + _In_ PCWSTR Path, + _Inout_ _At_(*(*QueryTable).EntryContext, _Pre_unknown_) + PRTL_QUERY_REGISTRY_TABLE QueryTable, + _In_opt_ PVOID Context, + _In_opt_ PVOID Environment ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlWriteRegistryValue( - ULONG RelativeTo, - PCWSTR Path, - PCWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength + _In_ ULONG RelativeTo, + _In_ PCWSTR Path, + _In_z_ PCWSTR ValueName, + _In_ ULONG ValueType, + _In_reads_bytes_opt_(ValueLength) PVOID ValueData, + _In_ ULONG ValueLength ); #ifdef NTOS_MODE_USER @@ -3546,60 +3649,60 @@ NTSYSAPI NTSTATUS NTAPI RtlpNtCreateKey( - OUT HANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG TitleIndex, - IN PUNICODE_STRING Class, - OUT PULONG Disposition + _Out_ HANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG TitleIndex, + _In_ PUNICODE_STRING Class, + _Out_ PULONG Disposition ); NTSYSAPI NTSTATUS NTAPI RtlpNtEnumerateSubKey( - IN HANDLE KeyHandle, - OUT PUNICODE_STRING SubKeyName, - IN ULONG Index, - IN ULONG Unused + _In_ HANDLE KeyHandle, + _Out_ PUNICODE_STRING SubKeyName, + _In_ ULONG Index, + _In_ ULONG Unused ); NTSYSAPI NTSTATUS NTAPI RtlpNtMakeTemporaryKey( - IN HANDLE KeyHandle + _In_ HANDLE KeyHandle ); NTSYSAPI NTSTATUS NTAPI RtlpNtOpenKey( - OUT HANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Unused + _Out_ HANDLE KeyHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Unused ); NTSYSAPI NTSTATUS NTAPI RtlpNtQueryValueKey( - IN HANDLE KeyHandle, - OUT PULONG Type OPTIONAL, - OUT PVOID Data OPTIONAL, - IN OUT PULONG DataLength OPTIONAL, - IN ULONG Unused + _In_ HANDLE KeyHandle, + _Out_opt_ PULONG Type, + _Out_opt_ PVOID Data, + _Inout_opt_ PULONG DataLength, + _In_ ULONG Unused ); NTSYSAPI NTSTATUS NTAPI RtlpNtSetValueKey( - IN HANDLE KeyHandle, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataLength + _In_ HANDLE KeyHandle, + _In_ ULONG Type, + _In_ PVOID Data, + _In_ ULONG DataLength ); #endif @@ -3610,32 +3713,34 @@ NTSYSAPI VOID NTAPI RtlGetDefaultCodePage( - OUT PUSHORT AnsiCodePage, - OUT PUSHORT OemCodePage + _Out_ PUSHORT AnsiCodePage, + _Out_ PUSHORT OemCodePage ); NTSYSAPI VOID NTAPI RtlInitNlsTables( - IN PUSHORT AnsiTableBase, - IN PUSHORT OemTableBase, - IN PUSHORT CaseTableBase, - OUT PNLSTABLEINFO NlsTable + _In_ PUSHORT AnsiTableBase, + _In_ PUSHORT OemTableBase, + _In_ PUSHORT CaseTableBase, + _Out_ PNLSTABLEINFO NlsTable ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI VOID NTAPI RtlInitCodePageTable( - IN PUSHORT TableBase, - OUT PCPTABLEINFO CodePageTable + _In_ PUSHORT TableBase, + _Inout_ PCPTABLEINFO CodePageTable ); NTSYSAPI VOID NTAPI -RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable); +RtlResetRtlTranslations( + _In_ PNLSTABLEINFO NlsTable); #if defined(NTOS_MODE_USER) && !defined(NO_RTL_INLINES) @@ -3646,7 +3751,7 @@ static __inline LARGE_INTEGER NTAPI_INLINE RtlConvertLongToLargeInteger( - LONG SignedInteger + _In_ LONG SignedInteger ) { LARGE_INTEGER Result; @@ -3659,8 +3764,8 @@ static __inline LARGE_INTEGER NTAPI_INLINE RtlEnlargedIntegerMultiply( - LONG Multiplicand, - LONG Multiplier + _In_ LONG Multiplicand, + _In_ LONG Multiplier ) { LARGE_INTEGER Product; @@ -3673,9 +3778,9 @@ static __inline ULONG NTAPI_INLINE RtlEnlargedUnsignedDivide( - IN ULARGE_INTEGER Dividend, - IN ULONG Divisor, - IN PULONG Remainder OPTIONAL + _In_ ULARGE_INTEGER Dividend, + _In_ ULONG Divisor, + _In_opt_ PULONG Remainder ) { ULONG Quotient; @@ -3692,8 +3797,8 @@ static __inline LARGE_INTEGER NTAPI_INLINE RtlEnlargedUnsignedMultiply( - ULONG Multiplicand, - ULONG Multiplier + _In_ ULONG Multiplicand, + _In_ ULONG Multiplier ) { LARGE_INTEGER Product; @@ -3707,9 +3812,9 @@ static __inline LARGE_INTEGER NTAPI_INLINE RtlExtendedLargeIntegerDivide( - IN LARGE_INTEGER Dividend, - IN ULONG Divisor, - OUT PULONG Remainder OPTIONAL) + _In_ LARGE_INTEGER Dividend, + _In_ ULONG Divisor, + _Out_opt_ PULONG Remainder) { LARGE_INTEGER ret; ret.QuadPart = (ULONG64)Dividend.QuadPart / Divisor; @@ -3723,9 +3828,9 @@ NTSYSAPI LARGE_INTEGER NTAPI RtlExtendedLargeIntegerDivide( - IN LARGE_INTEGER Dividend, - IN ULONG Divisor, - OUT PULONG Remainder OPTIONAL + _In_ LARGE_INTEGER Dividend, + _In_ ULONG Divisor, + _Out_opt_ PULONG Remainder ); #endif /* defined(_AMD64_) || defined(_IA64_) */ @@ -3737,23 +3842,23 @@ NTSYSAPI ULONG NTAPI RtlUniform( - IN PULONG Seed + _In_ PULONG Seed ); NTSYSAPI ULONG NTAPI RtlRandom( - IN OUT PULONG Seed + _Inout_ PULONG Seed ); NTSYSAPI ULONG NTAPI RtlComputeCrc32( - IN ULONG InitialCrc, - IN PUCHAR Buffer, - IN ULONG Length + _In_ ULONG InitialCrc, + _In_ PUCHAR Buffer, + _In_ ULONG Length ); // @@ -3763,48 +3868,48 @@ NTSYSAPI NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PCWSTR String, - IN BOOLEAN Strict, - OUT LPWSTR *Terminator, - OUT struct in_addr *Addr + _In_ PCWSTR String, + _In_ BOOLEAN Strict, + _Out_ LPWSTR *Terminator, + _Out_ struct in_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressA( - IN PCHAR Name, - OUT PCHAR *Terminator, - OUT struct in6_addr *Addr + _In_ PCHAR Name, + _Out_ PCHAR *Terminator, + _Out_ struct in6_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressW( - IN PWCHAR Name, - OUT PCHAR *Terminator, - OUT struct in6_addr *Addr + _In_ PWCHAR Name, + _Out_ PCHAR *Terminator, + _Out_ struct in6_addr *Addr ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressExA( - IN PCHAR AddressString, - IN struct in6_addr *Address, - IN PULONG ScopeId, - IN PUSHORT Port + _In_ PCHAR AddressString, + _In_ struct in6_addr *Address, + _In_ PULONG ScopeId, + _In_ PUSHORT Port ); NTSYSAPI NTSTATUS NTAPI RtlIpv6StringToAddressExW( - IN PWCHAR AddressName, - IN struct in6_addr *Address, - IN PULONG ScopeId, - IN PUSHORT Port + _In_ PWCHAR AddressName, + _In_ struct in6_addr *Address, + _In_ PULONG ScopeId, + _In_ PUSHORT Port ); @@ -3814,27 +3919,29 @@ RtlIpv6StringToAddressExW( NTSYSAPI NTSTATUS NTAPI -RtlQueryTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); +RtlQueryTimeZoneInformation( + _Out_ PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); NTSYSAPI VOID NTAPI RtlSecondsSince1970ToTime( - IN ULONG SecondsSince1970, - OUT PLARGE_INTEGER Time + _In_ ULONG SecondsSince1970, + _Out_ PLARGE_INTEGER Time ); NTSYSAPI NTSTATUS NTAPI -RtlSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); +RtlSetTimeZoneInformation( + _In_ PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); NTSYSAPI BOOLEAN NTAPI RtlTimeFieldsToTime( - PTIME_FIELDS TimeFields, - PLARGE_INTEGER Time + _In_ PTIME_FIELDS TimeFields, + _Out_ PLARGE_INTEGER Time ); NTSYSAPI @@ -3842,7 +3949,7 @@ BOOLEAN NTAPI RtlTimeToSecondsSince1970( PLARGE_INTEGER Time, - OUT PULONG SecondsSince1970 + _Out_ PULONG SecondsSince1970 ); NTSYSAPI @@ -3857,26 +3964,35 @@ NTSYSAPI NTSTATUS NTAPI RtlSystemTimeToLocalTime( - IN PLARGE_INTEGER SystemTime, - OUT PLARGE_INTEGER LocalTime + _In_ PLARGE_INTEGER SystemTime, + _Out_ PLARGE_INTEGER LocalTime ); // // Version Functions // +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask + _In_ PRTL_OSVERSIONINFOEXW VersionInfo, + _In_ ULONG TypeMask, + _In_ ULONGLONG ConditionMask ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); +RtlGetVersion( + _Out_ + _At_(lpVersionInformation->dwOSVersionInfoSize, _Pre_ _Valid_) + _When_(lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW), + _At_((PRTL_OSVERSIONINFOEXW)lpVersionInformation, _Out_)) + PRTL_OSVERSIONINFOW lpVersionInformation +); NTSYSAPI BOOLEAN @@ -3891,14 +4007,14 @@ NTSYSAPI NTSTATUS NTAPI RtlRegisterSecureMemoryCacheCallback( - IN PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback); + _In_ PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback); NTSYSAPI BOOLEAN NTAPI RtlFlushSecureMemoryCache( - IN PVOID MemoryCache, - IN OPTIONAL SIZE_T MemoryLength + _In_ PVOID MemoryCache, + _In_opt_ SIZE_T MemoryLength ); #endif @@ -3917,26 +4033,26 @@ NTSYSAPI NTSTATUS NTAPI RtlGetSetBootStatusData( - IN HANDLE FileHandle, - IN BOOLEAN WriteMode, - IN RTL_BSD_ITEM_TYPE DataClass, - IN PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnLength OPTIONAL + _In_ HANDLE FileHandle, + _In_ BOOLEAN WriteMode, + _In_ RTL_BSD_ITEM_TYPE DataClass, + _In_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI RtlLockBootStatusData( - OUT PHANDLE FileHandle + _Out_ PHANDLE FileHandle ); NTSYSAPI NTSTATUS NTAPI RtlUnlockBootStatusData( - IN HANDLE FileHandle + _In_ HANDLE FileHandle ); #endif @@ -3945,16 +4061,16 @@ NTSYSAPI NTSTATUS NTAPI RtlGUIDFromString( - IN PUNICODE_STRING GuidString, - OUT GUID *Guid); + _In_ PUNICODE_STRING GuidString, + _Out_ GUID *Guid); NTSYSAPI NTSTATUS NTAPI RtlComputeImportTableHash( - IN HANDLE hFile, - OUT PCHAR Hash, - IN ULONG ImportTableHashRevision + _In_ HANDLE hFile, + _Out_ PCHAR Hash, + _In_ ULONG ImportTableHashRevision ); #endif diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h index e8af8f82f18..d6bc96493b9 100644 --- a/reactos/include/ndk/rtltypes.h +++ b/reactos/include/ndk/rtltypes.h @@ -448,7 +448,7 @@ typedef LONG // typedef VOID (NTAPI *WORKERCALLBACKFUNC)( - IN PVOID Context + _In_ PVOID Context ); #else /* !NTOS_MODE_USER */ @@ -484,7 +484,7 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; // typedef ULONG (NTAPI *RTLP_UNHANDLED_EXCEPTION_FILTER)( - IN struct _EXCEPTION_POINTERS *ExceptionInfo + _In_ struct _EXCEPTION_POINTERS *ExceptionInfo ); typedef RTLP_UNHANDLED_EXCEPTION_FILTER *PRTLP_UNHANDLED_EXCEPTION_FILTER; @@ -493,8 +493,8 @@ typedef RTLP_UNHANDLED_EXCEPTION_FILTER *PRTLP_UNHANDLED_EXCEPTION_FILTER; // typedef NTSTATUS (NTAPI *PHEAP_ENUMERATION_ROUTINE)( - IN PVOID HeapHandle, - IN PVOID UserParam + _In_ PVOID HeapHandle, + _In_ PVOID UserParam ); // @@ -515,14 +515,14 @@ typedef VOID // typedef NTSTATUS (NTAPI *PRTL_START_POOL_THREAD)( - IN PTHREAD_START_ROUTINE Function, - IN PVOID Parameter, - OUT PHANDLE ThreadHandle + _In_ PTHREAD_START_ROUTINE Function, + _In_ PVOID Parameter, + _Out_ PHANDLE ThreadHandle ); typedef NTSTATUS (NTAPI *PRTL_EXIT_POOL_THREAD)( - IN NTSTATUS ExitStatus + _In_ NTSTATUS ExitStatus ); // @@ -613,12 +613,12 @@ typedef RTL_AVL_FREE_ROUTINE *PRTL_AVL_FREE_ROUTINE; #ifdef NTOS_MODE_USER typedef NTSTATUS (NTAPI *PRTL_QUERY_REGISTRY_ROUTINE)( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext + _In_ PWSTR ValueName, + _In_ ULONG ValueType, + _In_ PVOID ValueData, + _In_ ULONG ValueLength, + _In_ PVOID Context, + _In_ PVOID EntryContext ); #endif @@ -628,8 +628,8 @@ typedef NTSTATUS #ifdef NTOS_MODE_USER typedef NTSTATUS (NTAPI *PRTL_SECURE_MEMORY_CACHE_CALLBACK)( - IN PVOID Address, - IN SIZE_T Length + _In_ PVOID Address, + _In_ SIZE_T Length ); #endif @@ -648,9 +648,9 @@ typedef BOOLEAN // typedef NTSTATUS (NTAPI * PRTL_HEAP_COMMIT_ROUTINE)( - IN PVOID Base, - IN OUT PVOID *CommitAddress, - IN OUT PSIZE_T CommitSize + _In_ PVOID Base, + _Inout_ PVOID *CommitAddress, + _Inout_ PSIZE_T CommitSize ); // diff --git a/reactos/include/ndk/sefuncs.h b/reactos/include/ndk/sefuncs.h index ef4fa418f3a..ae88d078496 100644 --- a/reactos/include/ndk/sefuncs.h +++ b/reactos/include/ndk/sefuncs.h @@ -33,20 +33,20 @@ NTKERNELAPI NTSTATUS NTAPI SeCaptureSecurityDescriptor( - IN PSECURITY_DESCRIPTOR OriginalSecurityDescriptor, - IN KPROCESSOR_MODE CurrentMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor + _In_ PSECURITY_DESCRIPTOR OriginalSecurityDescriptor, + _In_ KPROCESSOR_MODE CurrentMode, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor ); NTKERNELAPI NTSTATUS NTAPI SeReleaseSecurityDescriptor( - IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, - IN KPROCESSOR_MODE CurrentMode, - IN BOOLEAN CaptureIfKernelMode + _In_ PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, + _In_ KPROCESSOR_MODE CurrentMode, + _In_ BOOLEAN CaptureIfKernelMode ); // @@ -66,7 +66,7 @@ NTKERNELAPI VOID NTAPI SeDeleteAccessState( - IN PACCESS_STATE AccessState + _In_ PACCESS_STATE AccessState ); // @@ -76,7 +76,7 @@ NTKERNELAPI SECURITY_IMPERSONATION_LEVEL NTAPI SeTokenImpersonationLevel( - IN PACCESS_TOKEN Token + _In_ PACCESS_TOKEN Token ); #endif @@ -88,94 +88,99 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheck( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - OUT PPRIVILEGE_SET PrivilegeSet, - OUT PULONG ReturnLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_ PPRIVILEGE_SET PrivilegeSet, + _Out_ PULONG ReturnLength, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus ); NTSTATUS NTAPI NtAccessCheckByType( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID PrincipalSelfSid, - IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_TYPE_LIST ObjectTypeList, - IN ULONG ObjectTypeLength, - IN PGENERIC_MAPPING GenericMapping, - IN PPRIVILEGE_SET PrivilegeSet, - IN OUT PULONG PrivilegeSetLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeLength, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ PPRIVILEGE_SET PrivilegeSet, + _Inout_ PULONG PrivilegeSetLength, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus ); NTSTATUS NTAPI NtAccessCheckByTypeResultList( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID PrincipalSelfSid, - IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_TYPE_LIST ObjectTypeList, - IN ULONG ObjectTypeLength, - IN PGENERIC_MAPPING GenericMapping, - IN PPRIVILEGE_SET PrivilegeSet, - IN OUT PULONG PrivilegeSetLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PSID PrincipalSelfSid, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeLength, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ PPRIVILEGE_SET PrivilegeSet, + _Inout_ PULONG PrivilegeSetLength, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus ); -NTSYSCALLAPI +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheckAndAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus, - OUT PBOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus, + _Out_ PBOOLEAN GenerateOnClose ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtAdjustGroupsToken( - IN HANDLE TokenHandle, - IN BOOLEAN ResetToDefault, - IN PTOKEN_GROUPS NewState, - IN ULONG BufferLength, - OUT PTOKEN_GROUPS PreviousState OPTIONAL, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ BOOLEAN ResetToDefault, + _In_opt_ PTOKEN_GROUPS NewState, + _In_opt_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_GROUPS PreviousState, + _Out_ PULONG ReturnLength ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtAdjustPrivilegesToken( - IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, + _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength ); NTSYSCALLAPI NTSTATUS NTAPI NtAllocateLocallyUniqueId( - OUT LUID *LocallyUniqueId + _Out_ LUID *LocallyUniqueId ); NTSYSCALLAPI @@ -192,181 +197,185 @@ NTSYSCALLAPI NTSTATUS NTAPI NtCompareTokens( - IN HANDLE FirstTokenHandle, - IN HANDLE SecondTokenHandle, - OUT PBOOLEAN Equal); + _In_ HANDLE FirstTokenHandle, + _In_ HANDLE SecondTokenHandle, + _Out_ PBOOLEAN Equal); NTSYSCALLAPI NTSTATUS NTAPI NtCreateToken( - OUT PHANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN TOKEN_TYPE TokenType, - IN PLUID AuthenticationId, - IN PLARGE_INTEGER ExpirationTime, - IN PTOKEN_USER TokenUser, - IN PTOKEN_GROUPS TokenGroups, - IN PTOKEN_PRIVILEGES TokenPrivileges, - IN PTOKEN_OWNER TokenOwner, - IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, - IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, - IN PTOKEN_SOURCE TokenSource + _Out_ PHANDLE TokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TOKEN_TYPE TokenType, + _In_ PLUID AuthenticationId, + _In_ PLARGE_INTEGER ExpirationTime, + _In_ PTOKEN_USER TokenUser, + _In_ PTOKEN_GROUPS TokenGroups, + _In_ PTOKEN_PRIVILEGES TokenPrivileges, + _In_ PTOKEN_OWNER TokenOwner, + _In_ PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, + _In_ PTOKEN_DEFAULT_DACL TokenDefaultDacl, + _In_ PTOKEN_SOURCE TokenSource ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtDuplicateToken( - IN HANDLE ExistingTokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN BOOLEAN EffectiveOnly, - IN TOKEN_TYPE TokenType, - OUT PHANDLE NewTokenHandle + _In_ HANDLE ExistingTokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN EffectiveOnly, + _In_ TOKEN_TYPE TokenType, + _Out_ PHANDLE NewTokenHandle ); NTSYSCALLAPI NTSTATUS NTAPI NtImpersonateAnonymousToken( - IN HANDLE Thread + _In_ HANDLE Thread ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtOpenObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose -); - -NTSYSCALLAPI -NTSTATUS -NTAPI -NtOpenProcessToken( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE TokenHandle + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ ACCESS_MASK GrantedAccess, + _In_opt_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN ObjectCreation, + _In_ BOOLEAN AccessGranted, + _Out_ PBOOLEAN GenerateOnClose ); NTSYSCALLAPI NTSTATUS NTAPI NtOpenProcessTokenEx( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - OUT PHANDLE TokenHandle + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ULONG HandleAttributes, + _Out_ PHANDLE TokenHandle ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtPrivilegeCheck( - IN HANDLE ClientToken, - IN PPRIVILEGE_SET RequiredPrivileges, - IN PBOOLEAN Result + _In_ HANDLE ClientToken, + _Inout_ PPRIVILEGE_SET RequiredPrivileges, + _Out_ PBOOLEAN Result ); NTSYSCALLAPI NTSTATUS NTAPI NtPrivilegedServiceAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PUNICODE_STRING ServiceName, - IN HANDLE ClientToken, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted + _In_ PUNICODE_STRING SubsystemName, + _In_ PUNICODE_STRING ServiceName, + _In_ HANDLE ClientToken, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtPrivilegeObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ); +_When_(TokenInformationClass == TokenAccessInformation, + _At_(TokenInformationLength, _In_range_(>=, sizeof(TOKEN_ACCESS_INFORMATION)))) +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationToken( - IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, + _Out_writes_bytes_to_opt_(TokenInformationLength, *ReturnLength) PVOID TokenInformation, + _In_ ULONG TokenInformationLength, + _Out_ PULONG ReturnLength ); +_Must_inspect_result_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationToken( - IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength + _In_ HANDLE TokenHandle, + _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, + _In_reads_bytes_(TokenInformationLength) PVOID TokenInformation, + _In_ ULONG TokenInformationLength ); NTSYSAPI NTSTATUS NTAPI ZwAccessCheck( - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - OUT PPRIVILEGE_SET PrivilegeSet, - OUT PULONG ReturnLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ HANDLE ClientToken, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_ PPRIVILEGE_SET PrivilegeSet, + _Out_ PULONG ReturnLength, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus ); NTSYSAPI NTSTATUS NTAPI ZwAdjustGroupsToken( - IN HANDLE TokenHandle, - IN BOOLEAN ResetToDefault, - IN PTOKEN_GROUPS NewState, - IN ULONG BufferLength, - OUT PTOKEN_GROUPS PreviousState OPTIONAL, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ BOOLEAN ResetToDefault, + _In_ PTOKEN_GROUPS NewState, + _In_ ULONG BufferLength, + _Out_opt_ PTOKEN_GROUPS PreviousState, + _Out_ PULONG ReturnLength ); +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI ZwAdjustPrivilegesToken( - IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, + _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwAllocateLocallyUniqueId( - OUT LUID *LocallyUniqueId + _Out_ LUID *LocallyUniqueId ); NTSYSAPI @@ -383,127 +392,130 @@ NTSYSAPI NTSTATUS NTAPI ZwCreateToken( - OUT PHANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN TOKEN_TYPE TokenType, - IN PLUID AuthenticationId, - IN PLARGE_INTEGER ExpirationTime, - IN PTOKEN_USER TokenUser, - IN PTOKEN_GROUPS TokenGroups, - IN PTOKEN_PRIVILEGES TokenPrivileges, - IN PTOKEN_OWNER TokenOwner, - IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, - IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, - IN PTOKEN_SOURCE TokenSource + _Out_ PHANDLE TokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TOKEN_TYPE TokenType, + _In_ PLUID AuthenticationId, + _In_ PLARGE_INTEGER ExpirationTime, + _In_ PTOKEN_USER TokenUser, + _In_ PTOKEN_GROUPS TokenGroups, + _In_ PTOKEN_PRIVILEGES TokenPrivileges, + _In_ PTOKEN_OWNER TokenOwner, + _In_ PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, + _In_ PTOKEN_DEFAULT_DACL TokenDefaultDacl, + _In_ PTOKEN_SOURCE TokenSource ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwDuplicateToken( - IN HANDLE ExistingTokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN BOOLEAN EffectiveOnly, - IN TOKEN_TYPE TokenType, - OUT PHANDLE NewTokenHandle + _In_ HANDLE ExistingTokenHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN EffectiveOnly, + _In_ TOKEN_TYPE TokenType, + _Out_ PHANDLE NewTokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwImpersonateAnonymousToken( - IN HANDLE Thread + _In_ HANDLE Thread ); NTSYSAPI NTSTATUS NTAPI ZwOpenObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ HANDLE ClientToken, + _In_ ULONG DesiredAccess, + _In_ ULONG GrantedAccess, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN ObjectCreation, + _In_ BOOLEAN AccessGranted, + _Out_ PBOOLEAN GenerateOnClose ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwOpenProcessToken( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE TokenHandle + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwOpenProcessTokenEx( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN ULONG HandleAttributes, - OUT PHANDLE TokenHandle + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ ULONG HandleAttributes, + _Out_ PHANDLE TokenHandle ); NTSYSAPI NTSTATUS NTAPI ZwPrivilegeCheck( - IN HANDLE ClientToken, - IN PPRIVILEGE_SET RequiredPrivileges, - IN PBOOLEAN Result + _In_ HANDLE ClientToken, + _In_ PPRIVILEGE_SET RequiredPrivileges, + _In_ PBOOLEAN Result ); NTSYSAPI NTSTATUS NTAPI ZwPrivilegedServiceAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PUNICODE_STRING ServiceName, - IN HANDLE ClientToken, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted + _In_ PUNICODE_STRING SubsystemName, + _In_ PUNICODE_STRING ServiceName, + _In_ HANDLE ClientToken, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ); NTSYSAPI NTSTATUS NTAPI ZwPrivilegeObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ HANDLE ClientToken, + _In_ ULONG DesiredAccess, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI ZwQueryInformationToken( - IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength, - OUT PULONG ReturnLength + _In_ HANDLE TokenHandle, + _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, + _Out_writes_bytes_to_opt_(TokenInformationLength,*ReturnLength) PVOID TokenInformation, + _In_ ULONG TokenInformationLength, + _Out_ PULONG ReturnLength ); NTSYSAPI NTSTATUS NTAPI ZwSetInformationToken( - IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength + _In_ HANDLE TokenHandle, + _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, + _Out_ PVOID TokenInformation, + _In_ ULONG TokenInformationLength ); #endif diff --git a/reactos/include/ndk/umfuncs.h b/reactos/include/ndk/umfuncs.h index 16b8f4620fe..b624fa0ffc5 100644 --- a/reactos/include/ndk/umfuncs.h +++ b/reactos/include/ndk/umfuncs.h @@ -72,7 +72,7 @@ NTSTATUS NTAPI CsrClientCallServer( struct _CSR_API_MESSAGE *Request, - struct _CSR_CAPTURE_BUFFER *CaptureBuffer OPTIONAL, + _In_opt_ struct _CSR_CAPTURE_BUFFER *CaptureBuffer, ULONG ApiNumber, ULONG RequestLength ); @@ -109,27 +109,28 @@ CsrSetPriorityClass( VOID NTAPI CsrProbeForRead( - IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment ); VOID NTAPI CsrProbeForWrite( - IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment ); // // Debug Functions // +__analysis_noreturn NTSYSAPI VOID NTAPI DbgBreakPointWithStatus( - IN ULONG Status + _In_ ULONG Status ); NTSTATUS @@ -141,35 +142,35 @@ DbgUiConnectToDbg( NTSTATUS NTAPI DbgUiContinue( - IN PCLIENT_ID ClientId, - IN NTSTATUS ContinueStatus + _In_ PCLIENT_ID ClientId, + _In_ NTSTATUS ContinueStatus ); NTSTATUS NTAPI DbgUiDebugActiveProcess( - IN HANDLE Process + _In_ HANDLE Process ); NTSTATUS NTAPI DbgUiStopDebugging( - IN HANDLE Process + _In_ HANDLE Process ); NTSYSAPI NTSTATUS NTAPI DbgUiWaitStateChange( - IN PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, - IN PLARGE_INTEGER TimeOut + _In_ PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, + _In_ PLARGE_INTEGER TimeOut ); NTSTATUS NTAPI DbgUiConvertStateChangeStructure( - IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, - IN PVOID DebugEvent + _In_ PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + _In_ PVOID DebugEvent ); VOID @@ -181,7 +182,7 @@ DbgUiRemoteBreakin( NTSTATUS NTAPI DbgUiIssueRemoteBreakin( - IN HANDLE Process + _In_ HANDLE Process ); HANDLE @@ -197,47 +198,48 @@ DbgUiGetThreadDebugObject( NTSTATUS NTAPI LdrAddRefDll( - IN ULONG Flags, - IN PVOID BaseAddress + _In_ ULONG Flags, + _In_ PVOID BaseAddress ); NTSTATUS NTAPI LdrDisableThreadCalloutsForDll( - IN PVOID BaseAddress + _In_ PVOID BaseAddress ); NTSTATUS NTAPI LdrGetDllHandle( - IN PWSTR DllPath OPTIONAL, - IN PULONG DllCharacteristics, - IN PUNICODE_STRING DllName, - OUT PVOID *DllHandle + _In_opt_ PWSTR DllPath, + _In_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *DllHandle ); NTSTATUS NTAPI -LdrGetDllHandleEx(IN ULONG Flags, - IN PWSTR DllPath OPTIONAL, - IN PULONG DllCharacteristics OPTIONAL, - IN PUNICODE_STRING DllName, - OUT PVOID *DllHandle OPTIONAL); +LdrGetDllHandleEx( + _In_ ULONG Flags, + _In_opt_ PWSTR DllPath, + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_opt_ PVOID *DllHandle); NTSTATUS NTAPI LdrFindEntryForAddress( - IN PVOID Address, - OUT PLDR_DATA_TABLE_ENTRY *Module + _In_ PVOID Address, + _Out_ PLDR_DATA_TABLE_ENTRY *Module ); NTSTATUS NTAPI LdrGetProcedureAddress( - IN PVOID BaseAddress, - IN PANSI_STRING Name, - IN ULONG Ordinal, - OUT PVOID *ProcedureAddress + _In_ PVOID BaseAddress, + _In_ PANSI_STRING Name, + _In_ ULONG Ordinal, + _Out_ PVOID *ProcedureAddress ); VOID @@ -252,38 +254,38 @@ LdrInitializeThunk( NTSTATUS NTAPI LdrLoadDll( - IN PWSTR SearchPath OPTIONAL, - IN PULONG LoadFlags OPTIONAL, - IN PUNICODE_STRING Name, - OUT PVOID *BaseAddress OPTIONAL + _In_opt_ PWSTR SearchPath, + _In_opt_ PULONG LoadFlags, + _In_ PUNICODE_STRING Name, + _Out_opt_ PVOID *BaseAddress ); PIMAGE_BASE_RELOCATION NTAPI LdrProcessRelocationBlock( - IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONG_PTR Delta + _In_ ULONG_PTR Address, + _In_ ULONG Count, + _In_ PUSHORT TypeOffset, + _In_ LONG_PTR Delta ); NTSTATUS NTAPI LdrQueryImageFileExecutionOptions( - IN PUNICODE_STRING SubKey, - IN PCWSTR ValueName, - IN ULONG ValueSize, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG RetunedLength OPTIONAL + _In_ PUNICODE_STRING SubKey, + _In_ PCWSTR ValueName, + _In_ ULONG ValueSize, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG RetunedLength ); NTSTATUS NTAPI LdrQueryProcessModuleInformation( - IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, - IN ULONG Size OPTIONAL, - OUT PULONG ReturnedSize + _In_opt_ PRTL_PROCESS_MODULES ModuleInformation, + _In_opt_ ULONG Size, + _Out_ PULONG ReturnedSize ); NTSTATUS @@ -301,36 +303,36 @@ LdrShutdownThread( NTSTATUS NTAPI LdrUnloadDll( - IN PVOID BaseAddress + _In_ PVOID BaseAddress ); typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PCHAR Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum( - IN HANDLE FileHandle, - IN PLDR_CALLBACK Callback, - IN PVOID CallbackContext, - OUT PUSHORT ImageCharacterstics + _In_ HANDLE FileHandle, + _In_ PLDR_CALLBACK Callback, + _In_ PVOID CallbackContext, + _Out_ PUSHORT ImageCharacterstics ); NTSTATUS NTAPI LdrOpenImageFileOptionsKey( - IN PUNICODE_STRING SubKey, - IN BOOLEAN Wow64, - OUT PHANDLE NewKeyHandle + _In_ PUNICODE_STRING SubKey, + _In_ BOOLEAN Wow64, + _Out_ PHANDLE NewKeyHandle ); NTSTATUS NTAPI LdrQueryImageFileKeyOption( - IN HANDLE KeyHandle, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL + _In_ HANDLE KeyHandle, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength ); #endif diff --git a/reactos/include/ndk/vffuncs.h b/reactos/include/ndk/vffuncs.h index abecb6480c5..1ee2056d1b9 100644 --- a/reactos/include/ndk/vffuncs.h +++ b/reactos/include/ndk/vffuncs.h @@ -33,20 +33,20 @@ Author: BOOLEAN NTAPI VfIsVerificationEnabled( - IN VF_OBJECT_TYPE VfObjectType, - IN PVOID Object OPTIONAL + _In_ VF_OBJECT_TYPE VfObjectType, + _In_opt_ PVOID Object ); - + VOID NTAPI VfFailDeviceNode( - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN ULONG BugCheckMajorCode, - IN ULONG BugCheckMinorCode, - IN VF_FAILURE_CLASS FailureClass, - IN OUT PULONG AssertionControl, - IN PSTR DebuggerMessageText, - IN PSTR ParameterFormatString, + _In_ PDEVICE_OBJECT PhysicalDeviceObject, + _In_ ULONG BugCheckMajorCode, + _In_ ULONG BugCheckMinorCode, + _In_ VF_FAILURE_CLASS FailureClass, + _Inout_ PULONG AssertionControl, + _In_ PSTR DebuggerMessageText, + _In_ PSTR ParameterFormatString, ... ); #endif diff --git a/reactos/include/psdk/driverspecs.h b/reactos/include/psdk/driverspecs.h index 184f140a5cb..a70b665fed7 100644 --- a/reactos/include/psdk/driverspecs.h +++ b/reactos/include/psdk/driverspecs.h @@ -123,6 +123,7 @@ #define _IRQL_raises_(irql) #define _IRQL_requires_(irql) #define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) +#define _IRQL_requires_max_defined #define _IRQL_requires_min_(irql) #define _IRQL_requires_same_ #define _IRQL_restores_ diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h index 52f00495cf6..86400e75615 100644 --- a/reactos/include/psdk/sal.h +++ b/reactos/include/psdk/sal.h @@ -416,7 +416,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define __inner_typefix(ctype) [SAL_typefix(p1=#ctype)] #define _Group_(annos) [SAL_begin] annos [SAL_end] #define _When_(expr, annos) [SAL_when(p1=_SA_SPECSTRIZE(expr))] _Group_(annos) -#define _At_(target, annos) [SAL_at(p1=#target)] _Group_(annos) +#define _At_(target, annos) [SAL_at(p1=_SA_SPECSTRIZE(target))] _Group_(annos) #define _At_buffer_(target, iter, bound, annos) [SAL_at_buffer(p1=#target, p2=#iter, p3=#bound)] [SAL_begin] annos [SAL_end] #define _On_failure_(annos) [SAL_context(p1="SAL_failed")] _Group_(_Post_ _Group_(annos)) #define _Always_(annos) _Group_(annos) _On_failure_(annos) @@ -448,7 +448,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_out_z_ //#define _Deref_out_z_bytecap_c_(size) //#define _Deref_out_z_cap_c_(size) -//#define _Deref_post_bytecap_(size) +#define _Deref_post_bytecap_(size) //#define _Deref_post_bytecap_c_(size) //#define _Deref_post_bytecap_x_(size) //#define _Deref_post_bytecount_(size) @@ -654,7 +654,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _In_z_count_(size) //#define _In_z_count_c_(size) #define _Inout_ _SAL2_Name(_Inout_) _Group_(_Prepost_valid_) -//#define _Inout_bytecap_(size) +#define _Inout_bytecap_(size) //#define _Inout_bytecap_c_(size) //#define _Inout_bytecap_x_(size) #define _Inout_bytecount_(size) @@ -871,7 +871,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Post_notnull_ _SAL2_Name(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Post_null_ #define _Post_ptr_invalid_ _SAL2_Name(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) -//#define _Post_readable_byte_size_(size) +#define _Post_readable_byte_size_(size) //#define _Post_readable_size_(size) #define _Post_satisfies_(cond) #define _Post_valid_ _SAL2_Name(_Post_valid_) _Group_([SA_Post(Valid=SA_Yes)]) @@ -942,6 +942,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Pre_readable_size_(size) //#define _Pre_readonly_ #define _Pre_satisfies_(cond) +#define _Pre_unknown_ //#define _Pre_valid_ //#define _Pre_valid_bytecap_(size) //#define _Pre_valid_bytecap_c_(size) @@ -1016,7 +1017,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Ret_opt_count_c_(size) //#define _Ret_opt_count_x_(size) //#define _Ret_opt_valid_ -//#define _Ret_opt_z_ +#define _Ret_opt_z_ //#define _Ret_opt_z_bytecap_(size) //#define _Ret_opt_z_bytecount_(size) //#define _Ret_opt_z_cap_(size) @@ -1045,7 +1046,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Success_(expr) _SAL2_Name(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Unchanged_(e) //#define _Use_decl_annotations_ -//#define _Valid_ +#define _Valid_ #define _Writable_bytes_(size) _SAL2_Name(_Writable_bytes_) _Group_(_SA_annotes1(SAL_writableTo, byteCount(size))) #define _Writable_elements_(size) _SAL2_Name(_Writable_elements_) _Group_(_SA_annotes1(SAL_writableTo, elementCount(size))) @@ -1622,6 +1623,7 @@ __PRIMOP(int, _In_function_class_(__In_impl_ char*);) #define _Pre_readable_size_(size) #define _Pre_readonly_ #define _Pre_satisfies_(cond) +#define _Pre_unknown_ #define _Pre_valid_ #define _Pre_valid_bytecap_(size) #define _Pre_valid_bytecap_c_(size) diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index ae16f2337b0..053bfbea3ee 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -3914,7 +3914,7 @@ NTSYSAPI VOID NTAPI RtlCaptureContext( - PCONTEXT ContextRecord + _Out_ PCONTEXT ContextRecord ); NTSYSAPI @@ -3928,12 +3928,11 @@ RtlPcToFileHeader( NTSYSAPI VOID NTAPI -RtlUnwind ( - IN PVOID TargetFrame OPTIONAL, - IN PVOID TargetIp OPTIONAL, - IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, - IN PVOID ReturnValue - ); +RtlUnwind( + _In_opt_ PVOID TargetFrame, + _In_opt_ PVOID TargetIp, + _In_opt_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PVOID ReturnValue); #define RTL_SRWLOCK_INIT {0} diff --git a/reactos/include/xdk/kdfuncs.h b/reactos/include/xdk/kdfuncs.h index 8143dd2da1b..e05c86500d8 100644 --- a/reactos/include/xdk/kdfuncs.h +++ b/reactos/include/xdk/kdfuncs.h @@ -168,7 +168,7 @@ NTSYSAPI VOID NTAPI DbgBreakPointWithStatus( - IN ULONG Status); + _In_ ULONG Status); #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ diff --git a/reactos/include/xdk/kefuncs.h b/reactos/include/xdk/kefuncs.h index d33a8a4f34f..06196cce606 100644 --- a/reactos/include/xdk/kefuncs.h +++ b/reactos/include/xdk/kefuncs.h @@ -2,21 +2,6 @@ * Kernel Functions * ******************************************************************************/ $if (_WDMDDK_) -#if defined(_M_IX86) -$include(x86/ke.h) -#elif defined(_M_AMD64) -$include(amd64/ke.h) -#elif defined(_M_IA64) -$include(ia64/ke.h) -#elif defined(_M_PPC) -$include(ppc/ke.h) -#elif defined(_M_MIPS) -$include(mips/ke.h) -#elif defined(_M_ARM) -$include(arm/ke.h) -#else -#error Unknown Architecture -#endif NTKERNELAPI VOID diff --git a/reactos/include/xdk/ketypes.h b/reactos/include/xdk/ketypes.h index 6e26cbeaf82..f65c9a6e47d 100644 --- a/reactos/include/xdk/ketypes.h +++ b/reactos/include/xdk/ketypes.h @@ -992,6 +992,45 @@ extern PCCHAR KeNumberProcessors; $endif (_WDMDDK_) $if (_NTDDK_) +typedef struct _NT_TIB { + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + PVOID StackBase; + PVOID StackLimit; + PVOID SubSystemTib; + _ANONYMOUS_UNION union { + PVOID FiberData; + ULONG Version; + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; + struct _NT_TIB *Self; +} NT_TIB, *PNT_TIB; + +typedef struct _NT_TIB32 { + ULONG ExceptionList; + ULONG StackBase; + ULONG StackLimit; + ULONG SubSystemTib; + _ANONYMOUS_UNION union { + ULONG FiberData; + ULONG Version; + } DUMMYUNIONNAME; + ULONG ArbitraryUserPointer; + ULONG Self; +} NT_TIB32,*PNT_TIB32; + +typedef struct _NT_TIB64 { + ULONG64 ExceptionList; + ULONG64 StackBase; + ULONG64 StackLimit; + ULONG64 SubSystemTib; + _ANONYMOUS_UNION union { + ULONG64 FiberData; + ULONG Version; + } DUMMYUNIONNAME; + ULONG64 ArbitraryUserPointer; + ULONG64 Self; +} NT_TIB64,*PNT_TIB64; + #define NX_SUPPORT_POLICY_ALWAYSOFF 0 #define NX_SUPPORT_POLICY_ALWAYSON 1 #define NX_SUPPORT_POLICY_OPTIN 2 @@ -1198,3 +1237,21 @@ typedef struct _KQUEUE { $endif (_NTIFS_) +$if (_WDMDDK_) +#if defined(_M_IX86) +$include(x86/ke.h) +#elif defined(_M_AMD64) +$include(amd64/ke.h) +#elif defined(_M_IA64) +$include(ia64/ke.h) +#elif defined(_M_PPC) +$include(ppc/ke.h) +#elif defined(_M_MIPS) +$include(mips/ke.h) +#elif defined(_M_ARM) +$include(arm/ke.h) +#else +#error Unknown Architecture +#endif +$endif (_WDMDDK_) + diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h index 16bc7a2df0e..d819d84c816 100644 --- a/reactos/include/xdk/ntifs.template.h +++ b/reactos/include/xdk/ntifs.template.h @@ -371,7 +371,7 @@ NTSTATUS NTAPI NtAllocateVirtualMemory( _In_ HANDLE ProcessHandle, - _Outptr_result_bytebuffer_(*RegionSize) PVOID *BaseAddress, + _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, _In_ ULONG_PTR ZeroBits, _Inout_ PSIZE_T RegionSize, _In_ ULONG AllocationType, @@ -1771,19 +1771,20 @@ FsRtlNotifyChangeDirectory ( IN PIRP NotifyIrp ); +#if 1 NTKERNELAPI NTSTATUS NTAPI -ObCreateObject ( - IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - IN ULONG ObjectSize, - IN ULONG PagedPoolCharge OPTIONAL, - IN ULONG NonPagedPoolCharge OPTIONAL, - OUT PVOID *Object +ObCreateObject( + _In_opt_ KPROCESSOR_MODE ObjectAttributesAccessMode, + _In_ POBJECT_TYPE ObjectType, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _In_ ULONG ObjectSize, + _In_opt_ ULONG PagedPoolCharge, + _In_opt_ ULONG NonPagedPoolCharge, + _Out_ PVOID *Object ); NTKERNELAPI @@ -1852,6 +1853,8 @@ ZwAdjustPrivilegesToken ( #endif /* (VER_PRODUCTBUILD >= 2195) */ +#endif + NTSYSAPI NTSTATUS NTAPI @@ -2000,17 +2003,18 @@ ZwQueryDefaultLocale ( #if (VER_PRODUCTBUILD >= 2195) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI -ZwQueryDirectoryObject ( - IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL +ZwQueryDirectoryObject( + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength ); #endif /* (VER_PRODUCTBUILD >= 2195) */ diff --git a/reactos/include/xdk/pstypes.h b/reactos/include/xdk/pstypes.h index 3786b0ca228..2e183720079 100644 --- a/reactos/include/xdk/pstypes.h +++ b/reactos/include/xdk/pstypes.h @@ -229,45 +229,6 @@ typedef VOID #define PROCESS_HANDLE_TRACING_MAX_STACKS 16 -typedef struct _NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; - PVOID StackBase; - PVOID StackLimit; - PVOID SubSystemTib; - _ANONYMOUS_UNION union { - PVOID FiberData; - ULONG Version; - } DUMMYUNIONNAME; - PVOID ArbitraryUserPointer; - struct _NT_TIB *Self; -} NT_TIB, *PNT_TIB; - -typedef struct _NT_TIB32 { - ULONG ExceptionList; - ULONG StackBase; - ULONG StackLimit; - ULONG SubSystemTib; - _ANONYMOUS_UNION union { - ULONG FiberData; - ULONG Version; - } DUMMYUNIONNAME; - ULONG ArbitraryUserPointer; - ULONG Self; -} NT_TIB32,*PNT_TIB32; - -typedef struct _NT_TIB64 { - ULONG64 ExceptionList; - ULONG64 StackBase; - ULONG64 StackLimit; - ULONG64 SubSystemTib; - _ANONYMOUS_UNION union { - ULONG64 FiberData; - ULONG Version; - } DUMMYUNIONNAME; - ULONG64 ArbitraryUserPointer; - ULONG64 Self; -} NT_TIB64,*PNT_TIB64; - typedef enum _PROCESSINFOCLASS { ProcessBasicInformation, ProcessQuotaLimits, diff --git a/reactos/include/xdk/rtlfuncs.h b/reactos/include/xdk/rtlfuncs.h index 759e1652ede..a5b8f64a6b9 100644 --- a/reactos/include/xdk/rtlfuncs.h +++ b/reactos/include/xdk/rtlfuncs.h @@ -218,7 +218,7 @@ RtlGUIDFromString( _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) NTSYSAPI VOID NTAPI @@ -573,13 +573,15 @@ RtlInitAnsiString( _Out_ PANSI_STRING DestinationString, _In_opt_z_ __drv_aliasesMem PCSZ SourceString); +_At_(BitMapHeader->SizeOfBitMap, _Post_equal_to_(SizeOfBitMap)) +_At_(BitMapHeader->Buffer, _Post_equal_to_(BitMapBuffer)) NTSYSAPI VOID NTAPI RtlInitializeBitMap( _Out_ PRTL_BITMAP BitMapHeader, - _In_ __drv_aliasesMem PULONG BitMapBuffer, - _In_ ULONG SizeOfBitMap); + _In_opt_ __drv_aliasesMem PULONG BitMapBuffer, + _In_opt_ ULONG SizeOfBitMap); _IRQL_requires_max_(DISPATCH_LEVEL) NTSYSAPI @@ -648,12 +650,12 @@ NTSYSAPI NTSTATUS NTAPI RtlQueryRegistryValues( - _In_ ULONG RelativeTo, - _In_ PCWSTR Path, - _Inout_ _At_(*(*QueryTable).EntryContext, _Post_valid_) - PRTL_QUERY_REGISTRY_TABLE QueryTable, - _In_opt_ PVOID Context, - _In_opt_ PVOID Environment); + _In_ ULONG RelativeTo, + _In_ PCWSTR Path, + _Inout_ _At_(*(*QueryTable).EntryContext, _Pre_unknown_) + PRTL_QUERY_REGISTRY_TABLE QueryTable, + _In_opt_ PVOID Context, + _In_opt_ PVOID Environment); #define SHORT_SIZE (sizeof(USHORT)) #define SHORT_MASK (SHORT_SIZE - 1) @@ -901,6 +903,27 @@ NTAPI RtlValidSecurityDescriptor( _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +RtlGetVersion( + _Out_ + _At_(lpVersionInformation->dwOSVersionInfoSize, _Pre_ _Valid_) + _When_(lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW), + _At_((PRTL_OSVERSIONINFOEXW)lpVersionInformation, _Out_)) + PRTL_OSVERSIONINFOW lpVersionInformation); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlVerifyVersionInfo( + _In_ PRTL_OSVERSIONINFOEXW VersionInfo, + _In_ ULONG TypeMask, + _In_ ULONGLONG ConditionMask); + _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS @@ -1106,20 +1129,6 @@ RtlVolumeDeviceToDosName( _In_ PVOID VolumeDeviceObject, _Out_ PUNICODE_STRING DosName); -NTSYSAPI -NTSTATUS -NTAPI -RtlGetVersion( - IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); - -NTSYSAPI -NTSTATUS -NTAPI -RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask); - _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ NTSYSAPI diff --git a/reactos/include/xdk/rtltypes.h b/reactos/include/xdk/rtltypes.h index 87c6bea5b91..0b61c724921 100644 --- a/reactos/include/xdk/rtltypes.h +++ b/reactos/include/xdk/rtltypes.h @@ -221,6 +221,68 @@ typedef BOOLEAN (*PFN_RTL_IS_SERVICE_PACK_VERSION_INSTALLED)( _In_ ULONG Version); +typedef struct _OSVERSIONINFOA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; +} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; + +typedef struct _OSVERSIONINFOW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; +} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; + +typedef struct _OSVERSIONINFOEXA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; + +typedef struct _OSVERSIONINFOEXW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; + +#ifdef UNICODE +typedef OSVERSIONINFOEXW OSVERSIONINFOEX; +typedef POSVERSIONINFOEXW POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; +typedef OSVERSIONINFOW OSVERSIONINFO; +typedef POSVERSIONINFOW POSVERSIONINFO; +typedef LPOSVERSIONINFOW LPOSVERSIONINFO; +#else +typedef OSVERSIONINFOEXA OSVERSIONINFOEX; +typedef POSVERSIONINFOEXA POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; +typedef OSVERSIONINFOA OSVERSIONINFO; +typedef POSVERSIONINFOA POSVERSIONINFO; +typedef LPOSVERSIONINFOA LPOSVERSIONINFO; +#endif /* UNICODE */ + $endif (_WDMDDK_) $if (_NTDDK_) @@ -461,68 +523,6 @@ typedef struct _RTL_DYNAMIC_HASH_TABLE { PVOID Directory; } RTL_DYNAMIC_HASH_TABLE, *PRTL_DYNAMIC_HASH_TABLE; -typedef struct _OSVERSIONINFOA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; -} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; - -typedef struct _OSVERSIONINFOW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; -} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; - -typedef struct _OSVERSIONINFOEXA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; - -typedef struct _OSVERSIONINFOEXW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; - -#ifdef UNICODE -typedef OSVERSIONINFOEXW OSVERSIONINFOEX; -typedef POSVERSIONINFOEXW POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; -typedef OSVERSIONINFOW OSVERSIONINFO; -typedef POSVERSIONINFOW POSVERSIONINFO; -typedef LPOSVERSIONINFOW LPOSVERSIONINFO; -#else -typedef OSVERSIONINFOEXA OSVERSIONINFOEX; -typedef POSVERSIONINFOEXA POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; -typedef OSVERSIONINFOA OSVERSIONINFO; -typedef POSVERSIONINFOA POSVERSIONINFO; -typedef LPOSVERSIONINFOA LPOSVERSIONINFO; -#endif /* UNICODE */ - #define HASH_ENTRY_KEY(x) ((x)->Signature) $endif (_NTDDK_) diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h index a18ce71db5d..2cbe9da7754 100644 --- a/reactos/include/xdk/wdm.template.h +++ b/reactos/include/xdk/wdm.template.h @@ -116,7 +116,7 @@ extern "C" { #pragma warning(disable:4115) /* Named type definition in parentheses */ #pragma warning(disable:4201) /* Nameless unions and structs */ #pragma warning(disable:4214) /* Bit fields of other types than int */ -#pragma warning(disable:4820) /* Padding added, due to alignemnet requirement */ +#pragma warning(disable:4820) /* Padding added, due to alignment requirement */ /* Indicate if #pragma alloc_text() is supported */ #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) From 823910690a2c63951a274442fcd5fee03c413a8f Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 13 Jan 2013 15:02:38 +0000 Subject: [PATCH 12/71] [NDK] Revert accidental changes. svn path=/trunk/; revision=58165 --- reactos/include/ndk/lgpl.txt | 8 ++++---- reactos/include/ndk/ndk.txt | 8 ++++---- reactos/include/ndk/readme.txt | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/reactos/include/ndk/lgpl.txt b/reactos/include/ndk/lgpl.txt index 105c3c36e24..f166cc57b27 100755 --- a/reactos/include/ndk/lgpl.txt +++ b/reactos/include/ndk/lgpl.txt @@ -436,7 +436,7 @@ and reuse of software generally. 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED _In_ WRITING THE COPYRIGHT HOLDERS AND/OR +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -444,11 +444,11 @@ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 16. _In_ NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING _Out_ OF THE USE OR INABILITY TO USE THE +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF @@ -499,4 +499,4 @@ necessary. Here is a sample; alter the names: , 1 April 1990 Ty Coon, President of Vice -That's all there is to it! +That's all there is to it! \ No newline at end of file diff --git a/reactos/include/ndk/ndk.txt b/reactos/include/ndk/ndk.txt index 44c71be6862..a4a63878e46 100755 --- a/reactos/include/ndk/ndk.txt +++ b/reactos/include/ndk/ndk.txt @@ -14,16 +14,16 @@ the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY ALEX IONESCU ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. _In_ NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS +ARE DISCLAIMED. IN NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER _In_ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING _In_ ANY WAY _Out_ OF THE USE OF THIS SOFTWARE, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Alex Ionescu or -the NDK Project Contributors. +the NDK Project Contributors. \ No newline at end of file diff --git a/reactos/include/ndk/readme.txt b/reactos/include/ndk/readme.txt index cf1898a6ba9..0b67c2dd0bc 100644 --- a/reactos/include/ndk/readme.txt +++ b/reactos/include/ndk/readme.txt @@ -42,7 +42,7 @@ software. You MUST read GPL.TXT or LGPL.TXT after your decision. Violating your chosen license voids your usage rights of the NDK and will lead to legal action on the part of the author. Using this software with any later version of the GNU GPL or LGPL in no way -changes your obligations under the versions listed above. You MUST still release the +changes your obligations under the versions listed above. You MUST still release the NDK and its changes under the terms of the original licenses (either GPLv2 or LGPLv2.1) as listed above. This DOES NOT AFFECT the license of a software package released under a later version and ONLY serves to clarify that using the NDK with a later version is @@ -152,36 +152,36 @@ remain anonymous, simply do not include this statement. 3.1 ORGANIZATION - * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). - * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). + * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). + * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). * The NDK can either be included on-demand (#include ) or globally (#include ). - The former is recommended to reduce compile time. + The former is recommended to reduce compile time. * The NDK is structured by function and type. Every Subsystem Component has an associated "xxfuncs.h" and - "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) + "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) * The NDK has a special file called "umtypes.h" which exports to User-Mode or Native-Mode Applications the basic NT types which are present in ntdef.h. This file cannot be included since it would conflict with winnt.h and/or windef.h. Thus, umtypes.h provides the missing types. This file is automatically included - in a User-Mode NDK project. + in a User-Mode NDK project. * The NDK also includes a file called "umfuncs.h" which exports to User-Mode or Native-Mode Applications - undocumented functions which can only be accessed from ntdll.dll. + undocumented functions which can only be accessed from ntdll.dll. * The NDK has another special file called "ifssupp.h", which exports to Kernel-Mode drivers a few types which are only documented in the IFS kit, and are part of some native definitions. It will be deprecated next year - with the release of the WDK. + with the release of the WDK. -3.2 USING _In_ YOUR PROJECT +3.2 USING IN YOUR PROJECT - * User Mode Application requiring Native Types: + * User Mode Application requiring Native Types: #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ #include "windows.h" /* Declare Windows Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ - * Native Mode Application: + * Native Mode Application: #include "windows.h" /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ #include "ntndk.h" /* Declare the NDK Headers */ - * Kernel Mode Driver: + * Kernel Mode Driver: #include "ntddk.h" /* Declare DDK Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ From ce07958bd918312a57ab3dcf9e9eeb2ac8ea7631 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 13 Jan 2013 19:51:33 +0000 Subject: [PATCH 13/71] [SAMSRV] Implement SamrGetMembersInGroup. svn path=/trunk/; revision=58170 --- reactos/dll/win32/samsrv/samrpc.c | 96 ++++++++++++++++++++++++++++++- reactos/dll/win32/samsrv/samsrv.h | 16 ++++-- reactos/dll/win32/samsrv/user.c | 68 ++++++++++++++++++++++ 3 files changed, 173 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 27516bbab80..6d7a257a1ed 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -4055,10 +4055,102 @@ NTAPI SamrGetMembersInGroup(IN SAMPR_HANDLE GroupHandle, OUT PSAMPR_GET_MEMBERS_BUFFER *Members) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAMPR_GET_MEMBERS_BUFFER MembersBuffer = NULL; + PSAM_DB_OBJECT GroupObject; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_LIST_MEMBERS, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + MembersBuffer = midl_user_allocate(sizeof(SAMPR_GET_MEMBERS_BUFFER)); + if (MembersBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + + if (Length == 0) + { + MembersBuffer->MemberCount = 0; + MembersBuffer->Members = NULL; + MembersBuffer->Attributes = NULL; + + *Members = MembersBuffer; + + return STATUS_SUCCESS; + } + + MembersBuffer->Members = midl_user_allocate(Length); + if (MembersBuffer->Members == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + MembersBuffer->Attributes = midl_user_allocate(Length); + if (MembersBuffer->Attributes == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + MembersBuffer->Members, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttributes() failed (Status 0x%08lx)\n", Status); + goto done; + } + + MembersBuffer->MemberCount = Length / sizeof(ULONG); + + for (i = 0; i < MembersBuffer->MemberCount; i++) + { + Status = SampGetUserGroupAttributes(GroupObject->ParentObject, + MembersBuffer->Members[i], + GroupObject->RelativeId, + &(MembersBuffer->Attributes[i])); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetUserGroupAttributes() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + + *Members = MembersBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (MembersBuffer != NULL) + { + if (MembersBuffer->Members != NULL) + midl_user_free(MembersBuffer->Members); + + if (MembersBuffer->Attributes != NULL) + midl_user_free(MembersBuffer->Attributes); + + midl_user_free(MembersBuffer); + } + } + + return Status; } + /* Function 26 */ NTSTATUS NTAPI diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index eab66474d3e..7de5ce15cfb 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -271,12 +271,18 @@ SampOpenUserObject(IN PSAM_DB_OBJECT DomainObject, OUT PSAM_DB_OBJECT *UserObject); NTSTATUS -SampAddGroupMembershipToUser(PSAM_DB_OBJECT UserObject, - ULONG GroupId, - ULONG Attributes); +SampAddGroupMembershipToUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId, + IN ULONG Attributes); NTSTATUS -SampRemoveGroupMembershipFromUser(PSAM_DB_OBJECT UserObject, - ULONG GroupId); +SampRemoveGroupMembershipFromUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId); + +NTSTATUS +SampGetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ULONG GroupId, + OUT PULONG GroupAttributes); /* EOF */ diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c index be7042ee4bf..f3174c627a5 100644 --- a/reactos/dll/win32/samsrv/user.c +++ b/reactos/dll/win32/samsrv/user.c @@ -185,4 +185,72 @@ done: return Status; } + +NTSTATUS +SampGetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ULONG GroupId, + OUT PULONG GroupAttributes) +{ + PSAM_DB_OBJECT UserObject = NULL; + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampOpenUserObject(DomainObject, + UserId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Length == 0) + { + *GroupAttributes = 0; + return STATUS_SUCCESS; + } + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + for (i = 0; i < (Length / sizeof(GROUP_MEMBERSHIP)); i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + *GroupAttributes = GroupsBuffer[i].Attributes; + goto done; + } + } + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + if (UserObject != NULL) + SampCloseDbObject(UserObject); + + return Status; +} + /* EOF */ From 6864baa2aa5a41e36e7a4445ead3eda0555c6ae6 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 13 Jan 2013 20:13:30 +0000 Subject: [PATCH 14/71] =?UTF-8?q?[EXPLORER=5FNEW]=20-=20Check=20policy=20b?= =?UTF-8?q?efore=20processing=20startup=20items.=20Simplify=20startup=20co?= =?UTF-8?q?de.=20Patch=20by=20Edijs=20Kolesnikovi=C4=8Ds.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=58171 --- reactos/base/shell/explorer-new/explorer.c | 2 +- reactos/base/shell/explorer-new/precomp.h | 3 +- reactos/base/shell/explorer-new/startup.c | 79 +++++----------------- 3 files changed, 20 insertions(+), 64 deletions(-) diff --git a/reactos/base/shell/explorer-new/explorer.c b/reactos/base/shell/explorer-new/explorer.c index 0322a6c1f54..5bb3c474aa0 100644 --- a/reactos/base/shell/explorer-new/explorer.c +++ b/reactos/base/shell/explorer-new/explorer.c @@ -401,7 +401,7 @@ _tWinMain(IN HINSTANCE hInstance, if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); - startup(0, NULL); + ProcessStartupItems(); } else { diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h index 2ff7c74f4fa..d65c4dc2048 100644 --- a/reactos/base/shell/explorer-new/precomp.h +++ b/reactos/base/shell/explorer-new/precomp.h @@ -260,7 +260,8 @@ SaveSettingDword(IN PCTSTR pszKeyName, * startup.c */ -int startup(int argc, const char *argv[]); +int +ProcessStartupItems(VOID); /* * trayprop.h diff --git a/reactos/base/shell/explorer-new/startup.c b/reactos/base/shell/explorer-new/startup.c index a135201ccee..b59fda32e89 100644 --- a/reactos/base/shell/explorer-new/startup.c +++ b/reactos/base/shell/explorer-new/startup.c @@ -45,18 +45,6 @@ EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); -enum runkeys { - RUNKEY_RUN, RUNKEY_RUNONCE, RUNKEY_RUNSERVICES, RUNKEY_RUNSERVICESONCE -}; - -const WCHAR runkeys_names[][30]= -{ - {'R','u','n',0}, - {'R','u','n','O','n','c','e',0}, - {'R','u','n','S','e','r','v','i','c','e','s',0}, - {'R','u','n','S','e','r','v','i','c','e','s','O','n','c','e',0} -}; - #define INVALID_RUNCMD_RETURN -1 /** * This function runs the specified command in the specified dir. @@ -245,24 +233,11 @@ end: return res == ERROR_SUCCESS ? TRUE : FALSE; } - /// structure holding startup flags -struct op_mask { - BOOL w9xonly; /* Perform only operations done on Windows 9x */ - BOOL ntonly; /* Perform only operations done on Windows NT */ - BOOL startup; /* Perform the operations that are performed every boot */ - BOOL preboot; /* Perform file renames typically done before the system starts */ - BOOL prelogin; /* Perform the operations typically done before the user logs in */ - BOOL postlogin; /* Operations done after login */ -}; -static const struct op_mask - SESSION_START = {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE}, - SETUP = {FALSE, FALSE, FALSE, TRUE, TRUE, TRUE}; -#define DEFAULT SESSION_START - -int startup(int argc, const char *argv[]) +int +ProcessStartupItems(VOID) { - struct op_mask ops; /* Which of the ops do we want to perform? */ + BOOL bNormalBoot = GetSystemMetrics(SM_CLEANBOOT) == 0; /* Perform the operations that are performed every boot */ /* First, set the current directory to SystemRoot */ TCHAR gen_path[MAX_PATH]; DWORD res; @@ -305,41 +280,21 @@ int startup(int argc, const char *argv[]) } } - if (argc > 1) - { - switch(argv[1][0]) - { - case 'r': /* Restart */ - ops = SETUP; - break; - case 's': /* Full start */ - ops = SESSION_START; - break; - default: - ops = DEFAULT; - break; - } - } - else - ops = DEFAULT; - - /* do not run certain items in Safe Mode */ - if (GetSystemMetrics(SM_CLEANBOOT)) ops.startup = FALSE; - - /* Perform the ops by order, stopping if one fails, skipping if necessary */ + /* Perform the operations by order checking if policy allows it, checking if this is not Safe Mode, + * stopping if one fails, skipping if necessary. + */ res = TRUE; - if (res && !ops.ntonly && ops.prelogin) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE); - if (res && !ops.ntonly && ops.prelogin && ops.startup) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE); - if (res && ops.postlogin) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE); - if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); - if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); - if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE, FALSE); + if (res && (SHRestricted(REST_NOLOCALMACHINERUNONCE) == 0)) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE); + + if (res && bNormalBoot && (SHRestricted(REST_NOLOCALMACHINERUN) == 0)) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, L"Run", FALSE, FALSE); + + if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) + res = ProcessRunKeys(HKEY_CURRENT_USER, L"Run", FALSE, FALSE); + + if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) + res = ProcessRunKeys(HKEY_CURRENT_USER, L"RunOnce", TRUE, FALSE); printf("Operation done\n"); From 70ff0357a018fe7b21a78c748d9b5500a6b504ab Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Mon, 14 Jan 2013 09:31:15 +0000 Subject: [PATCH 15/71] [MSVCRT] - Improve file description. Patch by Lee Schroeder. CORE-6895 #resolve svn path=/trunk/; revision=58172 --- reactos/dll/win32/msvcrt/msvcrt.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/win32/msvcrt/msvcrt.rc b/reactos/dll/win32/msvcrt/msvcrt.rc index d4c583c2a18..78ed57e9844 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.rc +++ b/reactos/dll/win32/msvcrt/msvcrt.rc @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "MSVCRT.DLL Compatibility Library\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS C Runtime Library\0" #define REACTOS_STR_INTERNAL_NAME "msvcrt\0" #define REACTOS_STR_ORIGINAL_FILENAME "msvcrt.dll\0" From 69bc32e0f65c301927cdfec370d6232b6ffeeb33 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 14 Jan 2013 09:35:50 +0000 Subject: [PATCH 16/71] [RTL/NTOSKRNL] - Seperate some usermode only heap functions into their own file and implement dummys in the kernel rtl so that they don't get included in the kernel - Convert usage of RTL_CRITICAL_SECTION in heappage.c to use of HEAP_LOCK - Implement A kernel dummy for RtlCallVectoredExceptionHandlers, so we don't put vectored exception handler code into ntoskrnl - Now we don't have critical section code in the kernel anymore, which wasn't working anyway. svn path=/trunk/; revision=58173 --- reactos/dll/ntdll/ldr/ldrinit.c | 2 +- reactos/lib/rtl/CMakeLists.txt | 1 + reactos/lib/rtl/heap.c | 110 --------------------------- reactos/lib/rtl/heap.h | 12 +++ reactos/lib/rtl/heappage.c | 37 +++++---- reactos/lib/rtl/heapuser.c | 128 ++++++++++++++++++++++++++++++++ reactos/lib/rtl/i386/except.c | 12 +-- reactos/ntoskrnl/rtl/libsupp.c | 30 ++++++++ 8 files changed, 194 insertions(+), 138 deletions(-) create mode 100644 reactos/lib/rtl/heapuser.c diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c index fae20993228..f9600cb0f87 100644 --- a/reactos/dll/ntdll/ldr/ldrinit.c +++ b/reactos/dll/ntdll/ldr/ldrinit.c @@ -80,7 +80,7 @@ ULONG LdrpActiveUnloadCount; VOID RtlpInitializeVectoredExceptionHandling(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID); -VOID RtlInitializeHeapManager(VOID); +VOID NTAPI RtlInitializeHeapManager(VOID); extern BOOLEAN RtlpPageHeapEnabled; ULONG RtlpDisableHeapLookaside; // TODO: Move to heap.c diff --git a/reactos/lib/rtl/CMakeLists.txt b/reactos/lib/rtl/CMakeLists.txt index 46b17c26309..57a2312d9b5 100644 --- a/reactos/lib/rtl/CMakeLists.txt +++ b/reactos/lib/rtl/CMakeLists.txt @@ -30,6 +30,7 @@ list(APPEND SOURCE heap.c heapdbg.c heappage.c + heapuser.c image.c interlck.c message.c diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c index 6d0161c7d3f..c41b60dd77a 100644 --- a/reactos/lib/rtl/heap.c +++ b/reactos/lib/rtl/heap.c @@ -23,8 +23,6 @@ #define NDEBUG #include -RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; - /* Bitmaps stuff */ /* How many least significant bits are clear */ @@ -966,98 +964,6 @@ RtlpDestroyHeapSegment(PHEAP_SEGMENT Segment) } } -/* Usermode only! */ -VOID NTAPI -RtlpAddHeapToProcessList(PHEAP Heap) -{ - PPEB Peb; - - /* Get PEB */ - Peb = RtlGetCurrentPeb(); - - /* Acquire the lock */ - RtlEnterCriticalSection(&RtlpProcessHeapsListLock); - - //_SEH2_TRY { - /* Check if max number of heaps reached */ - if (Peb->NumberOfHeaps == Peb->MaximumNumberOfHeaps) - { - // TODO: Handle this case - ASSERT(FALSE); - } - - /* Add the heap to the process heaps */ - Peb->ProcessHeaps[Peb->NumberOfHeaps] = Heap; - Peb->NumberOfHeaps++; - Heap->ProcessHeapsListIndex = (USHORT)Peb->NumberOfHeaps; - // } _SEH2_FINALLY { - - /* Release the lock */ - RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); - - // } _SEH2_END -} - -/* Usermode only! */ -VOID NTAPI -RtlpRemoveHeapFromProcessList(PHEAP Heap) -{ - PPEB Peb; - PHEAP *Current, *Next; - ULONG Count; - - /* Get PEB */ - Peb = RtlGetCurrentPeb(); - - /* Acquire the lock */ - RtlEnterCriticalSection(&RtlpProcessHeapsListLock); - - /* Check if we don't need anything to do */ - if ((Heap->ProcessHeapsListIndex == 0) || - (Heap->ProcessHeapsListIndex > Peb->NumberOfHeaps) || - (Peb->NumberOfHeaps == 0)) - { - /* Release the lock */ - RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); - - return; - } - - /* The process actually has more than one heap. - Use classic, lernt from university times algorithm for removing an entry - from a static array */ - - Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; - Next = Current + 1; - - /* How many items we need to shift to the left */ - Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); - - /* Move them all in a loop */ - while (--Count) - { - /* Copy it and advance next pointer */ - *Current = *Next; - - /* Update its index */ - (*Current)->ProcessHeapsListIndex -= 1; - - /* Advance pointers */ - Current++; - Next++; - } - - /* Decrease total number of heaps */ - Peb->NumberOfHeaps--; - - /* Zero last unused item */ - Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; - Heap->ProcessHeapsListIndex = 0; - - /* Release the lock */ - RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); -} - PHEAP_FREE_ENTRY NTAPI RtlpCoalesceHeap(PHEAP Heap) { @@ -3685,22 +3591,6 @@ BOOLEAN NTAPI RtlValidateHeap( return HeapValid; } -VOID -RtlInitializeHeapManager(VOID) -{ - PPEB Peb; - - /* Get PEB */ - Peb = RtlGetCurrentPeb(); - - /* Initialize heap-related fields of PEB */ - Peb->NumberOfHeaps = 0; - - /* Initialize the process heaps list protecting lock */ - RtlInitializeCriticalSection(&RtlpProcessHeapsListLock); -} - - /* * @implemented */ diff --git a/reactos/lib/rtl/heap.h b/reactos/lib/rtl/heap.h index e76b742e3db..5a54c3f2a1d 100644 --- a/reactos/lib/rtl/heap.h +++ b/reactos/lib/rtl/heap.h @@ -467,4 +467,16 @@ RtlpPageHeapSize(HANDLE HeapPtr, ULONG Flags, PVOID Ptr); +VOID +NTAPI +RtlpAddHeapToProcessList(PHEAP Heap); + +VOID +NTAPI +RtlpRemoveHeapFromProcessList(PHEAP Heap); + +VOID +NTAPI +RtlInitializeHeapManager(VOID); + #endif diff --git a/reactos/lib/rtl/heappage.c b/reactos/lib/rtl/heappage.c index 8698180eda9..cd16910f138 100644 --- a/reactos/lib/rtl/heappage.c +++ b/reactos/lib/rtl/heappage.c @@ -61,7 +61,7 @@ typedef struct _DPH_HEAP_ROOT { ULONG Signature; ULONG HeapFlags; - PRTL_CRITICAL_SECTION HeapCritSect; + PHEAP_LOCK HeapCritSect; ULONG nRemoteLockAcquired; PDPH_HEAP_BLOCK pVirtualStorageListHead; @@ -110,11 +110,11 @@ WCHAR RtlpDphTargetDlls[512]; LIST_ENTRY RtlpDphPageHeapList; BOOLEAN RtlpDphPageHeapListInitialized; -RTL_CRITICAL_SECTION RtlpDphPageHeapListLock; +PHEAP_LOCK RtlpDphPageHeapListLock; ULONG RtlpDphPageHeapListLength; UNICODE_STRING RtlpDphTargetDllsUnicode; -RTL_CRITICAL_SECTION RtlpDphDelayedFreeQueueLock; +PHEAP_LOCK RtlpDphDelayedFreeQueueLock; LIST_ENTRY RtlpDphDelayedFreeQueue; SLIST_HEADER RtlpDphDelayedTemporaryPushList; SIZE_T RtlpDphMemoryUsedByDelayedFreeBlocks; @@ -234,7 +234,7 @@ RtlpDphEnterCriticalSection(PDPH_HEAP_ROOT DphRoot, ULONG Flags) if (Flags & HEAP_NO_SERIALIZE) { /* More complex scenario */ - if (!RtlTryEnterCriticalSection(DphRoot->HeapCritSect)) + if (!RtlEnterHeapLock(DphRoot->HeapCritSect, TRUE)) { if (!DphRoot->nRemoteLockAcquired) { @@ -246,13 +246,13 @@ RtlpDphEnterCriticalSection(PDPH_HEAP_ROOT DphRoot, ULONG Flags) } /* Enter the heap's critical section */ - RtlEnterCriticalSection(DphRoot->HeapCritSect); + RtlEnterHeapLock(DphRoot->HeapCritSect, TRUE); } } else { /* Just enter the heap's critical section */ - RtlEnterCriticalSection(DphRoot->HeapCritSect); + RtlEnterHeapLock(DphRoot->HeapCritSect, TRUE); } } @@ -260,7 +260,7 @@ VOID NTAPI RtlpDphLeaveCriticalSection(PDPH_HEAP_ROOT DphRoot) { /* Just leave the heap's critical section */ - RtlLeaveCriticalSection(DphRoot->HeapCritSect); + RtlLeaveHeapLock(DphRoot->HeapCritSect); } @@ -1161,7 +1161,7 @@ RtlpDphInitializeDelayedFreeQueue() { NTSTATUS Status; - Status = RtlInitializeCriticalSection(&RtlpDphDelayedFreeQueueLock); + Status = RtlInitializeHeapLock(&RtlpDphDelayedFreeQueueLock); if (!NT_SUCCESS(Status)) { // TODO: Log this error! @@ -1192,7 +1192,7 @@ RtlpDphFreeDelayedBlocksFromHeap(PDPH_HEAP_ROOT DphRoot, then it releases the lock and frees the blocks. But let's make it simple for now */ /* Acquire the delayed free queue lock */ - RtlEnterCriticalSection(&RtlpDphDelayedFreeQueueLock); + RtlEnterHeapLock(RtlpDphDelayedFreeQueueLock, TRUE); /* Traverse the list */ Current = RtlpDphDelayedFreeQueue.Flink; @@ -1230,7 +1230,7 @@ RtlpDphFreeDelayedBlocksFromHeap(PDPH_HEAP_ROOT DphRoot, } /* Release the delayed free queue lock */ - RtlLeaveCriticalSection(&RtlpDphDelayedFreeQueueLock); + RtlLeaveHeapLock(RtlpDphDelayedFreeQueueLock); } NTSTATUS NTAPI @@ -1391,7 +1391,7 @@ RtlpDphProcessStartupInitialization() /* Initialize the DPH heap list and its critical section */ InitializeListHead(&RtlpDphPageHeapList); - Status = RtlInitializeCriticalSection(&RtlpDphPageHeapListLock); + Status = RtlInitializeHeapLock(&RtlpDphPageHeapListLock); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -1485,13 +1485,12 @@ RtlpPageHeapCreate(ULONG Flags, /* Initialize the DPH root */ DphRoot->Signature = DPH_SIGNATURE; DphRoot->HeapFlags = Flags; - DphRoot->HeapCritSect = (PRTL_CRITICAL_SECTION)((PCHAR)DphRoot + DPH_POOL_SIZE); DphRoot->ExtraFlags = RtlpDphGlobalFlags; ZwQueryPerformanceCounter(&PerfCounter, NULL); DphRoot->Seed = PerfCounter.LowPart; - RtlInitializeCriticalSection(DphRoot->HeapCritSect); + RtlInitializeHeapLock(&DphRoot->HeapCritSect); InitializeListHead(&DphRoot->AvailableAllocationHead); /* Create a normal heap for this paged heap */ @@ -1539,7 +1538,7 @@ RtlpPageHeapCreate(ULONG Flags, if (!RtlpDphPageHeapListInitialized) RtlpDphProcessStartupInitialization(); /* Acquire the heap list lock */ - RtlEnterCriticalSection(&RtlpDphPageHeapListLock); + RtlEnterHeapLock(RtlpDphPageHeapListLock, TRUE); /* Insert this heap to the tail of the global list */ InsertTailList(&RtlpDphPageHeapList, &DphRoot->NextHeap); @@ -1548,7 +1547,7 @@ RtlpPageHeapCreate(ULONG Flags, RtlpDphPageHeapListLength++; /* Release the heap list lock */ - RtlLeaveCriticalSection(&RtlpDphPageHeapListLock); + RtlLeaveHeapLock(RtlpDphPageHeapListLock); if (RtlpDphDebugOptions & DPH_DEBUG_VERBOSE) { @@ -1611,18 +1610,18 @@ RtlpPageHeapDestroy(HANDLE HeapPtr) } /* Acquire the global heap list lock */ - RtlEnterCriticalSection(&RtlpDphPageHeapListLock); + RtlEnterHeapLock(RtlpDphPageHeapListLock, TRUE); /* Remove the entry and decrement the global counter */ RemoveEntryList(&DphRoot->NextHeap); RtlpDphPageHeapListLength--; /* Release the global heap list lock */ - RtlLeaveCriticalSection(&RtlpDphPageHeapListLock); + RtlLeaveHeapLock(RtlpDphPageHeapListLock); /* Leave and delete this heap's critical section */ - RtlLeaveCriticalSection(DphRoot->HeapCritSect); - RtlDeleteCriticalSection(DphRoot->HeapCritSect); + RtlLeaveHeapLock(DphRoot->HeapCritSect); + RtlDeleteHeapLock(DphRoot->HeapCritSect); /* Now go through all virtual list nodes and release the VM */ Node = DphRoot->pVirtualStorageListHead; diff --git a/reactos/lib/rtl/heapuser.c b/reactos/lib/rtl/heapuser.c new file mode 100644 index 00000000000..242307589ad --- /dev/null +++ b/reactos/lib/rtl/heapuser.c @@ -0,0 +1,128 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/heap.c + * PURPOSE: RTL Heap backend allocator (user mode only functions) + * PROGRAMMERS: Copyright 2010 Aleksey Bragin + */ + +/* INCLUDES *****************************************************************/ + +#include +#include + +#define NDEBUG +#include + +RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; + + +/* Usermode only! */ +VOID +NTAPI +RtlpAddHeapToProcessList(PHEAP Heap) +{ + PPEB Peb; + + /* Get PEB */ + Peb = RtlGetCurrentPeb(); + + /* Acquire the lock */ + RtlEnterCriticalSection(&RtlpProcessHeapsListLock); + + //_SEH2_TRY { + /* Check if max number of heaps reached */ + if (Peb->NumberOfHeaps == Peb->MaximumNumberOfHeaps) + { + // TODO: Handle this case + ASSERT(FALSE); + } + + /* Add the heap to the process heaps */ + Peb->ProcessHeaps[Peb->NumberOfHeaps] = Heap; + Peb->NumberOfHeaps++; + Heap->ProcessHeapsListIndex = (USHORT)Peb->NumberOfHeaps; + // } _SEH2_FINALLY { + + /* Release the lock */ + RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); + + // } _SEH2_END +} + +/* Usermode only! */ +VOID +NTAPI +RtlpRemoveHeapFromProcessList(PHEAP Heap) +{ + PPEB Peb; + PHEAP *Current, *Next; + ULONG Count; + + /* Get PEB */ + Peb = RtlGetCurrentPeb(); + + /* Acquire the lock */ + RtlEnterCriticalSection(&RtlpProcessHeapsListLock); + + /* Check if we don't need anything to do */ + if ((Heap->ProcessHeapsListIndex == 0) || + (Heap->ProcessHeapsListIndex > Peb->NumberOfHeaps) || + (Peb->NumberOfHeaps == 0)) + { + /* Release the lock */ + RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); + + return; + } + + /* The process actually has more than one heap. + Use classic, lernt from university times algorithm for removing an entry + from a static array */ + + Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; + Next = Current + 1; + + /* How many items we need to shift to the left */ + Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); + + /* Move them all in a loop */ + while (--Count) + { + /* Copy it and advance next pointer */ + *Current = *Next; + + /* Update its index */ + (*Current)->ProcessHeapsListIndex -= 1; + + /* Advance pointers */ + Current++; + Next++; + } + + /* Decrease total number of heaps */ + Peb->NumberOfHeaps--; + + /* Zero last unused item */ + Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; + Heap->ProcessHeapsListIndex = 0; + + /* Release the lock */ + RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); +} + +VOID +NTAPI +RtlInitializeHeapManager(VOID) +{ + PPEB Peb; + + /* Get PEB */ + Peb = RtlGetCurrentPeb(); + + /* Initialize heap-related fields of PEB */ + Peb->NumberOfHeaps = 0; + + /* Initialize the process heaps list protecting lock */ + RtlInitializeCriticalSection(&RtlpProcessHeapsListLock); +} + diff --git a/reactos/lib/rtl/i386/except.c b/reactos/lib/rtl/i386/except.c index 0165fffc902..bef11af0851 100644 --- a/reactos/lib/rtl/i386/except.c +++ b/reactos/lib/rtl/i386/except.c @@ -74,15 +74,11 @@ RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; - /* Perform vectored exception handling if we are in user mode */ - if (RtlpGetMode() != KernelMode) + /* Perform vectored exception handling (a dummy in kernel mode) */ + if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) { - /* Call any registered vectored handlers */ - if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) - { - /* Exception handled, continue execution */ - return TRUE; - } + /* Exception handled, continue execution */ + return TRUE; } /* Get the current stack limits and registration frame */ diff --git a/reactos/ntoskrnl/rtl/libsupp.c b/reactos/ntoskrnl/rtl/libsupp.c index f9e4d603706..1afd455fab6 100644 --- a/reactos/ntoskrnl/rtl/libsupp.c +++ b/reactos/ntoskrnl/rtl/libsupp.c @@ -202,6 +202,27 @@ RtlLeaveHeapLock(IN OUT PHEAP_LOCK Lock) return STATUS_SUCCESS; } +struct _HEAP; + +VOID +NTAPI +RtlpAddHeapToProcessList(struct _HEAP *Heap) +{ + UNREFERENCED_PARAMETER(Heap); +} + +VOID +NTAPI +RtlpRemoveHeapFromProcessList(struct _HEAP *Heap) +{ + UNREFERENCED_PARAMETER(Heap); +} + +VOID +RtlInitializeHeapManager(VOID) +{ +} + #if DBG VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line) @@ -696,5 +717,14 @@ RtlpSafeCopyMemory( return STATUS_SUCCESS; } +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers( + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PCONTEXT Context) +{ + /* In the kernel we don't have vectored exception handlers */ + return FALSE; +} /* EOF */ From ece7ea44f627354858689727fd6f22a53bd38332 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 14 Jan 2013 10:58:16 +0000 Subject: [PATCH 17/71] [RTL] Inititalize the heap lock pointers with actual storage before calling RtlInitializeHeapLock svn path=/trunk/; revision=58174 --- reactos/lib/rtl/heappage.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/reactos/lib/rtl/heappage.c b/reactos/lib/rtl/heappage.c index cd16910f138..44c4cfe36b4 100644 --- a/reactos/lib/rtl/heappage.c +++ b/reactos/lib/rtl/heappage.c @@ -110,11 +110,13 @@ WCHAR RtlpDphTargetDlls[512]; LIST_ENTRY RtlpDphPageHeapList; BOOLEAN RtlpDphPageHeapListInitialized; -PHEAP_LOCK RtlpDphPageHeapListLock; +HEAP_LOCK _RtlpDphPageHeapListLock; +PHEAP_LOCK RtlpDphPageHeapListLock = &_RtlpDphPageHeapListLock; ULONG RtlpDphPageHeapListLength; UNICODE_STRING RtlpDphTargetDllsUnicode; -PHEAP_LOCK RtlpDphDelayedFreeQueueLock; +HEAP_LOCK _RtlpDphDelayedFreeQueueLock; +PHEAP_LOCK RtlpDphDelayedFreeQueueLock = &_RtlpDphDelayedFreeQueueLock; LIST_ENTRY RtlpDphDelayedFreeQueue; SLIST_HEADER RtlpDphDelayedTemporaryPushList; SIZE_T RtlpDphMemoryUsedByDelayedFreeBlocks; @@ -1485,6 +1487,7 @@ RtlpPageHeapCreate(ULONG Flags, /* Initialize the DPH root */ DphRoot->Signature = DPH_SIGNATURE; DphRoot->HeapFlags = Flags; + DphRoot->HeapCritSect = (PHEAP_LOCK)((PCHAR)DphRoot + DPH_POOL_SIZE); DphRoot->ExtraFlags = RtlpDphGlobalFlags; ZwQueryPerformanceCounter(&PerfCounter, NULL); From 813f23e2bde8d5186351ec8601631f5c3a209905 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 14 Jan 2013 13:55:12 +0000 Subject: [PATCH 18/71] [NTOSKRNL] Initialize MmCriticalSectionTimeout and use it to setup the value in the PEB (We currently continue to use 2.5 minutes, as opposed to the 30 days that Windows uses). Probe and copy the timeout value in NtWaitForKeyedEvent and NtReleaseKeyedEvent. [RTL] Use RtlpTimeout for critical sections, which is initialized from the PEB. Implement using the LowMemory keyed event, when allocating the normal event failed. svn path=/trunk/; revision=58175 --- reactos/dll/ntdll/ldr/ldrinit.c | 2 +- reactos/lib/rtl/critical.c | 83 +++++++++++++++++++----------- reactos/ntoskrnl/ex/keyedevt.c | 50 +++++++++++++++--- reactos/ntoskrnl/mm/ARM3/miarm.h | 1 + reactos/ntoskrnl/mm/ARM3/mminit.c | 6 +++ reactos/ntoskrnl/mm/ARM3/procsup.c | 6 +-- 6 files changed, 107 insertions(+), 41 deletions(-) diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c index f9600cb0f87..8b6540242ac 100644 --- a/reactos/dll/ntdll/ldr/ldrinit.c +++ b/reactos/dll/ntdll/ldr/ldrinit.c @@ -48,7 +48,7 @@ LIST_ENTRY LdrpTlsList; ULONG LdrpNumberOfTlsEntries; ULONG LdrpNumberOfProcessors; PVOID NtDllBase; -LARGE_INTEGER RtlpTimeout; +extern LARGE_INTEGER RtlpTimeout; BOOLEAN RtlpTimeoutDisable; LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; LIST_ENTRY LdrpDllNotificationList; diff --git a/reactos/lib/rtl/critical.c b/reactos/lib/rtl/critical.c index 9bff77f4c60..80afe4de445 100644 --- a/reactos/lib/rtl/critical.c +++ b/reactos/lib/rtl/critical.c @@ -21,6 +21,7 @@ static LIST_ENTRY RtlCriticalSectionList; static BOOLEAN RtlpCritSectInitialized = FALSE; static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS]; static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; +LARGE_INTEGER RtlpTimeout; /* FUNCTIONS *****************************************************************/ @@ -39,6 +40,7 @@ static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; * None * *--*/ +_At_(CriticalSection->LockSemaphore, _Post_notnull_) VOID NTAPI RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) @@ -47,31 +49,38 @@ RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) HANDLE hNewEvent; NTSTATUS Status; - /* Chevk if we have an event */ - if (!hEvent) { + /* Check if we have an event */ + if (!hEvent) + { /* No, so create it */ - if (!NT_SUCCESS(Status = NtCreateEvent(&hNewEvent, - EVENT_ALL_ACCESS, - NULL, - SynchronizationEvent, - FALSE))) { - - /* We failed, this is bad... */ + Status = NtCreateEvent(&hNewEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { DPRINT1("Failed to Create Event!\n"); - InterlockedDecrement(&CriticalSection->LockCount); - RtlRaiseStatus(Status); - return; + + /* Use INVALID_HANDLE_VALUE (-1) to signal that the global + keyed event must be used */ + hNewEvent = INVALID_HANDLE_VALUE; } + DPRINT("Created Event: %p \n", hNewEvent); + /* Exchange the LockSemaphore field with the new handle, if it is still 0 */ if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, (PVOID)hNewEvent, - 0)) { - - /* Some just created an event */ - DPRINT("Closing already created event: %p\n", hNewEvent); - NtClose(hNewEvent); + NULL) != NULL) + { + /* Someone else just created an event */ + if (hEvent != INVALID_HANDLE_VALUE) + { + DPRINT("Closing already created event: %p\n", hNewEvent); + NtClose(hNewEvent); + } } } @@ -100,13 +109,6 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) NTSTATUS Status; EXCEPTION_RECORD ExceptionRecord; BOOLEAN LastChance = FALSE; - LARGE_INTEGER Timeout; - - /* Wait 2.5 minutes */ - Timeout.QuadPart = 150000L * (ULONGLONG)10000; - Timeout.QuadPart = -Timeout.QuadPart; - /* ^^ HACK HACK HACK. Good way: - Timeout = &NtCurrentPeb()->CriticalSectionTimeout */ /* Do we have an Event yet? */ if (!CriticalSection->LockSemaphore) { @@ -127,10 +129,22 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->ContentionCount++; - /* Wait on the Event */ - Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, - FALSE, - &Timeout); + /* Check if allocating the event failed */ + if (CriticalSection->LockSemaphore == INVALID_HANDLE_VALUE) + { + /* Use the global keyed event (NULL as keyed event handle) */ + Status = NtWaitForKeyedEvent(NULL, + CriticalSection, + FALSE, + &RtlpTimeout); + } + else + { + /* Wait on the Event */ + Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, + FALSE, + &RtlpTimeout); + } /* We have Timed out */ if (Status == STATUS_TIMEOUT) { @@ -192,7 +206,18 @@ RtlpUnWaitCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) DPRINT("Signaling Critical Section Event: %p, %p\n", CriticalSection, CriticalSection->LockSemaphore); - Status = NtSetEvent(CriticalSection->LockSemaphore, NULL); + + /* Check if this critical section needs to use the keyed event */ + if (CriticalSection->LockSemaphore == INVALID_HANDLE_VALUE) + { + /* Release keyed event */ + Status = NtReleaseKeyedEvent(NULL, CriticalSection, FALSE, &RtlpTimeout); + } + else + { + /* Set the event */ + Status = NtSetEvent(CriticalSection->LockSemaphore, NULL); + } if (!NT_SUCCESS(Status)) { diff --git a/reactos/ntoskrnl/ex/keyedevt.c b/reactos/ntoskrnl/ex/keyedevt.c index d836b76e78a..b5efacab8a0 100644 --- a/reactos/ntoskrnl/ex/keyedevt.c +++ b/reactos/ntoskrnl/ex/keyedevt.c @@ -239,7 +239,7 @@ ExpReleaseKeyedEvent( TRUE); } -_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI NtCreateKeyedEvent( @@ -316,7 +316,7 @@ NtCreateKeyedEvent( return Status; } -_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI NtOpenKeyedEvent( @@ -365,18 +365,35 @@ NtOpenKeyedEvent( return Status; } -_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI NtWaitForKeyedEvent( - _In_ HANDLE Handle, + _In_opt_ HANDLE Handle, _In_ PVOID Key, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Timeout) + _In_opt_ PLARGE_INTEGER Timeout) { KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PEX_KEYED_EVENT KeyedEvent; NTSTATUS Status; + LARGE_INTEGER TimeoutCopy; + + /* Check if the caller passed a timeout value and this is from user mode */ + if ((Timeout != NULL) && (PreviousMode != KernelMode)) + { + _SEH2_TRY + { + ProbeForRead(Timeout, sizeof(*Timeout), 1); + TimeoutCopy = *Timeout; + Timeout = &TimeoutCopy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } /* Check if the caller provided a handle */ if (Handle != NULL) @@ -408,18 +425,35 @@ NtWaitForKeyedEvent( return Status; } -_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI NtReleaseKeyedEvent( - _In_ HANDLE Handle, + _In_opt_ HANDLE Handle, _In_ PVOID Key, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Timeout) + _In_opt_ PLARGE_INTEGER Timeout) { KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PEX_KEYED_EVENT KeyedEvent; NTSTATUS Status; + LARGE_INTEGER TimeoutCopy; + + /* Check if the caller passed a timeout value and this is from user mode */ + if ((Timeout != NULL) && (PreviousMode != KernelMode)) + { + _SEH2_TRY + { + ProbeForRead(Timeout, sizeof(*Timeout), 1); + TimeoutCopy = *Timeout; + Timeout = &TimeoutCopy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } /* Check if the caller provided a handle */ if (Handle != NULL) diff --git a/reactos/ntoskrnl/mm/ARM3/miarm.h b/reactos/ntoskrnl/mm/ARM3/miarm.h index 82beef3358b..a7a3b0bf9ae 100644 --- a/reactos/ntoskrnl/mm/ARM3/miarm.h +++ b/reactos/ntoskrnl/mm/ARM3/miarm.h @@ -713,6 +713,7 @@ extern KGUARDED_MUTEX MmSectionBasedMutex; extern PVOID MmHighSectionBase; extern SIZE_T MmSystemLockPagesCount; extern ULONG_PTR MmSubsectionBase; +extern LARGE_INTEGER MmCriticalSectionTimeout; BOOLEAN FORCEINLINE diff --git a/reactos/ntoskrnl/mm/ARM3/mminit.c b/reactos/ntoskrnl/mm/ARM3/mminit.c index 1211b659861..926a191f33b 100644 --- a/reactos/ntoskrnl/mm/ARM3/mminit.c +++ b/reactos/ntoskrnl/mm/ARM3/mminit.c @@ -373,6 +373,9 @@ ULONG MiNumberDescriptors = 0; /* Number of free pages in the loader block */ PFN_NUMBER MiNumberOfFreePages = 0; +/* Timeout value for critical sections (2.5 minutes) */ +ULONG MmCritsectTimeoutSeconds = 150; // NT value: 720 * 60 * 60; (30 days) +LARGE_INTEGER MmCriticalSectionTimeout; /* PRIVATE FUNCTIONS **********************************************************/ @@ -2119,6 +2122,9 @@ MmArmInitSystem(IN ULONG Phase, /* Initialize the user mode image list */ InitializeListHead(&MmLoadedUserImageList); + /* Initialize critical section timeout value (relative time is negative) */ + MmCriticalSectionTimeout.QuadPart = MmCritsectTimeoutSeconds * (-10000000LL); + /* Initialize the paged pool mutex and the section commit mutex */ KeInitializeGuardedMutex(&MmPagedPoolMutex); KeInitializeGuardedMutex(&MmSectionCommitMutex); diff --git a/reactos/ntoskrnl/mm/ARM3/procsup.c b/reactos/ntoskrnl/mm/ARM3/procsup.c index 7cfa0b3dd49..d9c1e7102df 100644 --- a/reactos/ntoskrnl/mm/ARM3/procsup.c +++ b/reactos/ntoskrnl/mm/ARM3/procsup.c @@ -690,9 +690,9 @@ MmCreatePeb(IN PEPROCESS Process, /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; Peb->HeapSegmentCommit = MmHeapSegmentCommit; Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; - Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; - Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ + Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; + /*Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; */ Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); Peb->ProcessHeaps = (PVOID*)(Peb + 1); From 6b883db864dcc9d25f84dedf2bf540961f8100b3 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 14 Jan 2013 21:56:45 +0000 Subject: [PATCH 19/71] [SAMSRV] Implement SamrSetMemberAttributesOfGroup. svn path=/trunk/; revision=58176 --- reactos/dll/win32/samsrv/samrpc.c | 26 ++++++++++- reactos/dll/win32/samsrv/samsrv.h | 6 +++ reactos/dll/win32/samsrv/user.c | 76 +++++++++++++++++++++++++++++-- 3 files changed, 102 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 6d7a257a1ed..dcdb4cef3d3 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -4158,8 +4158,30 @@ SamrSetMemberAttributesOfGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long MemberId, IN unsigned long Attributes) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_ADD_MEMBER, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + Status = SampSetUserGroupAttributes(GroupObject->ParentObject, + MemberId, + GroupObject->RelativeId, + Attributes); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetUserGroupAttributes failed with status 0x%08lx\n", Status); + } + + return Status; } diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index 7de5ce15cfb..c07d0ea40a1 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -285,4 +285,10 @@ SampGetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, IN ULONG GroupId, OUT PULONG GroupAttributes); +NTSTATUS +SampSetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ULONG GroupId, + IN ULONG GroupAttributes); + /* EOF */ diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c index f3174c627a5..0805e4475e0 100644 --- a/reactos/dll/win32/samsrv/user.c +++ b/reactos/dll/win32/samsrv/user.c @@ -214,10 +214,7 @@ SampGetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, &Length); if (Length == 0) - { - *GroupAttributes = 0; - return STATUS_SUCCESS; - } + return STATUS_UNSUCCESSFUL; /* FIXME */ GroupsBuffer = midl_user_allocate(Length); if (GroupsBuffer == NULL) @@ -253,4 +250,75 @@ done: return Status; } + +NTSTATUS +SampSetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ULONG GroupId, + IN ULONG GroupAttributes) +{ + PSAM_DB_OBJECT UserObject = NULL; + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampOpenUserObject(DomainObject, + UserId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Length == 0) + return STATUS_UNSUCCESSFUL; /* FIXME */ + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + for (i = 0; i < (Length / sizeof(GROUP_MEMBERSHIP)); i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + GroupsBuffer[i].Attributes = GroupAttributes; + break; + } + } + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + GroupsBuffer, + Length); + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + if (UserObject != NULL) + SampCloseDbObject(UserObject); + + return Status; +} + /* EOF */ From ccf292a193fe51e36b1069f584bca434ec2c4448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 15 Jan 2013 23:23:20 +0000 Subject: [PATCH 20/71] "always", not "allways" !!!! svn path=/trunk/; revision=58179 --- rostests/drivers/ntoskrnl/IoEaTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rostests/drivers/ntoskrnl/IoEaTest.cpp b/rostests/drivers/ntoskrnl/IoEaTest.cpp index 4bd18e5e959..8f702dacb35 100644 --- a/rostests/drivers/ntoskrnl/IoEaTest.cpp +++ b/rostests/drivers/ntoskrnl/IoEaTest.cpp @@ -179,7 +179,7 @@ int _tmain(int argc, _TCHAR* argv[]) printf("2.) Test : *********************\n"); - /* Here all zero but EaBuffer::EaName is set : will allways end in STATUS_EA_LIST_INCONSISTENT */ + /* Here all zero but EaBuffer::EaName is set : will always end in STATUS_EA_LIST_INCONSISTENT */ /* There must a link to EaBuffer::EaName */ for (i=0;i Date: Tue, 15 Jan 2013 23:25:56 +0000 Subject: [PATCH 21/71] Forgot this one. svn path=/trunk/; revision=58180 --- rostests/drivers/ntoskrnl/IoEaTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rostests/drivers/ntoskrnl/IoEaTest.cpp b/rostests/drivers/ntoskrnl/IoEaTest.cpp index 8f702dacb35..9501b676e0b 100644 --- a/rostests/drivers/ntoskrnl/IoEaTest.cpp +++ b/rostests/drivers/ntoskrnl/IoEaTest.cpp @@ -318,7 +318,7 @@ int _tmain(int argc, _TCHAR* argv[]) printf("7.) Test : *********************\n"); /* The same test like 6.) but wrong strlen */ - /* Here EaBuffer::EaName is set and EaBuffer::EaNameLength is strlen(EaBuffer::EaName) EaBuffer::EaValueLength is strlen(EaBuffer::EaName)+1. EaLength is count: will allways end in STATUS_EA_LIST_INCONSISTENT */ + /* Here EaBuffer::EaName is set and EaBuffer::EaNameLength is strlen(EaBuffer::EaName) EaBuffer::EaValueLength is strlen(EaBuffer::EaName)+1. EaLength is count: will always end in STATUS_EA_LIST_INCONSISTENT */ for (i=0;i Date: Tue, 15 Jan 2013 23:26:45 +0000 Subject: [PATCH 22/71] "always", not "allways" !!!!!!!!!!!!!! svn path=/trunk/; revision=58181 --- reactos/dll/win32/kernel32/client/file/create.c | 2 +- reactos/lib/rtl/unicode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/kernel32/client/file/create.c b/reactos/dll/win32/kernel32/client/file/create.c index 73e2c285b21..a91a49fbf86 100644 --- a/reactos/dll/win32/kernel32/client/file/create.c +++ b/reactos/dll/win32/kernel32/client/file/create.c @@ -200,7 +200,7 @@ HANDLE WINAPI CreateFileW (LPCWSTR lpFileName, FileAttributes = (dwFlagsAndAttributes & (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY)); - /* handle may allways be waited on and querying attributes are allways allowed */ + /* handle may always be waited on and querying attributes are always allowed */ dwDesiredAccess |= SYNCHRONIZE | FILE_READ_ATTRIBUTES; /* FILE_FLAG_POSIX_SEMANTICS is handled later */ diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c index 491fd88b032..50a0e70ec5d 100644 --- a/reactos/lib/rtl/unicode.c +++ b/reactos/lib/rtl/unicode.c @@ -1932,7 +1932,7 @@ RtlUpcaseUnicodeStringToCountedOemString( /* * @implemented * NOTES - * Oem string is allways nullterminated + * OEM string is always nullterminated * It performs a partial copy if oem is too small. */ NTSTATUS From 8d5316a95e0e55c619be3b6a7fbf073914d08514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 16 Jan 2013 00:28:09 +0000 Subject: [PATCH 23/71] [KERNEL32] No need to use a UNICODE_STRING there. svn path=/trunk/; revision=58183 --- reactos/dll/win32/kernel32/client/file/find.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/kernel32/client/file/find.c b/reactos/dll/win32/kernel32/client/file/find.c index 3d1903d7337..74eb3f311f1 100644 --- a/reactos/dll/win32/kernel32/client/file/find.c +++ b/reactos/dll/win32/kernel32/client/file/find.c @@ -116,20 +116,21 @@ CopyDeviceFindData(OUT LPWIN32_FIND_DATAW lpFindFileData, IN LPCWSTR lpFileName, IN ULONG DeviceNameInfo) { - UNICODE_STRING DeviceName; + LPCWSTR DeviceName; + SIZE_T Length; _SEH2_TRY { /* DeviceNameInfo == { USHORT Offset; USHORT Length } */ - DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); - DeviceName.Buffer = (LPWSTR)((ULONG_PTR)lpFileName + ((DeviceNameInfo >> 16) & 0xFFFF)); + Length = (SIZE_T)(DeviceNameInfo & 0xFFFF); + DeviceName = (LPCWSTR)((ULONG_PTR)lpFileName + ((DeviceNameInfo >> 16) & 0xFFFF)); /* Return the data */ RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; RtlCopyMemory(lpFindFileData->cFileName, - DeviceName.Buffer, - DeviceName.Length); + DeviceName, + Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { From a5192cf84c62b0b6b43c794d4a611750da000e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 16 Jan 2013 23:24:07 +0000 Subject: [PATCH 24/71] [EXPLORER_NEW] - Italian Translation and fix duplicate MENUITEM in fr-FR.rc, ko-KR, no-NO.rc files. Patch by Ivan Di Francesco. - Adapt a little bit French translation (by me). CORE-6908 #resolve #comment Committed in r58185. Thanks ! svn path=/trunk/; revision=58185 --- reactos/base/shell/explorer-new/lang/fr-FR.rc | 29 +++++++------------ reactos/base/shell/explorer-new/lang/it-IT.rc | 24 +++++++-------- reactos/base/shell/explorer-new/lang/ko-KR.rc | 9 ------ reactos/base/shell/explorer-new/lang/no-NO.rc | 9 ------ 4 files changed, 22 insertions(+), 49 deletions(-) diff --git a/reactos/base/shell/explorer-new/lang/fr-FR.rc b/reactos/base/shell/explorer-new/lang/fr-FR.rc index dc9d0899e96..ee57e4109d2 100644 --- a/reactos/base/shell/explorer-new/lang/fr-FR.rc +++ b/reactos/base/shell/explorer-new/lang/fr-FR.rc @@ -5,27 +5,18 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Ajuster la date/l'heure", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Personnaliser les icônes de notification...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "&Cascade", ID_SHELL_CMD_CASCADE_WND + MENUITEM "Mosaïque Hori&zontale", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Mosaïque &Verticale", ID_SHELL_CMD_TILE_WND_V + MENUITEM "Afficher le &Bureau", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "Ann&uler", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Gestionnaire des tâches", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION - MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR - MENUITEM SEPARATOR - MENUITEM "Véroui&ller la barre de tâches", ID_LOCKTASKBAR + MENUITEM "V&errouiller la Barre des tâches", ID_LOCKTASKBAR MENUITEM "P&ropriétés", ID_SHELL_CMD_PROPERTIES END END @@ -54,7 +45,7 @@ BEGIN MENUITEM "&Sécurité...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Co&nnexions au réseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "Barre de &tâches et menu démarrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "Barre des &tâches et Menu Démarrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "&Chercher", IDM_SEARCH BEGIN diff --git a/reactos/base/shell/explorer-new/lang/it-IT.rc b/reactos/base/shell/explorer-new/lang/it-IT.rc index 49c0ec2adcd..98c193ee48d 100644 --- a/reactos/base/shell/explorer-new/lang/it-IT.rc +++ b/reactos/base/shell/explorer-new/lang/it-IT.rc @@ -5,13 +5,13 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Modifica Data/Ora", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Personalizza Notifiche...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "Finestre a cascata", ID_SHELL_CMD_CASCADE_WND + MENUITEM "Affianca Finestre &Orizzontalmente", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Affianca Finestre V&erticalmente", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&Mostra Desktop", ID_SHELL_CMD_SHOW_DESKTOP MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR @@ -56,8 +56,8 @@ BEGIN MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Sincronizza", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "&Fine sessione %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "S&collega...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "&Disancora il computer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Disconnetti...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "&Sblocca il computer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Spegnere il computer...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -83,7 +83,7 @@ CAPTION "Menù avvio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN AUTORADIOBUTTON "&Menù avvio", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED + LTEXT "Questo stile di menu consente di accedere facilmente alle cartelle, ai programmi preferiti e alla ricerca.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED AUTORADIOBUTTON "Menù avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED LTEXT "Questo stile di menù ha funzionalità e aspetto classici",-1,20,57,150,24, WS_DISABLED @@ -123,11 +123,11 @@ END IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "Avanzate" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 + GROUPBOX "Opzioni Avanzate", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Mostra s&econdi", IDC_TASKBARPROP_SECONDS, 13,18,200,10 AUTOCHECKBOX "&Mostrare anteprima delle finestre (miniature)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10 END diff --git a/reactos/base/shell/explorer-new/lang/ko-KR.rc b/reactos/base/shell/explorer-new/lang/ko-KR.rc index cd38d0cd29e..07b9d2584fc 100644 --- a/reactos/base/shell/explorer-new/lang/ko-KR.rc +++ b/reactos/base/shell/explorer-new/lang/ko-KR.rc @@ -9,15 +9,6 @@ IDM_TRAYWND MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF - MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF diff --git a/reactos/base/shell/explorer-new/lang/no-NO.rc b/reactos/base/shell/explorer-new/lang/no-NO.rc index e787a871f34..1cbe5d201c6 100644 --- a/reactos/base/shell/explorer-new/lang/no-NO.rc +++ b/reactos/base/shell/explorer-new/lang/no-NO.rc @@ -4,15 +4,6 @@ IDM_TRAYWND MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF - MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF From b8577036db1c3621a5ba1ee0f04b85755310ae61 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Thu, 17 Jan 2013 11:02:30 +0000 Subject: [PATCH 25/71] [EXPLORER_NEW] - Hide minimized window captions (and enable shell notifications, thus fixing taskbar buttons). This should have been in r57978, but got lost. - From Andrew Green's GSoC branch. Spotted by Edijus. CORE-6899 #resolve svn path=/trunk/; revision=58186 --- reactos/base/shell/explorer-new/explorer.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/reactos/base/shell/explorer-new/explorer.c b/reactos/base/shell/explorer-new/explorer.c index 5bb3c474aa0..36c0fafe55d 100644 --- a/reactos/base/shell/explorer-new/explorer.c +++ b/reactos/base/shell/explorer-new/explorer.c @@ -348,6 +348,25 @@ GetVersionInfoString(IN TCHAR *szFileName, return bRet; } +static VOID +HideMinimizedWindows(IN BOOL bHide) +{ + MINIMIZEDMETRICS mm; + + mm.cbSize = sizeof(mm); + if (!SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) + { + DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); + return; + } + if (bHide) + mm.iArrange |= ARW_HIDE; + else + mm.iArrange &= ~ARW_HIDE; + if (!SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) + DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); +} + INT WINAPI _tWinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, @@ -392,6 +411,11 @@ _tWinMain(IN HINSTANCE hInstance, if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) { Tray = CreateTrayWindow(); + /* This not only hides the minimized window captions in the bottom + left screen corner, but is also needed in order to receive + HSHELL_* notification messages (which are required for taskbar + buttons to work right) */ + HideMinimizedWindows(TRUE); if (Tray != NULL) hShellDesktop = DesktopCreateWindow(Tray); @@ -415,6 +439,7 @@ _tWinMain(IN HINSTANCE hInstance, { RegisterHotKey(NULL, IDHK_RUN, MOD_WIN, 'R'); TrayMessageLoop(Tray); + HideMinimizedWindows(FALSE); ITrayWindow_Release(Tray); UnregisterTrayWindowClass(); } From 8c365a1421340af43ed5ae510c11e8a80e3ad626 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Thu, 17 Jan 2013 22:05:37 +0000 Subject: [PATCH 26/71] [SAMSRV] Fix SamrRemoveMemberFromGroup. svn path=/trunk/; revision=58187 --- reactos/dll/win32/samsrv/group.c | 28 ++++++++++++++-------------- reactos/dll/win32/samsrv/user.c | 32 +++++++++++++++----------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/reactos/dll/win32/samsrv/group.c b/reactos/dll/win32/samsrv/group.c index 696beb4e5a8..4b1ab718a3d 100644 --- a/reactos/dll/win32/samsrv/group.c +++ b/reactos/dll/win32/samsrv/group.c @@ -90,18 +90,15 @@ SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, ULONG i; NTSTATUS Status; - Status = SampGetObjectAttribute(GroupObject, - L"Members", - NULL, - NULL, - &Length); + SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + if (Length == 0) return STATUS_MEMBER_NOT_IN_GROUP; - if (!NT_SUCCESS(Status)) - return Status; - MembersBuffer = midl_user_allocate(Length); if (MembersBuffer == NULL) { @@ -126,12 +123,15 @@ SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, { Length -= sizeof(ULONG); Status = STATUS_SUCCESS; - break; - } - if (Status == STATUS_SUCCESS && i < MembersCount - 1) - { - MembersBuffer[i] = MembersBuffer[i + 1]; + if (MembersCount - i - 1 > 0) + { + CopyMemory(&MembersBuffer[i], + &MembersBuffer[i + 1], + (MembersCount - i - 1) * sizeof(ULONG)); + } + + break; } } diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c index 0805e4475e0..9d4767d3129 100644 --- a/reactos/dll/win32/samsrv/user.c +++ b/reactos/dll/win32/samsrv/user.c @@ -117,23 +117,20 @@ SampRemoveGroupMembershipFromUser(IN PSAM_DB_OBJECT UserObject, ULONG GroupsCount = 0; ULONG Length = 0; ULONG i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; TRACE("(%p %lu)\n", UserObject, GroupId); - Status = SampGetObjectAttribute(UserObject, - L"Groups", - NULL, - NULL, - &Length); + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + if (Length == 0) return STATUS_MEMBER_NOT_IN_GROUP; - if (!NT_SUCCESS(Status)) - return Status; - GroupsBuffer = midl_user_allocate(Length); if (GroupsBuffer == NULL) { @@ -158,14 +155,15 @@ SampRemoveGroupMembershipFromUser(IN PSAM_DB_OBJECT UserObject, { Length -= sizeof(GROUP_MEMBERSHIP); Status = STATUS_SUCCESS; - break; - } - if (Status == STATUS_SUCCESS && i < GroupsCount - 1) - { - CopyMemory(&GroupsBuffer[i], - &GroupsBuffer[i + 1], - sizeof(GROUP_MEMBERSHIP)); + if (GroupsCount - i - 1 > 0) + { + CopyMemory(&GroupsBuffer[i], + &GroupsBuffer[i + 1], + (GroupsCount - i - 1) * sizeof(GROUP_MEMBERSHIP)); + } + + break; } } From b0376fc9fac990755a835f6356d2b1bc7d43043e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 18 Jan 2013 15:52:10 +0000 Subject: [PATCH 27/71] [SETUPAPI] * Don't check the return twice here. svn path=/trunk/; revision=58188 --- reactos/dll/win32/setupapi/install.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reactos/dll/win32/setupapi/install.c b/reactos/dll/win32/setupapi/install.c index cc47900bde3..fbf159f601f 100644 --- a/reactos/dll/win32/setupapi/install.c +++ b/reactos/dll/win32/setupapi/install.c @@ -1060,8 +1060,7 @@ profile_items_callback( if (SUCCEEDED(hr)) { /* Fill link properties */ - if (SUCCEEDED(hr)) - hr = IShellLinkW_SetPath(psl, FullFileName); + hr = IShellLinkW_SetPath(psl, FullFileName); if (SUCCEEDED(hr)) hr = IShellLinkW_SetArguments(psl, L""); if (SUCCEEDED(hr)) From de76dbe73f41e4e391e15e20d7bdeea1ee5675d9 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 18 Jan 2013 17:19:23 +0000 Subject: [PATCH 28/71] [SHELL32] * Fix a typo. svn path=/trunk/; revision=58189 --- reactos/dll/win32/shell32/pidl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/win32/shell32/pidl.cpp b/reactos/dll/win32/shell32/pidl.cpp index d4e33742381..db376d691ff 100644 --- a/reactos/dll/win32/shell32/pidl.cpp +++ b/reactos/dll/win32/shell32/pidl.cpp @@ -1144,7 +1144,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, if (len < (int)sizeof(WIN32_FIND_DATAW)) return E_INVALIDARG; - ZeroMemory(pfd, sizeof (WIN32_FIND_DATAA)); + ZeroMemory(pfd, sizeof (WIN32_FIND_DATAW)); _ILGetFileDateTime( pidl, &(pfd->ftLastWriteTime)); pfd->dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); pfd->nFileSizeLow = _ILGetFileSize ( pidl, NULL, 0); From f70cfa3c30e3aa6470e24fc32ee2629a9b214553 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 18 Jan 2013 23:34:51 +0000 Subject: [PATCH 29/71] [EXPLORER_NEW] - Restructure TaskSwitchWnd_CheckActivateTaskItem. No logic change intended. svn path=/trunk/; revision=58192 --- reactos/base/shell/explorer-new/taskswnd.c | 81 ++++++++++------------ 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/reactos/base/shell/explorer-new/taskswnd.c b/reactos/base/shell/explorer-new/taskswnd.c index aed9793db3e..7d3db2553ce 100644 --- a/reactos/base/shell/explorer-new/taskswnd.c +++ b/reactos/base/shell/explorer-new/taskswnd.c @@ -945,58 +945,49 @@ TaskSwitchWnd_CheckActivateTaskItem(IN OUT PTASK_SWITCH_WND This, if (TaskItem != NULL) TaskGroup = TaskItem->Group; - if (This->IsGroupingEnabled && TaskGroup != NULL) + if (This->IsGroupingEnabled && + TaskGroup != NULL && + TaskGroup->IsCollapsed) { - if (TaskGroup->IsCollapsed) + /* FIXME */ + return; + } + + if (ActiveTaskItem != NULL) + { + PTASK_GROUP ActiveTaskGroup; + + if (ActiveTaskItem == TaskItem) + return; + + ActiveTaskGroup = ActiveTaskItem->Group; + + if (This->IsGroupingEnabled && + ActiveTaskGroup != NULL && + ActiveTaskGroup->IsCollapsed) { + if (ActiveTaskGroup == TaskGroup) + return; + /* FIXME */ } else - goto ChangeTaskItemButton; + { + This->ActiveTaskItem = NULL; + if (ActiveTaskItem->Index >= 0) + { + TaskSwitchWnd_UpdateTaskItemButton(This, + ActiveTaskItem); + } + } } - else + + This->ActiveTaskItem = TaskItem; + + if (TaskItem != NULL && TaskItem->Index >= 0) { -ChangeTaskItemButton: - if (ActiveTaskItem != NULL) - { - PTASK_GROUP ActiveTaskGroup; - - if (ActiveTaskItem == TaskItem) - return; - - ActiveTaskGroup = ActiveTaskItem->Group; - - if (This->IsGroupingEnabled && ActiveTaskGroup != NULL) - { - if (ActiveTaskGroup->IsCollapsed) - { - if (ActiveTaskGroup == TaskGroup) - return; - - /* FIXME */ - } - else - goto ChangeActiveTaskItemButton; - } - else - { -ChangeActiveTaskItemButton: - This->ActiveTaskItem = NULL; - if (ActiveTaskItem->Index >= 0) - { - TaskSwitchWnd_UpdateTaskItemButton(This, - ActiveTaskItem); - } - } - } - - This->ActiveTaskItem = TaskItem; - - if (TaskItem != NULL && TaskItem->Index >= 0) - { - TaskSwitchWnd_UpdateTaskItemButton(This, - TaskItem); - } + TaskSwitchWnd_UpdateTaskItemButton(This, + TaskItem); } } From 474c3afc11674315bacc0984d56b020295c4f80b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 19 Jan 2013 21:49:12 +0000 Subject: [PATCH 30/71] [SAL.H] "Implement" all used annotations [XDK/DDK] Add missing annotations, move some prototypes to more appropriate headers [NDK] Fix a number of annotations [NDK] Use SAL2 dummys from umtypes as well svn path=/trunk/; revision=58193 --- reactos/include/ddk/ntifs.h | 753 +++++++++++++-------------- reactos/include/ddk/wdm.h | 61 ++- reactos/include/ndk/exfuncs.h | 23 +- reactos/include/ndk/kefuncs.h | 16 +- reactos/include/ndk/mmfuncs.h | 27 +- reactos/include/ndk/obfuncs.h | 4 +- reactos/include/ndk/rtlfuncs.h | 156 +++--- reactos/include/ndk/sefuncs.h | 10 +- reactos/include/ndk/setypes.h | 16 + reactos/include/ndk/umtypes.h | 10 +- reactos/include/psdk/sal.h | 268 +++++----- reactos/include/xdk/mmfuncs.h | 26 + reactos/include/xdk/ntifs.template.h | 412 ++------------- reactos/include/xdk/obfuncs.h | 8 + reactos/include/xdk/rtlfuncs.h | 69 ++- reactos/include/xdk/zwfuncs.h | 369 +++++++++++-- 16 files changed, 1143 insertions(+), 1085 deletions(-) diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index 9751340066e..b846fc64692 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -1441,9 +1441,9 @@ NTSYSAPI NTSTATUS NTAPI RtlCopySid( - _In_ ULONG Length, - _Out_writes_bytes_(Length) PSID Destination, - _In_ PSID Source); + _In_ ULONG DestinationSidLength, + _Out_writes_bytes_(DestinationSidLength) PSID DestinationSid, + _In_ PSID SourceSid); _IRQL_requires_max_(APC_LEVEL) NTSYSAPI @@ -1605,7 +1605,7 @@ VOID NTAPI RtlInitCodePageTable( _In_ PUSHORT TableBase, - _Inout_ PCPTABLEINFO CodePageTable); + _Out_ PCPTABLEINFO CodePageTable); #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ @@ -2117,12 +2117,12 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAdjustPrivilegesToken( - _In_ HANDLE TokenHandle, - _In_ BOOLEAN DisableAllPrivileges, - _In_opt_ PTOKEN_PRIVILEGES NewState, - _In_ ULONG BufferLength, - _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, - _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength); + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength); __kernel_entry NTSYSCALLAPI @@ -2358,30 +2358,6 @@ NTAPI NtClose( _In_ HANDLE Handle); -_Must_inspect_result_ -__drv_allocatesMem(Mem) -__kernel_entry -NTSYSCALLAPI -NTSTATUS -NTAPI -NtAllocateVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, - _In_ ULONG_PTR ZeroBits, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG AllocationType, - _In_ ULONG Protect); - -__kernel_entry -NTSYSCALLAPI -NTSTATUS -NTAPI -NtFreeVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG FreeType); - #endif #if (NTDDI_VERSION >= NTDDI_WINXP) @@ -5005,6 +4981,7 @@ typedef struct _KQUEUE { } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + /****************************************************************************** * Kernel Functions * ******************************************************************************/ @@ -6409,6 +6386,32 @@ ULONG NTAPI MmDoesFileHaveUserWritableReferences( _In_ PSECTION_OBJECT_POINTERS SectionPointer); + +_Must_inspect_result_ +_At_(*BaseAddress, __drv_allocatesMem(Mem)) +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtAllocateVirtualMemory( + _In_ HANDLE ProcessHandle, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect); + +__kernel_entry +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSCALLAPI +NTSTATUS +NTAPI +NtFreeVirtualMemory( + _In_ HANDLE ProcessHandle, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType); + #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ @@ -6484,6 +6487,14 @@ ObOpenObjectByPointerWithTag( _In_ KPROCESSOR_MODE AccessMode, _In_ ULONG Tag, _Out_ PHANDLE Handle); + +NTKERNELAPI +ULONG +NTAPI +ObGetObjectPointerCount( + _In_ PVOID Object +); + #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ /* FSRTL Types */ @@ -9152,29 +9163,29 @@ ZwOpenDirectoryObject( _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes); -_IRQL_requires_max_(PASSIVE_LEVEL) -_When_(return==0, __drv_allocatesMem(Region)) +_Must_inspect_result_ +_At_(*BaseAddress, __drv_allocatesMem(Mem)) +__kernel_entry NTSYSCALLAPI NTSYSAPI NTSTATUS NTAPI ZwAllocateVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, - _In_ ULONG_PTR ZeroBits, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG AllocationType, - _In_ ULONG Protect); + _In_ HANDLE ProcessHandle, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect); _IRQL_requires_max_(PASSIVE_LEVEL) -_When_(return==0, __drv_freesMem(Region)) NTSYSAPI NTSTATUS NTAPI ZwFreeVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG FreeType); + _In_ HANDLE ProcessHandle, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType); _When_(Timeout == NULL, _IRQL_requires_max_(APC_LEVEL)) _When_(Timeout->QuadPart != 0, _IRQL_requires_max_(APC_LEVEL)) @@ -9335,6 +9346,286 @@ ZwSetInformationToken( _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, _In_reads_bytes_(TokenInformationLength) PVOID TokenInformation, _In_ ULONG TokenInformationLength); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwAdjustPrivilegesToken ( + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_opt_ PTOKEN_PRIVILEGES PreviousState, + _Out_ PULONG ReturnLength +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwAlertThread ( + _In_ HANDLE ThreadHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwAccessCheckAndAuditAlarm ( + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PBOOLEAN AccessStatus, + _Out_ PBOOLEAN GenerateOnClose +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwCancelIoFile ( + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwClearEvent ( + _In_ HANDLE EventHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwCloseObjectAuditAlarm ( + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwCreateSymbolicLinkObject ( + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PUNICODE_STRING TargetName +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwFlushInstructionCache ( + _In_ HANDLE ProcessHandle, + _In_opt_ PVOID BaseAddress, + _In_ ULONG FlushSize +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwFlushBuffersFile( + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwInitiatePowerAction ( + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwLoadKey ( + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenProcessToken ( + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE TokenHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenThread ( + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PCLIENT_ID ClientId +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenThreadToken ( + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _Out_ PHANDLE TokenHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwPulseEvent ( + _In_ HANDLE EventHandle, + _In_opt_ PLONG PulseCount +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryDefaultLocale ( + _In_ BOOLEAN UserProfile, + _Out_ PLCID DefaultLocaleId +); + +#if (VER_PRODUCTBUILD >= 2195) +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryDirectoryObject( + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryInformationProcess ( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwReplaceKey ( + _In_ POBJECT_ATTRIBUTES NewFileObjectAttributes, + _In_ HANDLE KeyHandle, + _In_ POBJECT_ATTRIBUTES OldFileObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwResetEvent ( + _In_ HANDLE EventHandle, + _Out_opt_ PLONG NumberOfWaitingThreads +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwRestoreKey ( + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG Flags +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwSaveKey ( + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetDefaultLocale ( + _In_ BOOLEAN UserProfile, + _In_ LCID DefaultLocaleId +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwSetDefaultUILanguage ( + _In_ LANGID LanguageId +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetInformationProcess ( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _In_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetSystemTime ( + _In_ PLARGE_INTEGER NewTime, + _Out_opt_ PLARGE_INTEGER OldTime +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwUnloadKey ( + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwWaitForMultipleObjects ( + _In_ ULONG HandleCount, + _In_ PHANDLE Handles, + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwYieldExecution ( + VOID +); + #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #ifndef __SSPI_H__ @@ -11232,74 +11523,75 @@ NTKERNELAPI LARGE_INTEGER NTAPI CcGetLsnForFileObject ( - IN PFILE_OBJECT FileObject, - OUT PLARGE_INTEGER OldestLsn OPTIONAL + _In_ PFILE_OBJECT FileObject, + _Out_opt_ PLARGE_INTEGER OldestLsn ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePool ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithQuota ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithQuotaTag ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes, + _In_ ULONG Tag ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithTag ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes, + _In_ ULONG Tag ); NTKERNELAPI BOOLEAN NTAPI FsRtlMdlReadComplete ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain + _In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain ); NTKERNELAPI BOOLEAN NTAPI FsRtlMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain ); NTKERNELAPI VOID NTAPI FsRtlNotifyChangeDirectory ( - IN PNOTIFY_SYNC NotifySync, - IN PVOID FsContext, - IN PSTRING FullDirectoryName, - IN PLIST_ENTRY NotifyList, - IN BOOLEAN WatchTree, - IN ULONG CompletionFilter, - IN PIRP NotifyIrp + _In_ PNOTIFY_SYNC NotifySync, + _In_ PVOID FsContext, + _In_ PSTRING FullDirectoryName, + _In_ PLIST_ENTRY NotifyList, + _In_ BOOLEAN WatchTree, + _In_ ULONG CompletionFilter, + _In_ PIRP NotifyIrp ); +#if 1 NTKERNELAPI NTSTATUS NTAPI @@ -11315,17 +11607,10 @@ ObCreateObject( _Out_ PVOID *Object ); -NTKERNELAPI -ULONG -NTAPI -ObGetObjectPointerCount( - _In_ PVOID Object -); - NTKERNELAPI NTSTATUS NTAPI -ObReferenceObjectByName( +ObReferenceObjectByName ( _In_ PUNICODE_STRING ObjectName, _In_ ULONG Attributes, _In_opt_ PACCESS_STATE PassedAccessState, @@ -11347,317 +11632,25 @@ ObReferenceObjectByName( NTKERNELAPI NTSTATUS NTAPI -PsLookupProcessThreadByCid( - _In_ PCLIENT_ID Cid, - _Out_opt_ PEPROCESS *Process, - _Out_ PETHREAD *Thread +PsLookupProcessThreadByCid ( + _In_ PCLIENT_ID Cid, + _Out_opt_ PEPROCESS *Process, + _Out_ PETHREAD *Thread ); NTSYSAPI NTSTATUS NTAPI -RtlSetSaclSecurityDescriptor( +RtlSetSaclSecurityDescriptor ( _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ BOOLEAN SaclPresent, - _In_ PACL Sacl, - _In_ BOOLEAN SaclDefaulted + _In_ BOOLEAN SaclPresent, + _In_ PACL Sacl, + _In_ BOOLEAN SaclDefaulted ); #define SeEnableAccessToExports() SeExports = *(PSE_EXPORTS *)SeExports; -#if (VER_PRODUCTBUILD >= 2195) - -_Must_inspect_result_ -NTSYSAPI -NTSTATUS -NTAPI -ZwAdjustPrivilegesToken( - _In_ HANDLE TokenHandle, - _In_ BOOLEAN DisableAllPrivileges, - _In_opt_ PTOKEN_PRIVILEGES NewState, - _In_ ULONG BufferLength, - _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, - _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwAlertThread( - _In_ HANDLE ThreadHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwAccessCheckAndAuditAlarm ( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PBOOLEAN AccessStatus, - OUT PBOOLEAN GenerateOnClose -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwCancelIoFile( - _In_ HANDLE FileHandle, - _Out_ PIO_STATUS_BLOCK IoStatusBlock -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwClearEvent( - _In_ HANDLE EventHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCloseObjectAuditAlarm( - _In_ PUNICODE_STRING SubsystemName, - _In_ PVOID HandleId, - _In_ BOOLEAN GenerateOnClose -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCreateSymbolicLinkObject( - _Out_ PHANDLE SymbolicLinkHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ PUNICODE_STRING Name -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwFlushInstructionCache( - _In_ HANDLE ProcessHandle, - _In_ PVOID BaseAddress, - _In_ ULONG NumberOfBytesToFlush -); - -_IRQL_requires_max_(PASSIVE_LEVEL) -NTSYSAPI -NTSTATUS -NTAPI -ZwFlushBuffersFile( - _In_ HANDLE FileHandle, - _Out_ PIO_STATUS_BLOCK IoStatusBlock -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwInitiatePowerAction( - _In_ POWER_ACTION SystemAction, - _In_ SYSTEM_POWER_STATE MinSystemState, - _In_ ULONG Flags, - _In_ BOOLEAN Asynchronous -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwLoadKey ( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes -); - -_IRQL_requires_max_(PASSIVE_LEVEL) -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenProcessToken( - _In_ HANDLE ProcessHandle, - _In_ ACCESS_MASK DesiredAccess, - _Out_ PHANDLE TokenHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenThread( - _Out_ PHANDLE ThreadHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ PCLIENT_ID ClientId -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenThreadToken( - _In_ HANDLE ThreadHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ BOOLEAN OpenAsSelf, - _Out_ PHANDLE TokenHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwPulseEvent( - _In_ HANDLE EventHandle, - _In_opt_ PLONG PulseCount -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryDefaultLocale( - _In_ BOOLEAN UserProfile, - _Out_ PLCID DefaultLocaleId -); - -#if (VER_PRODUCTBUILD >= 2195) - -_IRQL_requires_max_(PASSIVE_LEVEL) -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryDirectoryObject( - _In_ HANDLE DirectoryHandle, - _Out_ PVOID Buffer, - _In_ ULONG BufferLength, - _In_ BOOLEAN ReturnSingleEntry, - _In_ BOOLEAN RestartScan, - _Inout_ PULONG Context, - _Out_opt_ PULONG ReturnLength -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryInformationProcess ( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwReplaceKey ( - IN POBJECT_ATTRIBUTES NewFileObjectAttributes, - IN HANDLE KeyHandle, - IN POBJECT_ATTRIBUTES OldFileObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwResetEvent( - _In_ HANDLE EventHandle, - _Out_opt_ PLONG NumberOfWaitingThreads -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwRestoreKey ( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwSaveKey ( - IN HANDLE KeyHandle, - IN HANDLE FileHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetDefaultLocale( - _In_ BOOLEAN UserProfile, - _In_ LCID DefaultLocaleId -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetDefaultUILanguage ( - IN LANGID LanguageId -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetInformationProcess( - _In_ HANDLE ProcessHandle, - _In_ PROCESSINFOCLASS ProcessInformationClass, - _In_ PVOID ProcessInformation, - _In_ ULONG ProcessInformationLength -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetSystemTime( - _In_ PLARGE_INTEGER SystemTime, - _In_opt_ PLARGE_INTEGER NewSystemTime -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwUnloadKey( - _In_ POBJECT_ATTRIBUTES KeyObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwWaitForMultipleObjects( - _In_ ULONG Count, - _In_ HANDLE Object[], - _In_ WAIT_TYPE WaitType, - _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Time -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwYieldExecution ( - VOID -); +#endif #pragma pack(pop) diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index 45bda569bcc..c30a4fe21bf 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -8670,7 +8670,7 @@ RtlAssert( _In_ PVOID FailedAssertion, _In_ PVOID FileName, _In_ ULONG LineNumber, - _In_opt_ PSTR Message); + _In_opt_z_ PSTR Message); /* VOID * RtlCopyMemory( @@ -9955,59 +9955,56 @@ RtlCheckBit( #if DBG -#define ASSERT(exp) \ - (VOID)((!(exp)) ? \ +#define RTL_VERIFY(exp) \ + ((!(exp)) ? \ RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) -#define ASSERTMSG(msg, exp) \ - (VOID)((!(exp)) ? \ +#define RTL_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) -#define RTL_SOFT_ASSERT(exp) \ - (VOID)((!(exp)) ? \ +#define RTL_SOFT_VERIFY(exp) \ + ((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) -#define RTL_SOFT_ASSERTMSG(msg, exp) \ +#define RTL_SOFT_VERIFYMSG(msg, exp) \ (VOID)((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) -#define RTL_VERIFY(exp) ASSERT(exp) -#define RTL_VERIFYMSG(msg, exp) ASSERTMSG(msg, exp) +#define ASSERT(exp) ((void)RTL_VERIFY(exp)) +#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp)) -#define RTL_SOFT_VERIFY(exp) RTL_SOFT_ASSERT(exp) -#define RTL_SOFT_VERIFYMSG(msg, exp) RTL_SOFT_ASSERTMSG(msg, exp) +#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp)) +#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp)) #if defined(_MSC_VER) +# define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg) +# define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) +#else +# define __assert_annotationA(msg) \ + DbgPrint("Assertion %s(%d): %s", __FILE__, __LINE__, msg) +# define __assert_annotationW(msg) \ + DbgPrint("Assertion %s(%d): %S", __FILE__, __LINE__, msg) +#endif -#define NT_ASSERT(exp) \ +#define NT_VERIFY(exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", L#exp), \ + (__assert_annotationA(#exp), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERTMSG(msg, exp) \ +#define NT_VERIFYMSG(msg, exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", L##msg), \ + (__assert_annotationA(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERTMSGW(msg, exp) \ +#define NT_VERIFYMSGW(msg, exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", msg), \ + (__assert_annotationW(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_VERIFY NT_ASSERT -#define NT_VERIFYMSG NT_ASSERTMSG -#define NT_VERIFYMSGW NT_ASSERTMSGW - -#else - -/* GCC doesn't support __annotation (nor PDB) */ -#define NT_ASSERT(exp) \ - (VOID)((!(exp)) ? (DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_ASSERTMSG NT_ASSERT -#define NT_ASSERTMSGW NT_ASSERT - -#endif +#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) +#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) +#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) #else /* !DBG */ diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h index 9caef1211e0..12de25dcc23 100644 --- a/reactos/include/ndk/exfuncs.h +++ b/reactos/include/ndk/exfuncs.h @@ -156,13 +156,14 @@ NtClearEvent( _In_ HANDLE EventHandle ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI NtCreateEvent( _Out_ PHANDLE EventHandle, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ EVENT_TYPE EventType, _In_ BOOLEAN InitialState ); @@ -176,12 +177,13 @@ NtCreateEventPair( _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI NtCreateKeyedEvent( - _Out_ PHANDLE KeyedEventHandle, - _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE OutHandle, + _In_ ACCESS_MASK AccessMask, _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG Flags ); @@ -258,12 +260,13 @@ NtOpenEvent( _In_ POBJECT_ATTRIBUTES ObjectAttributes ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI NtOpenKeyedEvent( - _Out_ PHANDLE EventHandle, - _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE OutHandle, + _In_ ACCESS_MASK AccessMask, _In_ POBJECT_ATTRIBUTES ObjectAttributes ); @@ -405,7 +408,7 @@ NtQuerySystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, _Out_ PVOID SystemInformation, _In_ ULONG Length, - _Out_ PULONG ResultLength + _Out_opt_ PULONG ResultLength ); NTSYSCALLAPI @@ -439,11 +442,12 @@ NtReleaseMutant( _In_opt_ PLONG ReleaseCount ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI NtReleaseKeyedEvent( - _In_ HANDLE EventHandle, + _In_opt_ HANDLE EventHandle, _In_ PVOID Key, _In_ BOOLEAN Alertable, _In_opt_ PLARGE_INTEGER Timeout @@ -583,11 +587,12 @@ NtShutdownSystem( _In_ SHUTDOWN_ACTION Action ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI NtWaitForKeyedEvent( - _In_ HANDLE EventHandle, + _In_opt_ HANDLE EventHandle, _In_ PVOID Key, _In_ BOOLEAN Alertable, _In_opt_ PLARGE_INTEGER Timeout @@ -858,7 +863,7 @@ ZwQuerySystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, _Out_ PVOID SystemInformation, _In_ SIZE_T Length, - _Out_ PSIZE_T ResultLength + _Out_opt_ PSIZE_T ResultLength ); NTSYSAPI diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h index 1c65e27fd88..14658052242 100644 --- a/reactos/include/ndk/kefuncs.h +++ b/reactos/include/ndk/kefuncs.h @@ -56,7 +56,11 @@ VOID NTAPI KiDeliverApc( _In_ KPROCESSOR_MODE PreviousMode, +#ifdef _M_AMD64 _In_ PKEXCEPTION_FRAME ExceptionFrame, +#else + _Reserved_ PKEXCEPTION_FRAME ExceptionFrame, +#endif _In_ PKTRAP_FRAME TrapFrame ); @@ -205,7 +209,11 @@ BOOLEAN NTAPI KiIpiServiceRoutine( _In_ PKTRAP_FRAME TrapFrame, +#ifdef _M_AMD64 _In_ PKEXCEPTION_FRAME ExceptionFrame +#else + _Reserved_ PKEXCEPTION_FRAME ExceptionFrame +#endif ); // @@ -403,8 +411,8 @@ NTSYSCALLAPI NTSTATUS NTAPI NtQueryPerformanceCounter( - _In_ PLARGE_INTEGER Counter, - _In_ PLARGE_INTEGER Frequency + _Out_ PLARGE_INTEGER Counter, + _Out_opt_ PLARGE_INTEGER Frequency ); NTSYSCALLAPI @@ -609,8 +617,8 @@ NTSYSAPI NTSTATUS NTAPI ZwQueryPerformanceCounter( - _In_ PLARGE_INTEGER Counter, - _In_ PLARGE_INTEGER Frequency + _Out_ PLARGE_INTEGER Counter, + _Out_opt_ PLARGE_INTEGER Frequency ); NTSYSAPI diff --git a/reactos/include/ndk/mmfuncs.h b/reactos/include/ndk/mmfuncs.h index 9ee2d7a19f6..93c4840bb61 100644 --- a/reactos/include/ndk/mmfuncs.h +++ b/reactos/include/ndk/mmfuncs.h @@ -87,14 +87,14 @@ NtAllocateUserPhysicalPages( ); _Must_inspect_result_ -__drv_allocatesMem(Mem) +_At_(*BaseAddress, __drv_allocatesMem(Mem)) __kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtAllocateVirtualMemory( _In_ HANDLE ProcessHandle, - _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, _In_ ULONG_PTR ZeroBits, _Inout_ PSIZE_T RegionSize, _In_ ULONG AllocationType, @@ -153,6 +153,7 @@ NtFreeUserPhysicalPages( ); __kernel_entry +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSCALLAPI NTSTATUS NTAPI @@ -257,7 +258,7 @@ NtQueryVirtualMemory( _In_ MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, _Out_ PVOID VirtualMemoryInformation, _In_ SIZE_T Length, - _Out_ PSIZE_T ResultLength + _Out_opt_ PSIZE_T ResultLength ); NTSYSCALLAPI @@ -268,7 +269,7 @@ NtReadVirtualMemory( _In_ PVOID BaseAddress, _Out_ PVOID Buffer, _In_ SIZE_T NumberOfBytesToRead, - _Out_ PSIZE_T NumberOfBytesRead + _Out_opt_ PSIZE_T NumberOfBytesRead ); NTSTATUS @@ -305,7 +306,7 @@ NtWriteVirtualMemory( _In_ PVOID BaseAddress, _In_ PVOID Buffer, _In_ SIZE_T NumberOfBytesToWrite, - _Out_ PSIZE_T NumberOfBytesWritten + _Out_opt_ PSIZE_T NumberOfBytesWritten ); NTSYSAPI @@ -316,12 +317,15 @@ ZwAreMappedFilesTheSame( _In_ PVOID File2MappedAsFile ); +_Must_inspect_result_ +_At_(*BaseAddress, __drv_allocatesMem(Mem)) +__kernel_entry NTSYSCALLAPI NTSYSAPI NTSTATUS NTAPI ZwAllocateVirtualMemory( _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, _In_ ULONG_PTR ZeroBits, _Inout_ PSIZE_T RegionSize, _In_ ULONG AllocationType, @@ -361,13 +365,12 @@ ZwExtendSection( ); _IRQL_requires_max_(PASSIVE_LEVEL) -_When_(return==0, __drv_freesMem(Region)) NTSYSAPI NTSTATUS NTAPI ZwFreeVirtualMemory( _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, _Inout_ PSIZE_T RegionSize, _In_ ULONG FreeType ); @@ -427,7 +430,7 @@ ZwQuerySection( _In_ SECTION_INFORMATION_CLASS SectionInformationClass, _Out_ PVOID SectionInformation, _In_ SIZE_T Length, - _Out_ PSIZE_T ResultLength + _Out_opt_ PSIZE_T ResultLength ); NTSYSAPI @@ -439,7 +442,7 @@ ZwQueryVirtualMemory( _In_ MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, _Out_ PVOID VirtualMemoryInformation, _In_ SIZE_T Length, - _Out_ PSIZE_T ResultLength + _Out_opt_ PSIZE_T ResultLength ); NTSYSAPI @@ -450,7 +453,7 @@ ZwReadVirtualMemory( _In_ PVOID BaseAddress, _Out_ PVOID Buffer, _In_ SIZE_T NumberOfBytesToRead, - _Out_ PSIZE_T NumberOfBytesRead + _Out_opt_ PSIZE_T NumberOfBytesRead ); NTSYSAPI @@ -480,7 +483,7 @@ ZwWriteVirtualMemory( _In_ PVOID BaseAddress, _In_ PVOID Buffer, _In_ SIZE_T NumberOfBytesToWrite, - _Out_ PSIZE_T NumberOfBytesWritten + _Out_opt_ PSIZE_T NumberOfBytesWritten ); #endif diff --git a/reactos/include/ndk/obfuncs.h b/reactos/include/ndk/obfuncs.h index 0b2c527b7ea..a9b54d32c8b 100644 --- a/reactos/include/ndk/obfuncs.h +++ b/reactos/include/ndk/obfuncs.h @@ -369,7 +369,7 @@ NTAPI NtWaitForSingleObject( _In_ HANDLE Object, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Time + _In_opt_ PLARGE_INTEGER Time ); NTSYSAPI @@ -502,7 +502,7 @@ ZwSignalAndWaitForSingleObject( _In_ HANDLE SignalObject, _In_ HANDLE WaitObject, _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Time + _In_opt_ PLARGE_INTEGER Time ); NTSYSAPI diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 815e815542c..992fd04d9da 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -608,8 +608,6 @@ RtlIsGenericTableEmptyAvl( #endif /* RTL_USE_AVL_TABLES */ -#endif /* NTOS_MODE_USER */ - // // Error and Exception Functions // @@ -639,6 +637,8 @@ RtlSetUnhandledExceptionFilter( _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter ); +#endif /* NTOS_MODE_USER */ + NTSYSAPI VOID NTAPI @@ -861,7 +861,7 @@ RtlGetUserInfoHeap( _In_ PVOID HeapHandle, _In_ ULONG Flags, _In_ PVOID BaseAddress, - _Out_opt_ PVOID *UserValue, + _Inout_opt_ PVOID *UserValue, _Out_opt_ PULONG UserFlags ); @@ -876,13 +876,14 @@ RtlProtectHeap( NTSYSAPI NTSTATUS NTAPI -RtlQueryHeapInformation ( +RtlQueryHeapInformation( _In_ PVOID HeapHandle, _In_ HEAP_INFORMATION_CLASS HeapInformationClass, - _Out_opt_ PVOID HeapInformation, - _In_opt_ SIZE_T HeapInformationLength, - _Out_opt_ PSIZE_T ReturnLength - ); + _Out_ PVOID HeapInformation, + _In_ SIZE_T HeapInformationLength, + _When_(HeapInformationClass==HeapCompatibilityInformation, _On_failure_(_Out_opt_)) + _Out_opt_ PSIZE_T ReturnLength +); _Ret_opt_z_ NTSYSAPI @@ -909,16 +910,15 @@ RtlReAllocateHeap( _In_ SIZE_T Size ); -_Success_(return != 0) NTSYSAPI NTSTATUS NTAPI -RtlSetHeapInformation ( +RtlSetHeapInformation( _In_ PVOID HeapHandle, _In_ HEAP_INFORMATION_CLASS HeapInformationClass, - _In_opt_ PVOID HeapInformation, - _In_opt_ SIZE_T HeapInformationLength - ); + _When_(HeapInformationClass==HeapCompatibilityInformation,_In_) PVOID HeapInformation, + _In_ SIZE_T HeapInformationLength +); NTSYSAPI BOOLEAN @@ -990,7 +990,7 @@ NTAPI RtlValidateHeap( _In_ HANDLE Heap, _In_ ULONG Flags, - _In_ PVOID P + _In_opt_ PVOID P ); NTSYSAPI @@ -1468,21 +1468,22 @@ RtlReleasePrivilege( _In_ PVOID ReturnedState ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlSelfRelativeToAbsoluteSD( - _In_ PSECURITY_DESCRIPTOR SelfRelativeSD, - _Out_ PSECURITY_DESCRIPTOR AbsoluteSD, - _In_ PULONG AbsoluteSDSize, - _In_ PACL Dacl, - _In_ PULONG DaclSize, - _In_ PACL Sacl, - _In_ PULONG SaclSize, - _In_ PSID Owner, - _In_ PULONG OwnerSize, - _In_ PSID PrimaryGroup, - _In_ PULONG PrimaryGroupSize + _In_ PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, + _Out_writes_bytes_to_opt_(*AbsoluteSecurityDescriptorSize, *AbsoluteSecurityDescriptorSize) PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, + _Inout_ PULONG AbsoluteSecurityDescriptorSize, + _Out_writes_bytes_to_opt_(*DaclSize, *DaclSize) PACL Dacl, + _Inout_ PULONG DaclSize, + _Out_writes_bytes_to_opt_(*SaclSize, *SaclSize) PACL Sacl, + _Inout_ PULONG SaclSize, + _Out_writes_bytes_to_opt_(*OwnerSize, *OwnerSize) PSID Owner, + _Inout_ PULONG OwnerSize, + _Out_writes_bytes_to_opt_(*PrimaryGroupSize, *PrimaryGroupSize) PSID PrimaryGroup, + _Inout_ PULONG PrimaryGroupSize ); NTSYSAPI @@ -1522,13 +1523,14 @@ RtlSetDaclSecurityDescriptor( _In_opt_ BOOLEAN DaclDefaulted ); +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlSetGroupSecurityDescriptor( _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PSID Group, - _In_ BOOLEAN GroupDefaulted + _In_opt_ PSID Group, + _In_opt_ BOOLEAN GroupDefaulted ); #ifdef NTOS_MODE_USER @@ -1690,7 +1692,7 @@ RtlIntegerToChar( _In_ ULONG Value, _In_ ULONG Base, _In_ ULONG Length, - _Inout_ PCHAR String + _Out_ PCHAR String ); NTSYSAPI @@ -1811,6 +1813,7 @@ RtlUpcaseUnicodeStringToOemString( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ +//_At_(DestinationString->Buffer, _Post_bytecount_(DestinationString->Length)) NTSYSAPI NTSTATUS NTAPI @@ -2215,20 +2218,22 @@ RtlFreeAnsiString( PANSI_STRING AnsiString ); +_IRQL_requires_max_(DISPATCH_LEVEL) NTSYSAPI VOID NTAPI RtlInitAnsiString( _Out_ PANSI_STRING DestinationString, - _In_z_ PCSZ SourceString + _In_opt_z_ __drv_aliasesMem PCSZ SourceString ); +_IRQL_requires_max_(DISPATCH_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlInitAnsiStringEx( _Out_ PANSI_STRING DestinationString, - _In_z_ PCSZ SourceString + _In_opt_z_ __drv_aliasesMem PCSZ SourceString ); // @@ -2258,13 +2263,14 @@ RtlMultiByteToUnicodeN( _In_ ULONG BytesInMultiByteString ); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI RtlMultiByteToUnicodeSize( - _Out_ PULONG UnicodeSize, - _In_z_ PCSTR MbString, - _In_ ULONG MbSize + _Out_ PULONG BytesInUnicodeString, + _In_reads_bytes_(BytesInMultiByteString) const CHAR *MultiByteString, + _In_ ULONG BytesInMultiByteString ); // @@ -2349,7 +2355,7 @@ NTSTATUS NTAPI RtlCreateProcessParameters ( _Out_ PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, - _In_opt_ PUNICODE_STRING ImagePathName, + _In_ PUNICODE_STRING ImagePathName, _In_opt_ PUNICODE_STRING DllPath, _In_opt_ PUNICODE_STRING CurrentDirectory, _In_opt_ PUNICODE_STRING CommandLine, @@ -2376,12 +2382,29 @@ RtlCreateUserProcess( _Out_ PRTL_USER_PROCESS_INFORMATION ProcessInfo ); +#if (NTDDI_VERSION >= NTDDI_WIN7) +NTSYSAPI +NTSTATUS +NTAPI +RtlCreateUserThread( + _In_ PVOID ThreadContext, + _Out_ HANDLE *OutThreadHandle, + _Reserved_ PVOID Reserved1, + _Reserved_ PVOID Reserved2, + _Reserved_ PVOID Reserved3, + _Reserved_ PVOID Reserved4, + _Reserved_ PVOID Reserved5, + _Reserved_ PVOID Reserved6, + _Reserved_ PVOID Reserved7, + _Reserved_ PVOID Reserved8 +); +#else NTSYSAPI NTSTATUS NTAPI RtlCreateUserThread( _In_ HANDLE ProcessHandle, - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, _In_ BOOLEAN CreateSuspended, _In_ ULONG StackZeroBits, _In_ SIZE_T StackReserve, @@ -2391,6 +2414,7 @@ RtlCreateUserThread( _Inout_ PHANDLE ThreadHandle, _Inout_ PCLIENT_ID ClientId ); +#endif NTSYSAPI PRTL_USER_PROCESS_PARAMETERS @@ -2626,10 +2650,10 @@ NTSYSAPI BOOLEAN NTAPI RtlDosPathNameToNtPathName_U( - _In_ PCWSTR DosPathName, + _In_opt_z_ PCWSTR DosPathName, _Out_ PUNICODE_STRING NtPathName, - _Out_ PCWSTR *NtFileNamePart, - _Out_ PRTL_RELATIVE_NAME_U DirectoryInfo + _Out_opt_ PCWSTR *NtFileNamePart, + _Out_opt_ PRTL_RELATIVE_NAME_U DirectoryInfo ); NTSYSAPI @@ -2642,13 +2666,14 @@ RtlDosPathNameToRelativeNtPathName_U( _Out_ PRTL_RELATIVE_NAME_U RelativeName ); +_At_(Destination->Buffer, _Out_bytecap_(Destination->MaximumLength)) NTSYSAPI NTSTATUS NTAPI RtlExpandEnvironmentStrings_U( _In_z_ PWSTR Environment, _In_ PUNICODE_STRING Source, - _Out_ PUNICODE_STRING Destination, + _Inout_ PUNICODE_STRING Destination, _Out_ PULONG Length ); @@ -2666,8 +2691,8 @@ NTAPI RtlGetFullPathName_U( _In_ PCWSTR FileName, _In_ ULONG Size, - _In_ PWSTR Buffer, - _Out_ PWSTR *ShortName + _Out_z_bytecap_(Size) PWSTR Buffer, + _Out_opt_ PWSTR *ShortName ); #if (NTDDI_VERSION >= NTDDI_WIN7) @@ -2687,13 +2712,13 @@ NTSTATUS NTAPI RtlGetFullPathName_UstrEx( _In_ PUNICODE_STRING FileName, - _In_ PUNICODE_STRING StaticString, - _In_ PUNICODE_STRING DynamicString, - _In_ PUNICODE_STRING *StringUsed, - _In_ PSIZE_T FilePartSize, - _Out_ PBOOLEAN NameInvalid, + _In_opt_ PUNICODE_STRING StaticString, + _In_opt_ PUNICODE_STRING DynamicString, + _Out_opt_ PUNICODE_STRING *StringUsed, + _Out_opt_ PSIZE_T FilePartSize, + _Out_opt_ PBOOLEAN NameInvalid, _Out_ RTL_PATH_TYPE* PathType, - _Out_ PSIZE_T LengthNeeded + _Out_opt_ PSIZE_T LengthNeeded ); NTSYSAPI @@ -2717,7 +2742,6 @@ RtlIsDosDeviceName_Ustr( _In_ PCUNICODE_STRING Name ); - _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ NTSYSAPI @@ -3026,7 +3050,7 @@ NTAPI RtlFindNextForwardRunSet( _In_ PRTL_BITMAP BitMapHeader, _In_ ULONG FromIndex, - _In_ PULONG StartingRunIndex + _Out_ PULONG StartingRunIndex ); NTSYSAPI @@ -3227,8 +3251,8 @@ ULONG NTAPI DbgPrompt( _In_z_ PCCH Prompt, - _Out_writes_bytes_(Length) PCH Response, - _In_ ULONG Length + _Out_writes_bytes_(MaximumResponseLength) PCH Response, + _In_ ULONG MaximumResponseLength ); VOID @@ -3346,6 +3370,7 @@ RtlIsValidHandle( _In_ PRTL_HANDLE_TABLE_ENTRY Handle ); +_Success_(return!=FALSE) NTSYSAPI BOOLEAN NTAPI @@ -3374,6 +3399,7 @@ ULONG NTAPI RtlGetNtGlobalFlags(VOID); +_Success_(return!=NULL) NTSYSAPI PVOID NTAPI @@ -3391,7 +3417,7 @@ RtlImageRvaToVa( _In_ PIMAGE_NT_HEADERS NtHeader, _In_ PVOID BaseAddress, _In_ ULONG Rva, - _Out_ PIMAGE_SECTION_HEADER *SectionHeader + _Inout_opt_ PIMAGE_SECTION_HEADER *SectionHeader ); NTSYSAPI @@ -3407,7 +3433,7 @@ RtlImageNtHeaderEx( _In_ ULONG Flags, _In_ PVOID BaseAddress, _In_ ULONGLONG Size, - _In_ PIMAGE_NT_HEADERS *NtHeader + _Out_ PIMAGE_NT_HEADERS *NtHeader ); NTSYSAPI @@ -3442,7 +3468,7 @@ RtlActivateActivationContextEx( _In_ ULONG Flags, _In_ PTEB Teb, _In_ PVOID Context, - _In_ PULONG_PTR Cookie + _Out_ PULONG_PTR Cookie ); NTSYSAPI @@ -3549,10 +3575,20 @@ NTSTATUS NTAPI RtlQueryInformationActivationContext( _In_ DWORD dwFlags, - _In_ PVOID Context, - _In_ PVOID pvSubInstance, + _In_opt_ PVOID Context, + _In_opt_ PVOID pvSubInstance, _In_ ULONG ulInfoClass, - _Out_bytecap_(cbBufer) PVOID pvBuffer, + _Out_bytecap_(cbBuffer) PVOID pvBuffer, + _In_opt_ SIZE_T cbBuffer, + _Out_opt_ SIZE_T *pcbWrittenOrRequired +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlQueryInformationActiveActivationContext( + _In_ ULONG ulInfoClass, + _Out_bytecap_(cbBuffer) PVOID pvBuffer, _In_opt_ SIZE_T cbBuffer, _Out_opt_ SIZE_T *pcbWrittenOrRequired ); @@ -3587,12 +3623,14 @@ RtlWow64EnableFsRedirectionEx( // // Registry Functions // +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlCheckRegistryKey( _In_ ULONG RelativeTo, - _In_z_ PWSTR Path + _In_ PWSTR Path ); NTSYSAPI @@ -3733,7 +3771,7 @@ VOID NTAPI RtlInitCodePageTable( _In_ PUSHORT TableBase, - _Inout_ PCPTABLEINFO CodePageTable + _Out_ PCPTABLEINFO CodePageTable ); NTSYSAPI diff --git a/reactos/include/ndk/sefuncs.h b/reactos/include/ndk/sefuncs.h index ae88d078496..e0e18e14605 100644 --- a/reactos/include/ndk/sefuncs.h +++ b/reactos/include/ndk/sefuncs.h @@ -173,7 +173,7 @@ NtAdjustPrivilegesToken( _In_opt_ PTOKEN_PRIVILEGES NewState, _In_ ULONG BufferLength, _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, - _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength ); NTSYSCALLAPI @@ -368,7 +368,7 @@ ZwAdjustPrivilegesToken( _In_opt_ PTOKEN_PRIVILEGES NewState, _In_ ULONG BufferLength, _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, - _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength ); NTSYSAPI @@ -504,9 +504,9 @@ NTAPI ZwQueryInformationToken( _In_ HANDLE TokenHandle, _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, - _Out_writes_bytes_to_opt_(TokenInformationLength,*ReturnLength) PVOID TokenInformation, - _In_ ULONG TokenInformationLength, - _Out_ PULONG ReturnLength + _Out_writes_bytes_to_opt_(Length,*ResultLength) PVOID TokenInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength ); NTSYSAPI diff --git a/reactos/include/ndk/setypes.h b/reactos/include/ndk/setypes.h index 94eb349fae2..812bf4bf8da 100644 --- a/reactos/include/ndk/setypes.h +++ b/reactos/include/ndk/setypes.h @@ -66,6 +66,22 @@ Author: #define SE_CREATE_GLOBAL_PRIVILEGE (30L) #define SE_MAX_WELL_KNOWN_PRIVILEGE (SE_CREATE_GLOBAL_PRIVILEGE) +typedef struct _TOKEN_MANDATORY_POLICY { + ULONG Policy; +} TOKEN_MANDATORY_POLICY, *PTOKEN_MANDATORY_POLICY; + +typedef struct _TOKEN_ACCESS_INFORMATION +{ + struct _SID_AND_ATTRIBUTES_HASH *SidHash; + struct _SID_AND_ATTRIBUTES_HASH *RestrictedSidHash; + struct _TOKEN_PRIVILEGES *Privileges; + LUID AuthenticationId; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + TOKEN_MANDATORY_POLICY MandatoryPolicy; + ULONG Flags; +} TOKEN_ACCESS_INFORMATION, *PTOKEN_ACCESS_INFORMATION; + #else // diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index 6c5a331d75c..8c4cfdca407 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -20,6 +20,14 @@ Author: #define _NTDEF_ #define _NTDEF_H +// +// Use dummy macros, if SAL 2 is not available +// +#include +#if (_SAL_VERSION < 20) +#include +#endif + // // NDK Applications must use Unicode // @@ -129,7 +137,7 @@ typedef LONG KPRIORITY; #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) #ifndef __BCRYPT_H__ -typedef LONG NTSTATUS, *PNTSTATUS; +typedef _Return_type_success_(return >= 0) long NTSTATUS, *PNTSTATUS; #endif typedef struct _UNICODE_STRING diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h index 86400e75615..90d8a9a6951 100644 --- a/reactos/include/psdk/sal.h +++ b/reactos/include/psdk/sal.h @@ -405,32 +405,32 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _SA_annotes2(n,pp1,pp2) [SAL_annotes(Name=#n, p1=_SA_SPECSTRIZE(pp1), p2=_SA_SPECSTRIZE(pp2))] #define _SA_annotes3(n,pp1,pp2,pp3) [SAL_annotes(Name=#n, p1=_SA_SPECSTRIZE(pp1), p2=_SA_SPECSTRIZE(pp2), p3=_SA_SPECSTRIZE(pp3))] -#define _SAL2_Name(Name) _SA_annotes3(SAL_name, #Name, "", "2") -#define _SAL11_Name(Name) _SA_annotes3(SAL_name, #Name, "", "1.1") +#define _SAL2_NAME(Name) _SA_annotes3(SAL_name, #Name, "", "2") +#define _SAL11_NAME(Name) _SA_annotes3(SAL_name, #Name, "", "1.1") #define _Pre_ [SAL_pre] #define _Post_ [SAL_post] #define _Deref_impl_ [SAL_deref] #define _Notref_impl_ [SAL_notref] #define __inner_exceptthat [SAL_except] -#define __inner_typefix(ctype) [SAL_typefix(p1=#ctype)] +#define __inner_typefix(ctype) [SAL_typefix(p1=_SA_SPECSTRIZE(ctype))] #define _Group_(annos) [SAL_begin] annos [SAL_end] #define _When_(expr, annos) [SAL_when(p1=_SA_SPECSTRIZE(expr))] _Group_(annos) #define _At_(target, annos) [SAL_at(p1=_SA_SPECSTRIZE(target))] _Group_(annos) -#define _At_buffer_(target, iter, bound, annos) [SAL_at_buffer(p1=#target, p2=#iter, p3=#bound)] [SAL_begin] annos [SAL_end] +#define _At_buffer_(target, iter, bound, annos) [SAL_at_buffer(p1=_SA_SPECSTRIZE(target), p2=_SA_SPECSTRIZE(iter), p3=_SA_SPECSTRIZE(bound))] [SAL_begin] annos [SAL_end] #define _On_failure_(annos) [SAL_context(p1="SAL_failed")] _Group_(_Post_ _Group_(annos)) #define _Always_(annos) _Group_(annos) _On_failure_(annos) -#define _Analysis_noreturn_ _SAL2_Name(_Analysis_noreturn_) [SAL_annotes(Name="SAL_terminates")] +#define _Analysis_noreturn_ _SAL2_NAME(_Analysis_noreturn_) [SAL_annotes(Name="SAL_terminates")] #define _Analysis_assume_(expr) __assume(expr) -#define _Check_return_ _SAL2_Name(_Check_return_) [SA_Post(MustCheck=SA_Yes)] -#define _COM_Outptr_ _SAL2_Name(_COM_Outptr_) _Group_(_Outptr_ _On_failure_(_Deref_post_null_)) -#define _COM_Outptr_opt_ _SAL2_Name(_COM_Outptr_opt_) _Group_(_Outptr_opt_ _On_failure_(_Deref_post_null_)) -#define _COM_Outptr_opt_result_maybenull_ _SAL2_Name(_COM_Outptr_opt_result_maybenull_) _Group_(_Outptr_opt_result_maybenull_ _On_failure_(_Deref_post_null_)) -#define _COM_Outptr_result_maybenull_ _SAL2_Name(_COM_Outptr_result_maybenull_) _Group_(_Outptr_opt_result_maybenull_ _On_failure_(_Deref_post_null_)) -#define _Const_ _SAL2_Name(_Const_) [SA_Pre(Access=SA_Read,Notref=1)] -#define _Deref_in_bound_ _SAL2_Name(_Deref_in_bound_) [SA_PreBound(Deref=1)] +#define _Check_return_ _SAL2_NAME(_Check_return_) [SA_Post(MustCheck=SA_Yes)] +#define _COM_Outptr_ _SAL2_NAME(_COM_Outptr_) _Group_(_Outptr_ _On_failure_(_Deref_post_null_)) +#define _COM_Outptr_opt_ _SAL2_NAME(_COM_Outptr_opt_) _Group_(_Outptr_opt_ _On_failure_(_Deref_post_null_)) +#define _COM_Outptr_opt_result_maybenull_ _SAL2_NAME(_COM_Outptr_opt_result_maybenull_) _Group_(_Outptr_opt_result_maybenull_ _On_failure_(_Deref_post_null_)) +#define _COM_Outptr_result_maybenull_ _SAL2_NAME(_COM_Outptr_result_maybenull_) _Group_(_Outptr_opt_result_maybenull_ _On_failure_(_Deref_post_null_)) +#define _Const_ _SAL2_NAME(_Const_) [SA_Pre(Access=SA_Read,Notref=1)] +#define _Deref_in_bound_ _SAL2_NAME(_Deref_in_bound_) [SA_PreBound(Deref=1)] //#define _Deref_in_range_(lb,ub) //#define _Deref_inout_bound_ //#define _Deref_inout_z_ @@ -440,18 +440,18 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_opt_out_opt_ //#define _Deref_opt_out_opt_z_ //#define _Deref_opt_out_z_ -#define _Deref_out_ _SAL2_Name(_Deref_out_) _Group_(_Out_ _Deref_post_valid_) +#define _Deref_out_ _SAL2_NAME(_Deref_out_) _Group_(_Out_ _Deref_post_valid_) //#define _Deref_out_bound_ //#define _Deref_out_opt_ //#define _Deref_out_opt_z_ -#define _Deref_out_range_(lb,ub) _SAL2_Name(_Deref_out_range_) _Group_(_Post_ [SAL_notref] [SAL_deref] [SAL_annotes(Name="SAL_range", p1=#lb, p2=#ub)]) +#define _Deref_out_range_(lb,ub) _SAL2_NAME(_Deref_out_range_) _Group_(_Post_ [SAL_notref] [SAL_deref] [SAL_annotes(Name="SAL_range", p1=_SA_SPECSTRIZE(lb), p2=_SA_SPECSTRIZE(ub))]) //#define _Deref_out_z_ //#define _Deref_out_z_bytecap_c_(size) //#define _Deref_out_z_cap_c_(size) -#define _Deref_post_bytecap_(size) +#define _Deref_post_bytecap_(size) _SAL11_NAME(_Deref_post_bytecap_) _Group_([SA_Post(Deref=1,Null=SA_No,Notref=1)] [SA_Post(Deref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Deref_post_bytecap_c_(size) //#define _Deref_post_bytecap_x_(size) -//#define _Deref_post_bytecount_(size) +#define _Deref_post_bytecount_(size) //#define _Deref_post_bytecount_c_(size) //#define _Deref_post_bytecount_x_(size) //#define _Deref_post_cap_(size) @@ -462,7 +462,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_post_count_x_(size) //#define _Deref_post_maybenull_ //#define _Deref_post_notnull_ -//#define _Deref_post_null_ +#define _Deref_post_null_ _SAL11_NAME(_Deref_post_null_) _Group_([SA_Post(Deref=1,Null=SA_Yes,Notref=1)] ) //#define _Deref_post_opt_bytecap_(size) //#define _Deref_post_opt_bytecap_c_(size) //#define _Deref_post_opt_bytecap_x_(size) @@ -489,7 +489,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_post_opt_z_cap_(size) //#define _Deref_post_opt_z_cap_c_(size) //#define _Deref_post_opt_z_cap_x_(size) -#define _Deref_post_valid_ _SAL2_Name(_Deref_post_valid_) _Group_([SA_Post(Deref=1,Null=SA_No,Notref=1)] [SA_Post(Valid=SA_Yes)]) +#define _Deref_post_valid_ _SAL2_NAME(_Deref_post_valid_) _Group_([SA_Post(Deref=1,Null=SA_No,Notref=1)] [SA_Post(Valid=SA_Yes)]) //#define _Deref_post_valid_bytecap_(size) //#define _Deref_post_valid_bytecap_c_(size) //#define _Deref_post_valid_bytecap_x_(size) @@ -506,7 +506,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_pre_bytecap_(size) //#define _Deref_pre_bytecap_c_(size) //#define _Deref_pre_bytecap_x_(size) -//#define _Deref_pre_bytecount_(size) +#define _Deref_pre_bytecount_(size) _SAL11_NAME(_Deref_pre_bytecount_) _Group_([SA_Pre(Deref=1,Null=SA_No,Notref=1)] [SA_Pre(Deref=1,ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Deref_pre_bytecount_c_(size) //#define _Deref_pre_bytecount_x_(size) //#define _Deref_pre_cap_(size) @@ -519,7 +519,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_pre_maybenull_ //#define _Deref_pre_notnull_ //#define _Deref_pre_null_ -#define _Deref_pre_opt_bytecap_(size) _SAL11_Name(_Pre_opt_bytecap_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size))]) +#define _Deref_pre_opt_bytecap_(size) _SAL11_NAME(_Pre_opt_bytecap_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Deref_pre_opt_bytecap_c_(size) //#define _Deref_pre_opt_bytecap_x_(size) //#define _Deref_pre_opt_bytecount_(size) @@ -545,7 +545,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_pre_opt_z_cap_(size) //#define _Deref_pre_opt_z_cap_c_(size) //#define _Deref_pre_opt_z_cap_x_(size) -#define _Deref_pre_readonly_ _SAL2_Name(_Deref_pre_readonly_) _Group_([SA_Pre(Deref=1,Access=SA_Read,Notref=1)]) +#define _Deref_pre_readonly_ _SAL2_NAME(_Deref_pre_readonly_) _Group_([SA_Pre(Deref=1,Access=SA_Read,Notref=1)]) //#define _Deref_pre_valid_ //#define _Deref_pre_valid_bytecap_(size) //#define _Deref_pre_valid_bytecap_c_(size) @@ -598,66 +598,66 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Deref_ret_range_(lb,ub) //#define _Deref_ret_z_ //#define _Deref2_pre_readonly_ -#define _Field_range_(min,max) _SAL2_Name(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) -#define _Field_size_(size) _SAL2_Name(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) -#define _Field_size_bytes_(size) _SAL2_Name(_Field_size_bytes_) _Group_(_Notnull_ _Writable_bytes_(size)) +#define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) +#define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) +#define _Field_size_bytes_(size) _SAL2_NAME(_Field_size_bytes_) _Group_(_Notnull_ _Writable_bytes_(size)) //#define _Field_size_bytes_full_(size) //#define _Field_size_bytes_full_opt_(size) -#define _Field_size_bytes_opt_(size) _SAL2_Name(_Field_size_bytes_opt_) _Group_(_Maybenull_ _Writable_bytes_(size)) +#define _Field_size_bytes_opt_(size) _SAL2_NAME(_Field_size_bytes_opt_) _Group_(_Maybenull_ _Writable_bytes_(size)) //#define _Field_size_bytes_part_(size, count) -#define _Field_size_bytes_part_opt_(size, count) _SAL2_Name(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) +#define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size) //#define _Field_size_opt_(size) //#define _Field_size_part_(size, count) //#define _Field_size_part_opt_(size, count) //#define _Field_z_ -#define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, #x) -#define _In_ _SAL2_Name(_In_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(Valid=SA_Yes)] [SA_Pre(Deref=1,Access=SA_Read,Notref=1)]) +#define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, _SA_SPECSTRIZE(x)) +#define _In_ _SAL2_NAME(_In_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(Valid=SA_Yes)] [SA_Pre(Deref=1,Access=SA_Read,Notref=1)]) //#define _In_bound_ -#define _In_bytecount_(size) _SAL11_Name(_In_bytecount_) _Group_(_Pre_bytecount_(size) _Deref_pre_readonly_) +#define _In_bytecount_(size) _SAL11_NAME(_In_bytecount_) _Group_(_Pre_bytecount_(size) _Deref_pre_readonly_) //#define _In_bytecount_c_(size) //#define _In_bytecount_x_(size) -#define _In_count_(size) -#define _In_count_c_(size) +#define _In_count_(size) _SAL11_NAME(_In_count_) _Group_(_Pre_count_(size) _Deref_pre_readonly_) +#define _In_count_c_(size) _SAL11_NAME(_In_count_c_) _Group_(_Pre_count_c_(size) _Deref_pre_readonly_) //#define _In_count_x_(size) //#define _In_defensive_(annotes) -#define _In_opt_ _SAL2_Name(_In_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)] _Deref_pre_readonly_) -#define _In_opt_bytecount_(size) +#define _In_opt_ _SAL2_NAME(_In_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)] _Deref_pre_readonly_) +#define _In_opt_bytecount_(size) _SAL11_NAME(_In_opt_bytecount_) _Group_(_Pre_opt_bytecount_(size) _Deref_pre_readonly_) //#define _In_opt_bytecount_c_(size) //#define _In_opt_bytecount_x_(size) //#define _In_opt_count_(size) //#define _In_opt_count_c_(size) //#define _In_opt_count_x_(size) //#define _In_opt_ptrdiff_count_(size) -#define _In_opt_z_ +#define _In_opt_z_ _SAL2_NAME(_In_opt_z_) _Group_(_In_opt_ [SA_Pre(NullTerminated=SA_Yes)]) //#define _In_opt_z_bytecount_(size) //#define _In_opt_z_bytecount_c_(size) -#define _In_opt_z_count_(size) +#define _In_opt_z_count_(size) _SAL11_NAME(_In_opt_z_count_) _Group_(_Pre_opt_z_ _Pre_opt_count_(size) _Deref_pre_readonly_) //#define _In_opt_z_count_c_(size) //#define _In_ptrdiff_count_(size) -#define _In_range_(lb,ub) -#define _In_reads_(size) -#define _In_reads_bytes_(size) -#define _In_reads_bytes_opt_(size) -#define _In_reads_opt_(size) +#define _In_range_(lb,ub) _SAL2_NAME(_In_range_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_range", p1=_SA_SPECSTRIZE(lb), p2=_SA_SPECSTRIZE(ub))]) +#define _In_reads_(size) _SAL2_NAME(_In_reads_) _Group_(_Pre_count_(size) _Deref_pre_readonly_) +#define _In_reads_bytes_(size) _SAL2_NAME(_In_reads_bytes_) _Group_(_Pre_bytecount_(size) _Deref_pre_readonly_) +#define _In_reads_bytes_opt_(size) _SAL2_NAME(_In_reads_bytes_opt_) _Group_(_Pre_opt_bytecount_(size) _Deref_pre_readonly_) +#define _In_reads_opt_(size) _SAL2_NAME(_In_reads_opt_) _Group_(_Pre_opt_count_(size) _Deref_pre_readonly_) //#define _In_reads_opt_z_(size) -#define _In_reads_or_z_(size) +#define _In_reads_or_z_(size) _SAL2_NAME(_In_reads_or_z_) _Group_(_In_ _When_(_String_length_(_Curr_) < (size), _Pre_z_) _When_(_String_length_(_Curr_) >= (size), [SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(size))])) //#define _In_reads_to_ptr_(ptr) //#define _In_reads_to_ptr_opt_(ptr) //#define _In_reads_to_ptr_opt_z_(ptr) //#define _In_reads_to_ptr_z_(ptr) -#define _In_reads_z_(size) -#define _In_z_ -#define _In_z_bytecount_(size) +#define _In_reads_z_(size) _SAL2_NAME(_In_reads_z_) _Group_(_In_reads_(size) _Pre_z_) +#define _In_z_ _SAL2_NAME(_In_z_) _Group_(_In_ [SA_Pre(NullTerminated=SA_Yes)]) +#define _In_z_bytecount_(size) _SAL11_NAME(_In_z_bytecount_) _Group_(_Pre_z_ _Pre_bytecount_(size) _Deref_pre_readonly_) //#define _In_z_bytecount_c_(size) -#define _In_z_count_(size) +#define _In_z_count_(size) _SAL11_NAME(_In_z_count_) _Group_(_Pre_z_ _Pre_count_(size) _Deref_pre_readonly_) //#define _In_z_count_c_(size) -#define _Inout_ _SAL2_Name(_Inout_) _Group_(_Prepost_valid_) -#define _Inout_bytecap_(size) +#define _Inout_ _SAL2_NAME(_Inout_) _Group_(_Prepost_valid_) +#define _Inout_bytecap_(size) _SAL11_NAME(_Inout_bytecap_) _Group_(_Pre_valid_bytecap_(size) _Post_valid_) //#define _Inout_bytecap_c_(size) //#define _Inout_bytecap_x_(size) -#define _Inout_bytecount_(size) +#define _Inout_bytecount_(size) _SAL11_NAME(_Inout_bytecount_) _Group_(_Prepost_bytecount_(size)) //#define _Inout_bytecount_c_(size) //#define _Inout_bytecount_x_(size) //#define _Inout_cap_(size) @@ -667,7 +667,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Inout_count_c_(size) //#define _Inout_count_x_(size) //#define _Inout_defensive_(annotes) -#define _Inout_opt_ _SAL2_Name(_Inout_opt_) _Group_(_Prepost_opt_valid_) +#define _Inout_opt_ _SAL2_NAME(_Inout_opt_) _Group_(_Prepost_opt_valid_) //#define _Inout_opt_bytecap_(size) //#define _Inout_opt_bytecap_c_(size) //#define _Inout_opt_bytecap_x_(size) @@ -693,20 +693,20 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Inout_opt_z_count_(size) //#define _Inout_opt_z_count_c_(size) //#define _Inout_ptrdiff_count_(size) -#define _Inout_updates_(size) +#define _Inout_updates_(size) _SAL2_NAME(_Inout_updates_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] ) //#define _Inout_updates_all_(size) //#define _Inout_updates_all_opt_(size) -#define _Inout_updates_bytes_(size) +#define _Inout_updates_bytes_(size) _SAL2_NAME(_Inout_updates_bytes_) _Group_(_Pre_bytecap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] ) //#define _Inout_updates_bytes_all_(size) //#define _Inout_updates_bytes_all_opt_(size) //#define _Inout_updates_bytes_opt_(size) -#define _Inout_updates_bytes_to_(size,count) -#define _Inout_updates_bytes_to_opt_(size,count) -#define _Inout_updates_opt_(size) +#define _Inout_updates_bytes_to_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_) _Group_(_Out_writes_bytes_to_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) +#define _Inout_updates_bytes_to_opt_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_opt_) _Group_(_Out_writes_bytes_to_opt_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) +#define _Inout_updates_opt_(size) _SAL2_NAME(_Inout_updates_opt_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) //#define _Inout_updates_opt_z_(size) //#define _Inout_updates_to_(size,count) //#define _Inout_updates_to_opt_(size,count) -#define _Inout_updates_z_(size) _SAL2_Name(_Inout_updates_z_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) +#define _Inout_updates_z_(size) _SAL2_NAME(_Inout_updates_z_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) //#define _Inout_z_ //#define _Inout_z_bytecap_(size) //#define _Inout_z_bytecap_c_(size) @@ -718,29 +718,29 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Inout_z_cap_x_(size) //#define _Inout_z_count_(size) //#define _Inout_z_count_c_(size) -#define _Interlocked_operand_ -#define _Literal_ +#define _Interlocked_operand_ [SAL_pre] [SAL_annotes(Name="SAL_interlocked")] +#define _Literal_ _SAL2_NAME(_Literal_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__yes")]) #define _Maybenull_ [SAL_annotes(Name="SAL_null", p1="__maybe")] #define _Maybevalid_ [SAL_annotes(Name="SAL_valid", p1="__maybe")] //#define _Maybe_raises_SEH_exception -#define _Must_inspect_result_ _SAL2_Name(_Must_inspect_result_) _Group_(_Post_ [SAL_annotes(Name="SAL_mustInspect")] [SA_Post(MustCheck=SA_Yes)]) -#define _Notliteral_ +#define _Must_inspect_result_ _SAL2_NAME(_Must_inspect_result_) _Group_(_Post_ [SAL_annotes(Name="SAL_mustInspect")] [SA_Post(MustCheck=SA_Yes)]) +#define _Notliteral_ _SAL2_NAME(_Notliteral_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__no")] ) #define _Notnull_ [SAL_annotes(Name="SAL_null", p1="__no")] //#define _Notref_ //#define _Notvalid_ -#define _Null_ -#define _Null_terminated_ _SAL2_Name(_Null_terminated_) _Group_([SAL_annotes(Name="SAL_nullTerminated", p1="__yes")]) -#define _NullNull_terminated_ +#define _Null_ [SAL_annotes(Name="SAL_null", p1="__yes")] +#define _Null_terminated_ _SAL2_NAME(_Null_terminated_) _Group_([SAL_annotes(Name="SAL_nullTerminated", p1="__yes")]) +#define _NullNull_terminated_ _SAL2_NAME(_NullNull_terminated_) _Group_([SAL_annotes(Name="SAL_nullTerminated", p1="__yes")] [SAL_annotes(Name="SAL_readableTo", p1="inexpressibleCount(\"NullNull terminated string\")")]) //#define _On_failure_(annos) -#define _Out_ _SAL2_Name(_Out_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)]) +#define _Out_ _SAL2_NAME(_Out_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)]) //#define _Out_bound_ -#define _Out_bytecap_(size) +#define _Out_bytecap_(size) _SAL11_NAME(_Out_bytecap_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_bytecap_c_(size) //#define _Out_bytecap_post_bytecount_(cap,count) //#define _Out_bytecap_x_(size) //#define _Out_bytecapcount_(capcount) //#define _Out_bytecapcount_x_(capcount) -#define _Out_cap_(size) +#define _Out_cap_(size) _SAL11_NAME(_Out_cap_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_cap_c_(size) //#define _Out_cap_m_(mult,size) //#define _Out_cap_post_count_(cap,count) @@ -748,14 +748,14 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Out_capcount_(capcount) //#define _Out_capcount_x_(capcount) //#define _Out_defensive_(annotes) -#define _Out_opt_ _SAL2_Name(_Out_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)]) -#define _Out_opt_bytecap_(size) +#define _Out_opt_ _SAL2_NAME(_Out_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)]) +#define _Out_opt_bytecap_(size) _SAL11_NAME(_Out_opt_bytecap_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_opt_bytecap_c_(size) //#define _Out_opt_bytecap_post_bytecount_(cap,count) //#define _Out_opt_bytecap_x_(size) //#define _Out_opt_bytecapcount_(capcount) //#define _Out_opt_bytecapcount_x_(capcount) -#define _Out_opt_cap_(size) +#define _Out_opt_cap_(size) _SAL11_NAME(_Out_opt_cap_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_opt_cap_c_(size) //#define _Out_opt_cap_m_(mult,size) //#define _Out_opt_cap_post_count_(cap,count) @@ -775,28 +775,28 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Out_opt_z_cap_x_(size) //#define _Out_opt_z_capcount_(capcount) //#define _Out_ptrdiff_cap_(size) -#define _Out_range_(lb,ub) _SAL2_Name(_Out_range_) _Group_(_Post_ _SA_annotes2(SAL_range, lb, ub)) -#define _Out_writes_(size) +#define _Out_range_(lb,ub) _SAL2_NAME(_Out_range_) _Group_(_Post_ _SA_annotes2(SAL_range, lb, ub)) +#define _Out_writes_(size) _SAL2_NAME(_Out_writes_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_writes_all_(size) //#define _Out_writes_all_opt_(size) -#define _Out_writes_bytes_(size) -#define _Out_writes_bytes_all_(size) +#define _Out_writes_bytes_(size) _SAL2_NAME(_Out_writes_bytes_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) +#define _Out_writes_bytes_all_(size) _SAL2_NAME(_Out_writes_bytes_all_) _Group_(_Out_writes_bytes_to_(_Old_(size), _Old_(size))) //#define _Out_writes_bytes_all_opt_(size) -#define _Out_writes_bytes_opt_(size) -#define _Out_writes_bytes_to_(size,count) -#define _Out_writes_bytes_to_opt_(size,count) -#define _Out_writes_opt_(size) +#define _Out_writes_bytes_opt_(size) _SAL2_NAME(_Out_writes_bytes_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)]) +#define _Out_writes_bytes_to_(size,count) _SAL2_NAME(_Out_writes_bytes_to_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count)) +#define _Out_writes_bytes_to_opt_(size,count) _SAL2_NAME(_Out_writes_bytes_to_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count) ) +#define _Out_writes_opt_(size) _SAL2_NAME(_Out_writes_opt_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)]) //#define _Out_writes_opt_z_(size) -#define _Out_writes_to_(size,count) -#define _Out_writes_to_opt_(size,count) +#define _Out_writes_to_(size,count) _SAL2_NAME(_Out_writes_to_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_count_(count)) +#define _Out_writes_to_opt_(size,count) _SAL2_NAME(_Out_writes_to_opt_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_count_(count)) //#define _Out_writes_to_ptr_(ptr) //#define _Out_writes_to_ptr_opt_(ptr) //#define _Out_writes_to_ptr_opt_z_(ptr) //#define _Out_writes_to_ptr_z_(ptr) //#define _Out_writes_z_(size) -#define _Out_z_bytecap_(size) +#define _Out_z_bytecap_(size) _SAL11_NAME(_Out_z_bytecap_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_z_) //#define _Out_z_bytecap_c_(size) -#define _Out_z_bytecap_post_bytecount_(cap,count) _SAL11_Name(_Out_z_bytecap_post_bytecount_) _Group_(_Pre_bytecap_(cap) [SA_Post(Valid=SA_Yes)] _Post_z_bytecount_(count)) +#define _Out_z_bytecap_post_bytecount_(cap,count) _SAL11_NAME(_Out_z_bytecap_post_bytecount_) _Group_(_Pre_bytecap_(cap) [SA_Post(Valid=SA_Yes)] _Post_z_bytecount_(count)) //#define _Out_z_bytecap_x_(size) //#define _Out_z_bytecapcount_(capcount) //#define _Out_z_cap_(size) @@ -805,8 +805,8 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Out_z_cap_post_count_(cap,count) //#define _Out_z_cap_x_(size) //#define _Out_z_capcount_(capcount) -#define _Outptr_ _SAL2_Name(_Outptr_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) -#define _Outptr_opt_ _SAL2_Name(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) +#define _Outptr_ _SAL2_NAME(_Outptr_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) +#define _Outptr_opt_ _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) //#define _Outptr_opt_result_buffer_(size) //#define _Outptr_opt_result_buffer_all_(size) //#define _Outptr_opt_result_buffer_all_maybenull_(size) @@ -815,21 +815,21 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Outptr_opt_result_buffer_to_maybenull_(size, count) //#define _Outptr_opt_result_bytebuffer_(size) //#define _Outptr_opt_result_bytebuffer_all_(size) -#define _Outptr_opt_result_bytebuffer_all_maybenull_(size) _SAL2_Name(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidBytes="\n"#size)]) +#define _Outptr_opt_result_bytebuffer_all_maybenull_(size) _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_bytebuffer_maybenull_(size) //#define _Outptr_opt_result_bytebuffer_to_(size, count) //#define _Outptr_opt_result_bytebuffer_to_maybenull_(size, count) -#define _Outptr_opt_result_maybenull_ _SAL2_Name(_Outptr_opt_result_maybenull_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidElements="\n""1")]) +#define _Outptr_opt_result_maybenull_ _SAL2_NAME(_Outptr_opt_result_maybenull_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidElements="\n""1")]) //#define _Outptr_opt_result_maybenull_z_ //#define _Outptr_opt_result_nullonfailure_ //#define _Outptr_opt_result_z_ -#define _Outptr_result_buffer_(size) +#define _Outptr_result_buffer_(size) _SAL2_NAME(_Outptr_result_buffer_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableElements="\n" _SA_SPECSTRIZE(size))] ) //#define _Outptr_result_buffer_all_(size) //#define _Outptr_result_buffer_all_maybenull_(size) //#define _Outptr_result_buffer_maybenull_(size) //#define _Outptr_result_buffer_to_(size, count) //#define _Outptr_result_buffer_to_maybenull_(size, count) -#define _Outptr_result_bytebuffer_(size) +#define _Outptr_result_bytebuffer_(size) _SAL2_NAME(_Outptr_result_bytebuffer_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_result_bytebuffer_all_(size) //#define _Outptr_result_bytebuffer_all_maybenull_(size) //#define _Outptr_result_bytebuffer_maybenull_(size) @@ -837,7 +837,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Outptr_result_bytebuffer_to_maybenull_(size, count) //#define _Outptr_result_maybenull_ //#define _Outptr_result_maybenull_z_ -#define _Outptr_result_nullonfailure_ +#define _Outptr_result_nullonfailure_ _SAL2_NAME(_Outptr_result_nullonfailure_) _Group_(_Outptr_ [SAL_context(p1="SAL_failed")] _Group_([SAL_post] _Deref_post_null_) ) //#define _Outptr_result_z_ //#define _Outref_ //#define _Outref_result_buffer_(size) @@ -854,75 +854,75 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Outref_result_bytebuffer_to_maybenull_(size, count) //#define _Outref_result_maybenull_ //#define _Outref_result_nullonfailure_ -#define _Points_to_data_ +#define _Points_to_data_ _SAL2_NAME(_Points_to_data_) _Group_([SAL_pre] [SAL_at(p1="*_Curr_")] _Group_([SAL_annotes(Name="SAL_mayBePointer", p1="__no")]) ) //#define _Post_bytecap_(size) -//#define _Post_bytecount_(size) +#define _Post_bytecount_(size) _SAL11_NAME(_Post_bytecount_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) //#define _Post_bytecount_c_(size) //#define _Post_bytecount_x_(size) //#define _Post_cap_(size) -//#define _Post_count_(size) +#define _Post_count_(size) _SAL11_NAME(_Post_count_) _Group_([SA_Post(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)] ) //#define _Post_count_c_(size) //#define _Post_count_x_(size) //#define _Post_defensive_ -#define _Post_equal_to_(expr) -#define _Post_invalid_ _SAL2_Name(_Post_invalid_) _Group_([SA_Post(Deref=1,Valid=SA_No)]) -#define _Post_maybenull_ _SAL2_Name(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) +#define _Post_equal_to_(expr) _SAL2_NAME(_Post_equal_to_) _Group_(_Out_range_(==,expr)) +#define _Post_invalid_ _SAL2_NAME(_Post_invalid_) _Group_([SA_Post(Deref=1,Valid=SA_No)]) +#define _Post_maybenull_ _SAL2_NAME(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) //#define _Post_maybez_ -#define _Post_notnull_ _SAL2_Name(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) +#define _Post_notnull_ _SAL2_NAME(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Post_null_ -#define _Post_ptr_invalid_ _SAL2_Name(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) -#define _Post_readable_byte_size_(size) +#define _Post_ptr_invalid_ _SAL2_NAME(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) +#define _Post_readable_byte_size_(size) _SAL2_NAME(_Post_readable_byte_size_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)] ) //#define _Post_readable_size_(size) -#define _Post_satisfies_(cond) -#define _Post_valid_ _SAL2_Name(_Post_valid_) _Group_([SA_Post(Valid=SA_Yes)]) -#define _Post_writable_byte_size_(size) +#define _Post_satisfies_(cond) _SAL2_NAME(_Post_satisfies_) _Group_([SAL_post] [SAL_annotes(Name="SAL_satisfies", p1=_SA_SPECSTRIZE(cond))]) +#define _Post_valid_ _SAL2_NAME(_Post_valid_) _Group_([SA_Post(Valid=SA_Yes)]) +#define _Post_writable_byte_size_(size) _SAL2_NAME(_Post_writable_byte_size_) _Group_([SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))] ) //#define _Post_writable_size_(size) -#define _Post_z_ _SAL2_Name(_Post_z_) _Group_([SA_Post(NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) -#define _Post_z_bytecount_(size) _SAL11_Name(_Post_z_bytecount_) _Group_([SA_Post(NullTerminated=SA_Yes,ValidBytes="\n" _SA_SPECSTRIZE(size) )] [SA_Post(Valid=SA_Yes)]) +#define _Post_z_ _SAL2_NAME(_Post_z_) _Group_([SA_Post(NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) +#define _Post_z_bytecount_(size) _SAL11_NAME(_Post_z_bytecount_) _Group_([SA_Post(NullTerminated=SA_Yes,ValidBytes="\n" _SA_SPECSTRIZE(size) )] [SA_Post(Valid=SA_Yes)]) //#define _Post_z_bytecount_c_(size) //#define _Post_z_bytecount_x_(size) //#define _Post_z_count_(size) //#define _Post_z_count_c_(size) //#define _Post_z_count_x_(size) -#define _Pre_bytecap_(size) _SAL11_Name(_Pre_bytecap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size) )]) +#define _Pre_bytecap_(size) _SAL11_NAME(_Pre_bytecap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size) )]) //#define _Pre_bytecap_c_(size) //#define _Pre_bytecap_x_(size) -#define _Pre_bytecount_(size) +#define _Pre_bytecount_(size) _SAL11_NAME(_Pre_bytecount_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Pre_bytecount_c_(size) //#define _Pre_bytecount_x_(size) -#define _Pre_cap_(size) _SAL11_Name(_Pre_cap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElements="\n" _SA_SPECSTRIZE(size) )]) +#define _Pre_cap_(size) _SAL11_NAME(_Pre_cap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElements="\n" _SA_SPECSTRIZE(size) )]) //#define _Pre_cap_c_(size) //#define _Pre_cap_c_one_ //#define _Pre_cap_for_(param) //#define _Pre_cap_m_(mult,size) //#define _Pre_cap_x_(size) -//#define _Pre_count_(size) +#define _Pre_count_(size) _SAL11_NAME(_Pre_count_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)]) //#define _Pre_count_c_(size) //#define _Pre_count_x_(size) //#define _Pre_defensive_ //#define _Pre_equal_to_(expr) //#define _Pre_invalid_ -#define _Pre_maybenull_ _SAL2_Name(_Pre_maybenull_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)]) +#define _Pre_maybenull_ _SAL2_NAME(_Pre_maybenull_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)]) //#define _Pre_notnull_ //#define _Pre_null_ -//#define _Pre_opt_bytecap_(size) +#define _Pre_opt_bytecap_(size) _SAL11_NAME(_Pre_opt_bytecap_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size))] ) //#define _Pre_opt_bytecap_c_(size) //#define _Pre_opt_bytecap_x_(size) -//#define _Pre_opt_bytecount_(size) +#define _Pre_opt_bytecount_(size) _SAL11_NAME(_Pre_opt_bytecount_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Pre_opt_bytecount_c_(size) //#define _Pre_opt_bytecount_x_(size) -//#define _Pre_opt_cap_(size) +#define _Pre_opt_cap_(size) _SAL11_NAME(_Pre_opt_cap_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElements="\n" _SA_SPECSTRIZE(size))] ) //#define _Pre_opt_cap_c_(size) //#define _Pre_opt_cap_c_one_ //#define _Pre_opt_cap_for_(param) //#define _Pre_opt_cap_m_(mult,size) //#define _Pre_opt_cap_x_(size) -//#define _Pre_opt_count_(size) +#define _Pre_opt_count_(size) _SAL11_NAME(_Pre_opt_count_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Pre_opt_count_c_(size) //#define _Pre_opt_count_x_(size) //#define _Pre_opt_ptrdiff_cap_(ptr) //#define _Pre_opt_ptrdiff_count_(ptr) -#define _Pre_opt_valid_ _SAL2_Name(_Pre_opt_valid_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)]) +#define _Pre_opt_valid_ _SAL2_NAME(_Pre_opt_valid_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)]) //#define _Pre_opt_valid_bytecap_(size) //#define _Pre_opt_valid_bytecap_c_(size) //#define _Pre_opt_valid_bytecap_x_(size) @@ -939,12 +939,12 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Pre_ptrdiff_cap_(ptr) //#define _Pre_ptrdiff_count_(ptr) //#define _Pre_readable_byte_size_(size) -#define _Pre_readable_size_(size) +#define _Pre_readable_size_(size) _SAL2_NAME(_Pre_readable_size_) _Group_([SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Pre_readonly_ -#define _Pre_satisfies_(cond) +#define _Pre_satisfies_(cond) _SAL2_NAME(_Pre_satisfies_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_satisfies", p1=_SA_SPECSTRIZE(cond))]) #define _Pre_unknown_ -//#define _Pre_valid_ -//#define _Pre_valid_bytecap_(size) +#define _Pre_valid_ _SAL2_NAME(_Pre_valid_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(Valid=SA_Yes)] ) +#define _Pre_valid_bytecap_(size) _SAL11_NAME(_Pre_valid_bytecap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size))] [SA_Pre(Valid=SA_Yes)] ) //#define _Pre_valid_bytecap_c_(size) //#define _Pre_valid_bytecap_x_(size) //#define _Pre_valid_cap_(size) @@ -960,7 +960,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Pre_z_cap_(size) //#define _Pre_z_cap_c_(size) //#define _Pre_z_cap_x_(size) -//#define _Prepost_bytecount_(size) +#define _Prepost_bytecount_(size) _SAL11_NAME(_Deref_prepost_bytecount_) _Group_(_Deref_pre_bytecount_(size) _Deref_post_bytecount_(size)) //#define _Prepost_bytecount_c_(size) //#define _Prepost_bytecount_x_(size) //#define _Prepost_count_(size) @@ -972,16 +972,16 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Prepost_opt_count_(size) //#define _Prepost_opt_count_c_(size) //#define _Prepost_opt_count_x_(size) -#define _Prepost_opt_valid_ _SAL2_Name(_Prepost_opt_valid_) _Group_(_Pre_opt_valid_ _Post_valid_) +#define _Prepost_opt_valid_ _SAL2_NAME(_Prepost_opt_valid_) _Group_(_Pre_opt_valid_ _Post_valid_) //#define _Prepost_opt_z_ -#define _Prepost_valid_ +#define _Prepost_valid_ _SAL11_NAME(_Prepost_valid_) _Group_(_Pre_valid_ _Post_valid_) //#define _Prepost_z_ -#define _Printf_format_string_ +#define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ #define _Maybe_raises_SEH_exception_ -#define _Readable_bytes_(size) _SAL2_Name(_Readable_bytes_) _Group_(_SA_annotes1(SAL_readableTo, byteCount(size))) +#define _Readable_bytes_(size) _SAL2_NAME(_Readable_bytes_) _Group_(_SA_annotes1(SAL_readableTo, byteCount(size))) //#define _Readable_elements_(size) -#define _Reserved_ _SAL2_Name(_Reserved_) _Group_([SA_Pre(Null=SA_Yes)]) +#define _Reserved_ _SAL2_NAME(_Reserved_) _Group_([SA_Pre(Null=SA_Yes)]) //#define _Result_nullonfailure_ //#define _Result_zeroonfailure_ //#define __inner_callback @@ -999,15 +999,15 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Ret_count_(size) //#define _Ret_count_c_(size) //#define _Ret_count_x_(size) -#define _Ret_maybenull_ _SAL2_Name(_Ret_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) +#define _Ret_maybenull_ _SAL2_NAME(_Ret_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) //#define _Ret_maybenull_z_ //#define _Ret_notnull_ //#define _Ret_null_ //#define _Ret_opt_ -#define _Ret_opt_bytecap_(size) _SAL11_Name(_Ret_opt_bytecap_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) +#define _Ret_opt_bytecap_(size) _SAL11_NAME(_Ret_opt_bytecap_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Ret_opt_bytecap_c_(size) //#define _Ret_opt_bytecap_x_(size) -#define _Ret_opt_bytecount_(size) +#define _Ret_opt_bytecount_(size) _SAL11_NAME(_Ret_opt_bytecount_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) //#define _Ret_opt_bytecount_c_(size) //#define _Ret_opt_bytecount_x_(size) //#define _Ret_opt_cap_(size) @@ -1017,12 +1017,12 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Ret_opt_count_c_(size) //#define _Ret_opt_count_x_(size) //#define _Ret_opt_valid_ -#define _Ret_opt_z_ +#define _Ret_opt_z_ _SAL11_NAME(_Ret_opt_z_) _Group_([SA_Post(Null=SA_Maybe,NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)] ) //#define _Ret_opt_z_bytecap_(size) //#define _Ret_opt_z_bytecount_(size) //#define _Ret_opt_z_cap_(size) //#define _Ret_opt_z_count_(size) -#define _Ret_range_(lb,ub) +#define _Ret_range_(lb,ub) _SAL2_NAME(_Ret_range_) _Group_([SAL_post] [SAL_annotes(Name="SAL_range", p1=_SA_SPECSTRIZE(lb), p2=_SA_SPECSTRIZE(ub))] ) //#define _Ret_valid_ //#define _Ret_writes_(size) //#define _Ret_writes_bytes_(size) @@ -1034,21 +1034,21 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Ret_writes_to_(size,count) //#define _Ret_writes_to_maybenull_(size,count) //#define _Ret_writes_z_(size) -#define _Ret_z_ _SAL2_Name(_Ret_z_) _Group_([SA_Post(Null=SA_No,NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) +#define _Ret_z_ _SAL2_NAME(_Ret_z_) _Group_([SA_Post(Null=SA_No,NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) //#define _Ret_z_bytecap_(size) //#define _Ret_z_bytecount_(size) //#define _Ret_z_cap_(size) //#define _Ret_z_count_(size) -#define _Return_type_success_(expr) _SAL2_Name(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) +#define _Return_type_success_(expr) _SAL2_NAME(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) //#define _Scanf_format_string_ //#define _Scanf_s_format_string_ -#define _Struct_size_bytes_(size) -#define _Success_(expr) _SAL2_Name(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) -#define _Unchanged_(e) +#define _Struct_size_bytes_(size) _SAL2_NAME(_Struct_size_bytes_) _Group_(_Writable_bytes_(byteCount(size))) +#define _Success_(expr) _SAL2_NAME(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) +#define _Unchanged_(expr) _SAL2_NAME(_Unchanged_) _Group_([SAL_at(p1=_SA_SPECSTRIZE(expr))] _Group_(_Post_equal_to_(expr) _Const_)) //#define _Use_decl_annotations_ -#define _Valid_ -#define _Writable_bytes_(size) _SAL2_Name(_Writable_bytes_) _Group_(_SA_annotes1(SAL_writableTo, byteCount(size))) -#define _Writable_elements_(size) _SAL2_Name(_Writable_elements_) _Group_(_SA_annotes1(SAL_writableTo, elementCount(size))) +#define _Valid_ [SAL_annotes(Name="SAL_valid", p1="__yes")] +#define _Writable_bytes_(size) _SAL2_NAME(_Writable_bytes_) _Group_(_SA_annotes1(SAL_writableTo, byteCount(size))) +#define _Writable_elements_(size) _SAL2_NAME(_Writable_elements_) _Group_(_SA_annotes1(SAL_writableTo, elementCount(size))) #define __In_impl_ [SA_Pre(Valid=SA_Yes)] [SA_Pre(Deref=1, Notref=1, Access=SA_Read)] #define __AuToQuOtE _SA_annotes0(SAL_AuToQuOtE) diff --git a/reactos/include/xdk/mmfuncs.h b/reactos/include/xdk/mmfuncs.h index 20fd8b16a59..1427766e184 100644 --- a/reactos/include/xdk/mmfuncs.h +++ b/reactos/include/xdk/mmfuncs.h @@ -782,6 +782,32 @@ ULONG NTAPI MmDoesFileHaveUserWritableReferences( _In_ PSECTION_OBJECT_POINTERS SectionPointer); + +_Must_inspect_result_ +_At_(*BaseAddress, __drv_allocatesMem(Mem)) +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtAllocateVirtualMemory( + _In_ HANDLE ProcessHandle, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect); + +__kernel_entry +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSCALLAPI +NTSTATUS +NTAPI +NtFreeVirtualMemory( + _In_ HANDLE ProcessHandle, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType); + $endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h index d819d84c816..98d2c6d3c85 100644 --- a/reactos/include/xdk/ntifs.template.h +++ b/reactos/include/xdk/ntifs.template.h @@ -122,12 +122,12 @@ NTSYSCALLAPI NTSTATUS NTAPI NtAdjustPrivilegesToken( - _In_ HANDLE TokenHandle, - _In_ BOOLEAN DisableAllPrivileges, - _In_opt_ PTOKEN_PRIVILEGES NewState, - _In_ ULONG BufferLength, - _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, - _Out_ _When_(PreviousState == NULL, _Out_opt_) PULONG ReturnLength); + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength, *ReturnLength) PTOKEN_PRIVILEGES PreviousState, + _When_(PreviousState != NULL, _Out_) PULONG ReturnLength); __kernel_entry NTSYSCALLAPI @@ -363,30 +363,6 @@ NTAPI NtClose( _In_ HANDLE Handle); -_Must_inspect_result_ -__drv_allocatesMem(Mem) -__kernel_entry -NTSYSCALLAPI -NTSTATUS -NTAPI -NtAllocateVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ _At_(*BaseAddress, _Readable_bytes_(*RegionSize) _Writable_bytes_(*RegionSize) _Post_readable_byte_size_(*RegionSize)) PVOID *BaseAddress, - _In_ ULONG_PTR ZeroBits, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG AllocationType, - _In_ ULONG Protect); - -__kernel_entry -NTSYSCALLAPI -NTSTATUS -NTAPI -NtFreeVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG FreeType); - #endif #if (NTDDI_VERSION >= NTDDI_WINXP) @@ -1703,72 +1679,72 @@ NTKERNELAPI LARGE_INTEGER NTAPI CcGetLsnForFileObject ( - IN PFILE_OBJECT FileObject, - OUT PLARGE_INTEGER OldestLsn OPTIONAL + _In_ PFILE_OBJECT FileObject, + _Out_opt_ PLARGE_INTEGER OldestLsn ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePool ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithQuota ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithQuotaTag ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes, + _In_ ULONG Tag ); NTKERNELAPI PVOID NTAPI FsRtlAllocatePoolWithTag ( - IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag + _In_ POOL_TYPE PoolType, + _In_ ULONG NumberOfBytes, + _In_ ULONG Tag ); NTKERNELAPI BOOLEAN NTAPI FsRtlMdlReadComplete ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain + _In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain ); NTKERNELAPI BOOLEAN NTAPI FsRtlMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain ); NTKERNELAPI VOID NTAPI FsRtlNotifyChangeDirectory ( - IN PNOTIFY_SYNC NotifySync, - IN PVOID FsContext, - IN PSTRING FullDirectoryName, - IN PLIST_ENTRY NotifyList, - IN BOOLEAN WatchTree, - IN ULONG CompletionFilter, - IN PIRP NotifyIrp + _In_ PNOTIFY_SYNC NotifySync, + _In_ PVOID FsContext, + _In_ PSTRING FullDirectoryName, + _In_ PLIST_ENTRY NotifyList, + _In_ BOOLEAN WatchTree, + _In_ ULONG CompletionFilter, + _In_ PIRP NotifyIrp ); #if 1 @@ -1787,25 +1763,18 @@ ObCreateObject( _Out_ PVOID *Object ); -NTKERNELAPI -ULONG -NTAPI -ObGetObjectPointerCount ( - IN PVOID Object -); - NTKERNELAPI NTSTATUS NTAPI ObReferenceObjectByName ( - IN PUNICODE_STRING ObjectName, - IN ULONG Attributes, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess OPTIONAL, - IN POBJECT_TYPE ObjectType, - IN KPROCESSOR_MODE AccessMode, - IN OUT PVOID ParseContext OPTIONAL, - OUT PVOID *Object + _In_ PUNICODE_STRING ObjectName, + _In_ ULONG Attributes, + _In_opt_ PACCESS_STATE PassedAccessState, + _In_opt_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_TYPE ObjectType, + _In_ KPROCESSOR_MODE AccessMode, + _Inout_opt_ PVOID ParseContext, + _Out_ PVOID *Object ); #define PsDereferenceImpersonationToken(T) \ @@ -1820,316 +1789,25 @@ NTKERNELAPI NTSTATUS NTAPI PsLookupProcessThreadByCid ( - IN PCLIENT_ID Cid, - OUT PEPROCESS *Process OPTIONAL, - OUT PETHREAD *Thread + _In_ PCLIENT_ID Cid, + _Out_opt_ PEPROCESS *Process, + _Out_ PETHREAD *Thread ); NTSYSAPI NTSTATUS NTAPI RtlSetSaclSecurityDescriptor ( - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN SaclPresent, - IN PACL Sacl, - IN BOOLEAN SaclDefaulted + _Inout_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN SaclPresent, + _In_ PACL Sacl, + _In_ BOOLEAN SaclDefaulted ); #define SeEnableAccessToExports() SeExports = *(PSE_EXPORTS *)SeExports; -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwAdjustPrivilegesToken ( - IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, - OUT PULONG ReturnLength -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - #endif -NTSYSAPI -NTSTATUS -NTAPI -ZwAlertThread ( - IN HANDLE ThreadHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwAccessCheckAndAuditAlarm ( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PBOOLEAN AccessStatus, - OUT PBOOLEAN GenerateOnClose -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwCancelIoFile ( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwClearEvent ( - IN HANDLE EventHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCloseObjectAuditAlarm ( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCreateSymbolicLinkObject ( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING TargetName -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwFlushInstructionCache ( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress OPTIONAL, - IN ULONG FlushSize -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwFlushBuffersFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwInitiatePowerAction ( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwLoadKey ( - IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenProcessToken ( - IN HANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE TokenHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenThread ( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenThreadToken ( - IN HANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN BOOLEAN OpenAsSelf, - OUT PHANDLE TokenHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwPulseEvent ( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryDefaultLocale ( - IN BOOLEAN ThreadOrSystem, - OUT PLCID Locale -); - -#if (VER_PRODUCTBUILD >= 2195) - -_IRQL_requires_max_(PASSIVE_LEVEL) -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryDirectoryObject( - _In_ HANDLE DirectoryHandle, - _Out_ PVOID Buffer, - _In_ ULONG BufferLength, - _In_ BOOLEAN ReturnSingleEntry, - _In_ BOOLEAN RestartScan, - _Inout_ PULONG Context, - _Out_opt_ PULONG ReturnLength -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryInformationProcess ( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwReplaceKey ( - IN POBJECT_ATTRIBUTES NewFileObjectAttributes, - IN HANDLE KeyHandle, - IN POBJECT_ATTRIBUTES OldFileObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwResetEvent ( - IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwRestoreKey ( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwSaveKey ( - IN HANDLE KeyHandle, - IN HANDLE FileHandle -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetDefaultLocale ( - IN BOOLEAN ThreadOrSystem, - IN LCID Locale -); - -#if (VER_PRODUCTBUILD >= 2195) - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetDefaultUILanguage ( - IN LANGID LanguageId -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetInformationProcess ( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - IN PVOID ProcessInformation, - IN ULONG ProcessInformationLength -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetSystemTime ( - IN PLARGE_INTEGER NewTime, - OUT PLARGE_INTEGER OldTime OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwUnloadKey ( - IN POBJECT_ATTRIBUTES KeyObjectAttributes -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwWaitForMultipleObjects ( - IN ULONG HandleCount, - IN PHANDLE Handles, - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwYieldExecution ( - VOID -); - #pragma pack(pop) #ifdef __cplusplus diff --git a/reactos/include/xdk/obfuncs.h b/reactos/include/xdk/obfuncs.h index dc7d0ca824e..4f4d8b55227 100644 --- a/reactos/include/xdk/obfuncs.h +++ b/reactos/include/xdk/obfuncs.h @@ -219,6 +219,14 @@ ObOpenObjectByPointerWithTag( _In_ KPROCESSOR_MODE AccessMode, _In_ ULONG Tag, _Out_ PHANDLE Handle); + +NTKERNELAPI +ULONG +NTAPI +ObGetObjectPointerCount( + _In_ PVOID Object +); + $endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ diff --git a/reactos/include/xdk/rtlfuncs.h b/reactos/include/xdk/rtlfuncs.h index a5b8f64a6b9..95f1900c2ab 100644 --- a/reactos/include/xdk/rtlfuncs.h +++ b/reactos/include/xdk/rtlfuncs.h @@ -145,7 +145,7 @@ RtlAssert( _In_ PVOID FailedAssertion, _In_ PVOID FileName, _In_ ULONG LineNumber, - _In_opt_ PSTR Message); + _In_opt_z_ PSTR Message); /* VOID * RtlCopyMemory( @@ -1663,9 +1663,9 @@ NTSYSAPI NTSTATUS NTAPI RtlCopySid( - _In_ ULONG Length, - _Out_writes_bytes_(Length) PSID Destination, - _In_ PSID Source); + _In_ ULONG DestinationSidLength, + _Out_writes_bytes_(DestinationSidLength) PSID DestinationSid, + _In_ PSID SourceSid); _IRQL_requires_max_(APC_LEVEL) NTSYSAPI @@ -1827,7 +1827,7 @@ VOID NTAPI RtlInitCodePageTable( _In_ PUSHORT TableBase, - _Inout_ PCPTABLEINFO CodePageTable); + _Out_ PCPTABLEINFO CodePageTable); $endif (_NTIFS_) @@ -3057,59 +3057,56 @@ RtlCheckBit( #if DBG -#define ASSERT(exp) \ - (VOID)((!(exp)) ? \ +#define RTL_VERIFY(exp) \ + ((!(exp)) ? \ RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) -#define ASSERTMSG(msg, exp) \ - (VOID)((!(exp)) ? \ +#define RTL_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) -#define RTL_SOFT_ASSERT(exp) \ - (VOID)((!(exp)) ? \ +#define RTL_SOFT_VERIFY(exp) \ + ((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) -#define RTL_SOFT_ASSERTMSG(msg, exp) \ +#define RTL_SOFT_VERIFYMSG(msg, exp) \ (VOID)((!(exp)) ? \ DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) -#define RTL_VERIFY(exp) ASSERT(exp) -#define RTL_VERIFYMSG(msg, exp) ASSERTMSG(msg, exp) +#define ASSERT(exp) ((void)RTL_VERIFY(exp)) +#define ASSERTMSG(msg, exp) ((void)RTL_VERIFYMSG(msg, exp)) -#define RTL_SOFT_VERIFY(exp) RTL_SOFT_ASSERT(exp) -#define RTL_SOFT_VERIFYMSG(msg, exp) RTL_SOFT_ASSERTMSG(msg, exp) +#define RTL_SOFT_ASSERT(exp) ((void)RTL_SOFT_VERIFY(exp)) +#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)RTL_SOFT_VERIFYMSG(msg, exp)) #if defined(_MSC_VER) +# define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg) +# define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) +#else +# define __assert_annotationA(msg) \ + DbgPrint("Assertion %s(%d): %s", __FILE__, __LINE__, msg) +# define __assert_annotationW(msg) \ + DbgPrint("Assertion %s(%d): %S", __FILE__, __LINE__, msg) +#endif -#define NT_ASSERT(exp) \ +#define NT_VERIFY(exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", L#exp), \ + (__assert_annotationA(#exp), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERTMSG(msg, exp) \ +#define NT_VERIFYMSG(msg, exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", L##msg), \ + (__assert_annotationA(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_ASSERTMSGW(msg, exp) \ +#define NT_VERIFYMSGW(msg, exp) \ ((!(exp)) ? \ - (__annotation(L"Debug", L"AssertFail", msg), \ + (__assert_annotationW(msg), \ DbgRaiseAssertionFailure(), FALSE) : TRUE) -#define NT_VERIFY NT_ASSERT -#define NT_VERIFYMSG NT_ASSERTMSG -#define NT_VERIFYMSGW NT_ASSERTMSGW - -#else - -/* GCC doesn't support __annotation (nor PDB) */ -#define NT_ASSERT(exp) \ - (VOID)((!(exp)) ? (DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_ASSERTMSG NT_ASSERT -#define NT_ASSERTMSGW NT_ASSERT - -#endif +#define NT_ASSERT(exp) ((void)NT_VERIFY(exp)) +#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp)) +#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp)) #else /* !DBG */ diff --git a/reactos/include/xdk/zwfuncs.h b/reactos/include/xdk/zwfuncs.h index 596fb399155..86e333fcb52 100644 --- a/reactos/include/xdk/zwfuncs.h +++ b/reactos/include/xdk/zwfuncs.h @@ -101,17 +101,18 @@ NTSYSAPI NTSTATUS NTAPI ZwCreateFile( - _Out_ PHANDLE FileHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _Out_ PIO_STATUS_BLOCK IoStatusBlock, - _In_opt_ PLARGE_INTEGER AllocationSize, - _In_ ULONG FileAttributes, - _In_ ULONG ShareAccess, - _In_ ULONG CreateDisposition, - _In_ ULONG CreateOptions, - _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, - _In_ ULONG EaLength); + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength +); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI @@ -590,29 +591,29 @@ ZwOpenDirectoryObject( _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes); -_IRQL_requires_max_(PASSIVE_LEVEL) -_When_(return==0, __drv_allocatesMem(Region)) +_Must_inspect_result_ +_At_(*BaseAddress, __drv_allocatesMem(Mem)) +__kernel_entry NTSYSCALLAPI NTSYSAPI NTSTATUS NTAPI ZwAllocateVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, - _In_ ULONG_PTR ZeroBits, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG AllocationType, - _In_ ULONG Protect); + _In_ HANDLE ProcessHandle, + _Inout_ _Outptr_result_buffer_(*RegionSize) PVOID *BaseAddress, + _In_ ULONG_PTR ZeroBits, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG AllocationType, + _In_ ULONG Protect); _IRQL_requires_max_(PASSIVE_LEVEL) -_When_(return==0, __drv_freesMem(Region)) NTSYSAPI NTSTATUS NTAPI ZwFreeVirtualMemory( - _In_ HANDLE ProcessHandle, - _Inout_ PVOID *BaseAddress, - _Inout_ PSIZE_T RegionSize, - _In_ ULONG FreeType); + _In_ HANDLE ProcessHandle, + _Inout_ __drv_freesMem(Mem) PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _In_ ULONG FreeType); _When_(Timeout == NULL, _IRQL_requires_max_(APC_LEVEL)) _When_(Timeout->QuadPart != 0, _IRQL_requires_max_(APC_LEVEL)) @@ -1066,8 +1067,8 @@ NTSYSCALLAPI NTSTATUS NTAPI ZwRollbackComplete( - IN HANDLE EnlistmentHandle, - IN PLARGE_INTEGER TmVirtualClock OPTIONAL); + _In_ HANDLE EnlistmentHandle, + _In_opt_ PLARGE_INTEGER TmVirtualClock); NTSYSCALLAPI NTSTATUS @@ -1169,29 +1170,29 @@ NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeMultipleKeys( - IN HANDLE MasterKeyHandle, - IN ULONG Count OPTIONAL, - IN OBJECT_ATTRIBUTES SubordinateObjects[] OPTIONAL, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer OPTIONAL, - IN ULONG BufferSize, - IN BOOLEAN Asynchronous); + _In_ HANDLE MasterKeyHandle, + _In_opt_ ULONG Count, + _In_opt_ OBJECT_ATTRIBUTES SubordinateObjects[], + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree, + _Out_opt_ PVOID Buffer, + _In_ ULONG BufferSize, + _In_ BOOLEAN Asynchronous); NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( - IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueEntries, - IN ULONG EntryCount, - OUT PVOID ValueBuffer, - IN OUT PULONG BufferLength, - OUT PULONG RequiredBufferLength OPTIONAL); + _In_ HANDLE KeyHandle, + _Inout_ PKEY_VALUE_ENTRY ValueEntries, + _In_ ULONG EntryCount, + _Out_ PVOID ValueBuffer, + _Inout_ PULONG BufferLength, + _Out_opt_ PULONG RequiredBufferLength); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI @@ -1234,6 +1235,286 @@ ZwSetInformationToken( _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, _In_reads_bytes_(TokenInformationLength) PVOID TokenInformation, _In_ ULONG TokenInformationLength); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwAdjustPrivilegesToken ( + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_opt_ PTOKEN_PRIVILEGES PreviousState, + _Out_ PULONG ReturnLength +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwAlertThread ( + _In_ HANDLE ThreadHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwAccessCheckAndAuditAlarm ( + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PBOOLEAN AccessStatus, + _Out_ PBOOLEAN GenerateOnClose +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwCancelIoFile ( + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwClearEvent ( + _In_ HANDLE EventHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwCloseObjectAuditAlarm ( + _In_ PUNICODE_STRING SubsystemName, + _In_ PVOID HandleId, + _In_ BOOLEAN GenerateOnClose +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwCreateSymbolicLinkObject ( + _Out_ PHANDLE SymbolicLinkHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PUNICODE_STRING TargetName +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwFlushInstructionCache ( + _In_ HANDLE ProcessHandle, + _In_opt_ PVOID BaseAddress, + _In_ ULONG FlushSize +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwFlushBuffersFile( + _In_ HANDLE FileHandle, + _Out_ PIO_STATUS_BLOCK IoStatusBlock +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwInitiatePowerAction ( + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwLoadKey ( + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes, + _In_ POBJECT_ATTRIBUTES FileObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenProcessToken ( + _In_ HANDLE ProcessHandle, + _In_ ACCESS_MASK DesiredAccess, + _Out_ PHANDLE TokenHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenThread ( + _Out_ PHANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ PCLIENT_ID ClientId +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwOpenThreadToken ( + _In_ HANDLE ThreadHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ BOOLEAN OpenAsSelf, + _Out_ PHANDLE TokenHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwPulseEvent ( + _In_ HANDLE EventHandle, + _In_opt_ PLONG PulseCount +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryDefaultLocale ( + _In_ BOOLEAN UserProfile, + _Out_ PLCID DefaultLocaleId +); + +#if (VER_PRODUCTBUILD >= 2195) +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryDirectoryObject( + _In_ HANDLE DirectoryHandle, + _Out_ PVOID Buffer, + _In_ ULONG BufferLength, + _In_ BOOLEAN ReturnSingleEntry, + _In_ BOOLEAN RestartScan, + _Inout_ PULONG Context, + _Out_opt_ PULONG ReturnLength +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwQueryInformationProcess ( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwReplaceKey ( + _In_ POBJECT_ATTRIBUTES NewFileObjectAttributes, + _In_ HANDLE KeyHandle, + _In_ POBJECT_ATTRIBUTES OldFileObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwResetEvent ( + _In_ HANDLE EventHandle, + _Out_opt_ PLONG NumberOfWaitingThreads +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwRestoreKey ( + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle, + _In_ ULONG Flags +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwSaveKey ( + _In_ HANDLE KeyHandle, + _In_ HANDLE FileHandle +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetDefaultLocale ( + _In_ BOOLEAN UserProfile, + _In_ LCID DefaultLocaleId +); + +#if (VER_PRODUCTBUILD >= 2195) +NTSYSAPI +NTSTATUS +NTAPI +ZwSetDefaultUILanguage ( + _In_ LANGID LanguageId +); +#endif /* (VER_PRODUCTBUILD >= 2195) */ + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetInformationProcess ( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _In_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetSystemTime ( + _In_ PLARGE_INTEGER NewTime, + _Out_opt_ PLARGE_INTEGER OldTime +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwUnloadKey ( + _In_ POBJECT_ATTRIBUTES KeyObjectAttributes +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwWaitForMultipleObjects ( + _In_ ULONG HandleCount, + _In_ PHANDLE Handles, + _In_ WAIT_TYPE WaitType, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwYieldExecution ( + VOID +); + $endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ From 56704cdb7664fc146f222d156a17a04847616fd6 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 20 Jan 2013 08:57:34 +0000 Subject: [PATCH 31/71] [BROWSEUI] - Build an import library svn path=/trunk/; revision=58195 --- reactos/dll/win32/browseui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/dll/win32/browseui/CMakeLists.txt b/reactos/dll/win32/browseui/CMakeLists.txt index 9abbd678616..563920f636e 100644 --- a/reactos/dll/win32/browseui/CMakeLists.txt +++ b/reactos/dll/win32/browseui/CMakeLists.txt @@ -14,7 +14,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) -spec2def(browseui.dll browseui.spec) +spec2def(browseui.dll browseui.spec ADD_IMPORTLIB) list(APPEND SOURCE aclmulti.cpp From 7a779210ab0879ac0f7eabcfc7110aedda5ffeaa Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 20 Jan 2013 10:22:15 +0000 Subject: [PATCH 32/71] [SAMSRV] - Add a generic delete function for database objects. - Do not create Members sub keys for group objects. - Get rid of the SamDbContainerObject object type. - Implement SamrDeleteGroup. svn path=/trunk/; revision=58196 --- reactos/dll/win32/samsrv/database.c | 152 +++++++++++++++++++++++++--- reactos/dll/win32/samsrv/samrpc.c | 60 ++++++++++- reactos/dll/win32/samsrv/samsrv.h | 6 +- 3 files changed, 196 insertions(+), 22 deletions(-) diff --git a/reactos/dll/win32/samsrv/database.c b/reactos/dll/win32/samsrv/database.c index 34f55674081..3d2a8825ce1 100644 --- a/reactos/dll/win32/samsrv/database.c +++ b/reactos/dll/win32/samsrv/database.c @@ -157,8 +157,7 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, 0, NULL); - if ((ObjectType == SamDbAliasObject) || - (ObjectType == SamDbGroupObject)) + if (ObjectType == SamDbAliasObject) { /* Open the object key */ RtlInitUnicodeString(&KeyName, @@ -244,9 +243,6 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; - if (ParentObject != NULL) - ParentObject->RefCount++; - *DbObject = NewObject; return STATUS_SUCCESS; @@ -313,8 +309,7 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, KEY_ALL_ACCESS, &ObjectAttributes); - if ((ObjectType == SamDbAliasObject) || - (ObjectType == SamDbGroupObject)) + if (ObjectType == SamDbAliasObject) { /* Open the object key */ RtlInitUnicodeString(&KeyName, @@ -396,9 +391,6 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; - if (ParentObject != NULL) - ParentObject->RefCount++; - *DbObject = NewObject; return STATUS_SUCCESS; @@ -475,14 +467,144 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject) RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); - if (ParentObject != NULL) - { - ParentObject->RefCount--; + return Status; +} - if (ParentObject->RefCount == 0) - Status = SampCloseDbObject(ParentObject); + +NTSTATUS +SampDeleteAccountDbObject(PSAM_DB_OBJECT DbObject) +{ + LPCWSTR ContainerName; + LPWSTR AccountName = NULL; + HKEY ContainerKey; + HKEY NamesKey; + ULONG Length = 0; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%p)\n", DbObject); + + /* Server and Domain objects cannot be deleted */ + switch (DbObject->ObjectType) + { + case SamDbAliasObject: + ContainerName = L"Aliases"; + break; + + case SamDbGroupObject: + ContainerName = L"Groups"; + break; + + case SamDbUserObject: + ContainerName = L"Users"; + break; + + default: + return STATUS_INVALID_PARAMETER; } + /* Get the account name */ + Status = SampGetObjectAttribute(DbObject, + L"Name", + NULL, + NULL, + &Length); + if (Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + AccountName = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + if (AccountName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DbObject, + L"Name", + NULL, + (PVOID)AccountName, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (DbObject->KeyHandle != NULL) + NtClose(DbObject->KeyHandle); + + if (DbObject->ObjectType == SamDbAliasObject) + { + if (DbObject->MembersKeyHandle != NULL) + NtClose(DbObject->MembersKeyHandle); + + SampRegDeleteKey(DbObject->KeyHandle, + L"Members"); + } + + /* Open the domain container key */ + Status = SampRegOpenKey(DbObject->ParentObject->KeyHandle, + ContainerName, + DELETE | KEY_SET_VALUE, + &ContainerKey); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Open the Names key */ + Status = SampRegOpenKey(ContainerKey, + L"Names", + KEY_SET_VALUE, + &NamesKey); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove the account from the Names key */ + Status = SampRegDeleteValue(NamesKey, + AccountName); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteValue failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove the account key from the container */ + Status = SampRegDeleteKey(ContainerKey, + DbObject->Name); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteKey failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Release the database object name */ + if (DbObject->Name != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject->Name); + + /* Release the database object */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); + + Status = STATUS_SUCCESS; + +done: + if (NamesKey != NULL) + SampRegCloseKey(NamesKey); + + if (ContainerKey != NULL) + SampRegCloseKey(ContainerKey); + + if (AccountName != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountName); + return Status; } diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index dcdb4cef3d3..499544391ca 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -3952,7 +3952,7 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, &UserObject); if (!NT_SUCCESS(Status)) { - ERR("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); + TRACE("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); goto done; } @@ -3962,7 +3962,7 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, Attributes); if (!NT_SUCCESS(Status)) { - ERR("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); + TRACE("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); goto done; } @@ -3971,7 +3971,7 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, MemberId); if (!NT_SUCCESS(Status)) { - ERR("SampAddMemberToGroup() failed (Status 0x%08lx)\n", Status); + TRACE("SampAddMemberToGroup() failed (Status 0x%08lx)\n", Status); } done: @@ -3987,8 +3987,58 @@ NTSTATUS NTAPI SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT GroupObject; + ULONG Length = 0; + NTSTATUS Status; + + TRACE("(%p)\n", GroupHandle); + + /* Validate the group handle */ + Status = SampValidateDbObject(*GroupHandle, + SamDbGroupObject, + DELETE, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Fail, if the group is built-in */ + if (GroupObject->RelativeId < 1000) + { + TRACE("You can not delete a special account!\n"); + return STATUS_SPECIAL_ACCOUNT; + } + + /* Get the length of the Members attribute */ + SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + + /* Fail, if the group has members */ + if (Length != 0) + { + TRACE("There are still members in the group!\n"); + return STATUS_MEMBER_IN_GROUP; + } + + /* FIXME: Remove the group from all aliases */ + + /* Delete the group from the database */ + Status = SampDeleteAccountDbObject(GroupObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Invalidate the handle */ + *GroupHandle = NULL; + + return STATUS_SUCCESS; } diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index c07d0ea40a1..370f4e5b886 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -29,7 +29,6 @@ typedef enum _SAM_DB_OBJECT_TYPE { SamDbIgnoreObject, - SamDbContainerObject, SamDbServerObject, SamDbDomainObject, SamDbAliasObject, @@ -45,7 +44,7 @@ typedef struct _SAM_DB_OBJECT ACCESS_MASK Access; LPWSTR Name; HANDLE KeyHandle; - HANDLE MembersKeyHandle; // only used by Aliases and Groups + HANDLE MembersKeyHandle; // only used by Aliases ULONG RelativeId; struct _SAM_DB_OBJECT *ParentObject; } SAM_DB_OBJECT, *PSAM_DB_OBJECT; @@ -142,6 +141,9 @@ SampValidateDbObject(SAMPR_HANDLE Handle, NTSTATUS SampCloseDbObject(PSAM_DB_OBJECT DbObject); +NTSTATUS +SampDeleteAccountDbObject(PSAM_DB_OBJECT DbObject); + NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, From 154f5853539d611f142284493fafc5da47db2a2d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 20 Jan 2013 11:03:10 +0000 Subject: [PATCH 33/71] [RTL] Formatting, no code change svn path=/trunk/; revision=58197 --- reactos/lib/rtl/resource.c | 425 +++++++++++++++++++------------------ 1 file changed, 218 insertions(+), 207 deletions(-) diff --git a/reactos/lib/rtl/resource.c b/reactos/lib/rtl/resource.c index 8a21e0aefbc..20ae8e7b7ae 100644 --- a/reactos/lib/rtl/resource.c +++ b/reactos/lib/rtl/resource.c @@ -20,107 +20,111 @@ /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlInitializeResource(PRTL_RESOURCE Resource) { - NTSTATUS Status; + NTSTATUS Status; - Status = RtlInitializeCriticalSection(&Resource->Lock); - if (!NT_SUCCESS(Status)) - { - RtlRaiseStatus(Status); - } + Status = RtlInitializeCriticalSection(&Resource->Lock); + if (!NT_SUCCESS(Status)) + { + RtlRaiseStatus(Status); + } - Status = NtCreateSemaphore(&Resource->SharedSemaphore, - SEMAPHORE_ALL_ACCESS, - NULL, - 0, - 65535); - if (!NT_SUCCESS(Status)) - { - RtlRaiseStatus(Status); - } - Resource->SharedWaiters = 0; + Status = NtCreateSemaphore(&Resource->SharedSemaphore, + SEMAPHORE_ALL_ACCESS, + NULL, + 0, + 65535); + if (!NT_SUCCESS(Status)) + { + RtlRaiseStatus(Status); + } + Resource->SharedWaiters = 0; - Status = NtCreateSemaphore(&Resource->ExclusiveSemaphore, - SEMAPHORE_ALL_ACCESS, - NULL, - 0, - 65535); - if (!NT_SUCCESS(Status)) - { - RtlRaiseStatus(Status); - } - Resource->ExclusiveWaiters = 0; + Status = NtCreateSemaphore(&Resource->ExclusiveSemaphore, + SEMAPHORE_ALL_ACCESS, + NULL, + 0, + 65535); + if (!NT_SUCCESS(Status)) + { + RtlRaiseStatus(Status); + } - Resource->NumberActive = 0; - Resource->OwningThread = NULL; - Resource->TimeoutBoost = 0; /* no info on this one, default value is 0 */ + Resource->ExclusiveWaiters = 0; + Resource->NumberActive = 0; + Resource->OwningThread = NULL; + Resource->TimeoutBoost = 0; /* no info on this one, default value is 0 */ } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlDeleteResource(PRTL_RESOURCE Resource) { - RtlDeleteCriticalSection(&Resource->Lock); - NtClose(Resource->ExclusiveSemaphore); - NtClose(Resource->SharedSemaphore); - Resource->OwningThread = NULL; - Resource->ExclusiveWaiters = 0; - Resource->SharedWaiters = 0; - Resource->NumberActive = 0; + RtlDeleteCriticalSection(&Resource->Lock); + NtClose(Resource->ExclusiveSemaphore); + NtClose(Resource->SharedSemaphore); + Resource->OwningThread = NULL; + Resource->ExclusiveWaiters = 0; + Resource->SharedWaiters = 0; + Resource->NumberActive = 0; } /* * @implemented */ -BOOLEAN NTAPI -RtlAcquireResourceExclusive(PRTL_RESOURCE Resource, - BOOLEAN Wait) +BOOLEAN +NTAPI +RtlAcquireResourceExclusive( + PRTL_RESOURCE Resource, + BOOLEAN Wait) { - NTSTATUS Status; - BOOLEAN retVal = FALSE; + NTSTATUS Status; + BOOLEAN retVal = FALSE; start: RtlEnterCriticalSection(&Resource->Lock); if (Resource->NumberActive == 0) /* lock is free */ - { - Resource->NumberActive = -1; - retVal = TRUE; - } + { + Resource->NumberActive = -1; + retVal = TRUE; + } else if (Resource->NumberActive < 0) /* exclusive lock in progress */ - { - if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) - { - retVal = TRUE; - Resource->NumberActive--; - goto done; - } + { + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) + { + retVal = TRUE; + Resource->NumberActive--; + goto done; + } wait: - if (Wait == TRUE) - { - Resource->ExclusiveWaiters++; + if (Wait == TRUE) + { + Resource->ExclusiveWaiters++; - RtlLeaveCriticalSection(&Resource->Lock); - Status = NtWaitForSingleObject(Resource->ExclusiveSemaphore, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - goto done; - goto start; /* restart the acquisition to avoid deadlocks */ - } - } - else /* one or more shared locks are in progress */ - { - if (Wait == TRUE) - goto wait; - } - if (retVal == TRUE) - Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; + RtlLeaveCriticalSection(&Resource->Lock); + Status = NtWaitForSingleObject(Resource->ExclusiveSemaphore, + FALSE, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + goto start; /* restart the acquisition to avoid deadlocks */ + } + } + else /* one or more shared locks are in progress */ + { + if (Wait == TRUE) + goto wait; + } + if (retVal == TRUE) + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; done: RtlLeaveCriticalSection(&Resource->Lock); return retVal; @@ -130,186 +134,193 @@ done: /* * @implemented */ -BOOLEAN NTAPI -RtlAcquireResourceShared(PRTL_RESOURCE Resource, - BOOLEAN Wait) +BOOLEAN +NTAPI +RtlAcquireResourceShared( + PRTL_RESOURCE Resource, + BOOLEAN Wait) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; - BOOLEAN retVal = FALSE; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + BOOLEAN retVal = FALSE; start: - RtlEnterCriticalSection(&Resource->Lock); - if (Resource->NumberActive < 0) - { - if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) - { - Resource->NumberActive--; - retVal = TRUE; - goto done; - } + RtlEnterCriticalSection(&Resource->Lock); + if (Resource->NumberActive < 0) + { + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) + { + Resource->NumberActive--; + retVal = TRUE; + goto done; + } - if (Wait == TRUE) - { - Resource->SharedWaiters++; - RtlLeaveCriticalSection(&Resource->Lock); - Status = NtWaitForSingleObject(Resource->SharedSemaphore, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - goto done; - goto start; - } - } - else - { - if (Status != STATUS_WAIT_0) /* otherwise RtlReleaseResource() has already done it */ - Resource->NumberActive++; - retVal = TRUE; - } + if (Wait == TRUE) + { + Resource->SharedWaiters++; + RtlLeaveCriticalSection(&Resource->Lock); + Status = NtWaitForSingleObject(Resource->SharedSemaphore, + FALSE, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + goto start; + } + } + else + { + if (Status != STATUS_WAIT_0) /* otherwise RtlReleaseResource() has already done it */ + Resource->NumberActive++; + retVal = TRUE; + } done: - RtlLeaveCriticalSection(&Resource->Lock); - return retVal; + RtlLeaveCriticalSection(&Resource->Lock); + return retVal; } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlConvertExclusiveToShared(PRTL_RESOURCE Resource) { - RtlEnterCriticalSection(&Resource->Lock); + RtlEnterCriticalSection(&Resource->Lock); - if (Resource->NumberActive == -1) - { - Resource->OwningThread = NULL; + if (Resource->NumberActive == -1) + { + Resource->OwningThread = NULL; - if (Resource->SharedWaiters > 0) - { - ULONG n; - /* prevent new writers from joining until - * all queued readers have done their thing */ - n = Resource->SharedWaiters; - Resource->NumberActive = Resource->SharedWaiters + 1; - Resource->SharedWaiters = 0; - NtReleaseSemaphore(Resource->SharedSemaphore, - n, - NULL); - } - else - { - Resource->NumberActive = 1; - } - } + if (Resource->SharedWaiters > 0) + { + ULONG n; + /* prevent new writers from joining until + * all queued readers have done their thing */ + n = Resource->SharedWaiters; + Resource->NumberActive = Resource->SharedWaiters + 1; + Resource->SharedWaiters = 0; + NtReleaseSemaphore(Resource->SharedSemaphore, + n, + NULL); + } + else + { + Resource->NumberActive = 1; + } + } - RtlLeaveCriticalSection(&Resource->Lock); + RtlLeaveCriticalSection(&Resource->Lock); } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlConvertSharedToExclusive(PRTL_RESOURCE Resource) { - NTSTATUS Status; + NTSTATUS Status; - RtlEnterCriticalSection(&Resource->Lock); + RtlEnterCriticalSection(&Resource->Lock); - if (Resource->NumberActive == 1) - { - Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; - Resource->NumberActive = -1; - } - else - { - Resource->ExclusiveWaiters++; + if (Resource->NumberActive == 1) + { + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; + Resource->NumberActive = -1; + } + else + { + Resource->ExclusiveWaiters++; - RtlLeaveCriticalSection(&Resource->Lock); - Status = NtWaitForSingleObject(Resource->ExclusiveSemaphore, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - return; + RtlLeaveCriticalSection(&Resource->Lock); + Status = NtWaitForSingleObject(Resource->ExclusiveSemaphore, + FALSE, + NULL); + if (!NT_SUCCESS(Status)) + return; - RtlEnterCriticalSection(&Resource->Lock); - Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; - Resource->NumberActive = -1; - } - RtlLeaveCriticalSection(&Resource->Lock); + RtlEnterCriticalSection(&Resource->Lock); + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; + Resource->NumberActive = -1; + } + RtlLeaveCriticalSection(&Resource->Lock); } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlReleaseResource(PRTL_RESOURCE Resource) { - RtlEnterCriticalSection(&Resource->Lock); + RtlEnterCriticalSection(&Resource->Lock); - if (Resource->NumberActive > 0) /* have one or more readers */ - { - Resource->NumberActive--; - if (Resource->NumberActive == 0) - { - if (Resource->ExclusiveWaiters > 0) - { + if (Resource->NumberActive > 0) /* have one or more readers */ + { + Resource->NumberActive--; + if (Resource->NumberActive == 0) + { + if (Resource->ExclusiveWaiters > 0) + { wake_exclusive: - Resource->ExclusiveWaiters--; - NtReleaseSemaphore(Resource->ExclusiveSemaphore, - 1, - NULL); - } - } - } - else if (Resource->NumberActive < 0) /* have a writer, possibly recursive */ - { - Resource->NumberActive++; - if (Resource->NumberActive == 0) - { - Resource->OwningThread = 0; - if (Resource->ExclusiveWaiters > 0) - { - goto wake_exclusive; - } - else - { - if (Resource->SharedWaiters > 0) - { - ULONG n; - /* prevent new writers from joining until - * all queued readers have done their thing */ - n = Resource->SharedWaiters; - Resource->NumberActive = Resource->SharedWaiters; - Resource->SharedWaiters = 0; - NtReleaseSemaphore(Resource->SharedSemaphore, - n, - NULL); - } - } - } - } - RtlLeaveCriticalSection(&Resource->Lock); + Resource->ExclusiveWaiters--; + NtReleaseSemaphore(Resource->ExclusiveSemaphore, + 1, + NULL); + } + } + } + else if (Resource->NumberActive < 0) /* have a writer, possibly recursive */ + { + Resource->NumberActive++; + if (Resource->NumberActive == 0) + { + Resource->OwningThread = 0; + if (Resource->ExclusiveWaiters > 0) + { + goto wake_exclusive; + } + else + { + if (Resource->SharedWaiters > 0) + { + ULONG n; + /* prevent new writers from joining until + * all queued readers have done their thing */ + n = Resource->SharedWaiters; + Resource->NumberActive = Resource->SharedWaiters; + Resource->SharedWaiters = 0; + NtReleaseSemaphore(Resource->SharedSemaphore, + n, + NULL); + } + } + } + } + RtlLeaveCriticalSection(&Resource->Lock); } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlDumpResource(PRTL_RESOURCE Resource) { - DbgPrint("RtlDumpResource(%p):\n\tactive count = %i\n\twaiting readers = %i\n\twaiting writers = %i\n", - Resource, - Resource->NumberActive, - Resource->SharedWaiters, - Resource->ExclusiveWaiters); - if (Resource->NumberActive != 0) - { - DbgPrint("\towner thread = %08x\n", - Resource->OwningThread); - } + DbgPrint("RtlDumpResource(%p):\n\tactive count = %i\n\twaiting readers = %i\n\twaiting writers = %i\n", + Resource, + Resource->NumberActive, + Resource->SharedWaiters, + Resource->ExclusiveWaiters); + + if (Resource->NumberActive != 0) + { + DbgPrint("\towner thread = %08x\n", + Resource->OwningThread); + } } /* EOF */ From 7bc3ce6d8ecf8c33d01fe4e89cfc8fe0ffd3d4ae Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 21 Jan 2013 20:58:23 +0000 Subject: [PATCH 34/71] [NTOSKRNL] Some keyed event fixes: disable APCs before acquiring the pushlock, close handle on exception, check if a wait was aborted and remove the wait list entry from the list in that case. svn path=/trunk/; revision=58200 --- reactos/ntoskrnl/ex/keyedevt.c | 41 ++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/reactos/ntoskrnl/ex/keyedevt.c b/reactos/ntoskrnl/ex/keyedevt.c index b5efacab8a0..9ab975815dd 100644 --- a/reactos/ntoskrnl/ex/keyedevt.c +++ b/reactos/ntoskrnl/ex/keyedevt.c @@ -142,6 +142,7 @@ ExpReleaseOrWaitForKeyedEvent( HashIndex %= NUM_KEY_HASH_BUCKETS; /* Lock the lists */ + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); /* Get the lists for search and wait, depending on whether @@ -161,6 +162,10 @@ ExpReleaseOrWaitForKeyedEvent( ListEntry = WaitListHead1->Flink; while (ListEntry != WaitListHead1) { + /* Get the waiting thread. Note that this thread cannot be terminated + as long as we hold the list lock, since it either needs to wait to + be signaled by this thread or, when the wait is aborted due to thread + termination, then it first needs to acquire the list lock. */ Thread = CONTAINING_RECORD(ListEntry, ETHREAD, KeyedWaitChain); /* Check if this thread is a correct waiter */ @@ -170,11 +175,16 @@ ExpReleaseOrWaitForKeyedEvent( /* Remove the thread from the list */ RemoveEntryList(&Thread->KeyedWaitChain); + /* Initialize the list entry to show that it was removed */ + InitializeListHead(&Thread->KeyedWaitChain); + /* Wake the thread */ KeReleaseSemaphore(&Thread->KeyedWaitSemaphore, 0, 1, FALSE); + Thread = NULL; - /* Unlock the lists */ + /* Unlock the list. After this it is not safe to access Thread */ ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); return STATUS_SUCCESS; } @@ -192,8 +202,9 @@ ExpReleaseOrWaitForKeyedEvent( /* Insert the current thread into the secondary wait list */ InsertTailList(WaitListHead2, &CurrentThread->KeyedWaitChain); - /* Unlock the lists */ + /* Unlock the list */ ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); /* Wait for the keyed wait semaphore */ Status = KeWaitForSingleObject(&CurrentThread->KeyedWaitSemaphore, @@ -202,7 +213,26 @@ ExpReleaseOrWaitForKeyedEvent( Alertable, Timeout); - return STATUS_SUCCESS; + /* Check if the wait was aborted or timed out */ + if (Status != STATUS_SUCCESS) + { + /* Lock the lists to make sure no one else messes with the entry */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + + /* Check if the wait list entry is still in the list */ + if (CurrentThread->KeyedWaitChain.Flink != &CurrentThread->KeyedWaitChain) + { + /* Remove the thread from the list */ + RemoveEntryList(&CurrentThread->KeyedWaitChain); + } + + /* Unlock the list */ + ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); + KeLeaveCriticalRegion(); + } + + return Status; } _IRQL_requires_max_(APC_LEVEL) @@ -274,7 +304,7 @@ NtCreateKeyedEvent( /* Check for success */ if (!NT_SUCCESS(Status)) return Status; - /* Initalize the keyed event */ + /* Initialize the keyed event */ ExpInitializeKeyedEvent(KeyedEvent); /* Insert it */ @@ -353,6 +383,9 @@ NtOpenKeyedEvent( { /* Get the exception code */ Status = _SEH2_GetExceptionCode(); + + /* Cleanup */ + ObCloseHandle(KeyedEventHandle, PreviousMode); } _SEH2_END; } From e368e3af9012567cf93e617dea53ecdf8c9885ca Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Tue, 22 Jan 2013 22:38:40 +0000 Subject: [PATCH 35/71] [CMAKE] - Improve help strings for GCC optimization levels. - Add new -Ofast and -Og levels. - Simplify gcc.cmake a bit. - Use MINGW_TOOLCHAIN_SUFFIX. svn path=/trunk/; revision=58201 --- reactos/cmake/config-amd64.cmake | 16 ++++++++------- reactos/cmake/config-arm.cmake | 16 ++++++++------- reactos/cmake/config.cmake | 24 +++++++++++----------- reactos/cmake/gcc.cmake | 35 +++++++++++--------------------- 4 files changed, 42 insertions(+), 49 deletions(-) diff --git a/reactos/cmake/config-amd64.cmake b/reactos/cmake/config-amd64.cmake index c84262f1501..c89dddb5213 100644 --- a/reactos/cmake/config-amd64.cmake +++ b/reactos/cmake/config-amd64.cmake @@ -7,13 +7,15 @@ set(OARCH "athlon64" CACHE STRING k8 opteron athlon64 athlon-fx") set (OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") diff --git a/reactos/cmake/config-arm.cmake b/reactos/cmake/config-arm.cmake index 1f34cee921d..7d0fb1e88cd 100644 --- a/reactos/cmake/config-arm.cmake +++ b/reactos/cmake/config-arm.cmake @@ -8,13 +8,15 @@ set(OARCH "armv7-a" CACHE STRING armv5te armv7-a") set (OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") diff --git a/reactos/cmake/config.cmake b/reactos/cmake/config.cmake index 3c28265c1b2..d3a6f26b644 100644 --- a/reactos/cmake/config.cmake +++ b/reactos/cmake/config.cmake @@ -1,25 +1,25 @@ set(SARCH "pc" CACHE STRING -"Sub-architecture to build for. Specify one of: xbox") +"Sub-architecture to build for. Specify one of: + pc xbox") set(OARCH "pentium" CACHE STRING "Generate instructions for this CPU type. Specify one of: - native, i386, i486, pentium, pentium-mmx, pentiumpro, i686, - pentium2, pentium3, pentium-m, pentium4, prescott, nocona, - core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3, - barcelona, winchip-c6, winchip2, c3, c3-2, geode") + pentium, pentiumpro") set(TUNE "i686" CACHE STRING "Which CPU ReactOS should be optimized for.") set(OPTIMIZE "1" CACHE STRING -"What level of optimisation to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = -Os - 3 = -O1 - 4 = -O2 - 5 = -O3") +"What level of optimization to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = Optimize for size (-Os) + 3 = Optimize debugging experience (-Og) + 4 = Optimize (-O1) + 5 = Optimize even more (-O2) + 6 = Optimize yet more (-O3) + 7 = Disregard strict standards compliance (-Ofast)") set(LTCG FALSE CACHE BOOL "Whether to build with link-time code generation") diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index 0f35c17273e..fc2cd520fd2 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -10,7 +10,7 @@ if(NOT DEFINED SEPARATE_DBG) endif() # Compiler Core -add_compile_flags("-pipe -fms-extensions") +add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) @@ -28,9 +28,6 @@ else() add_compile_flags("-gstabs+") endif() -# Do not allow warnings -add_compile_flags("-Werror") - # For some reason, cmake sets -fPIC, and we don't want it if(DEFINED CMAKE_SHARED_LIBRARY_ASM_FLAGS) string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) @@ -44,7 +41,7 @@ else() endif() # Warnings -add_compile_flags("-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") +add_compile_flags("-Werror -Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-unused-value") if(GCC_VERSION VERSION_LESS 4.6) add_compile_flags("-Wno-error=uninitialized") @@ -62,15 +59,19 @@ endif() # Optimizations if(OPTIMIZE STREQUAL "1") - add_compile_flags("-Os") + add_compile_flags("-Os -ftracer") elseif(OPTIMIZE STREQUAL "2") add_compile_flags("-Os") elseif(OPTIMIZE STREQUAL "3") - add_compile_flags("-O1") + add_compile_flags("-O1 -fno-inline-functions-called-once -fno-tree-sra") elseif(OPTIMIZE STREQUAL "4") - add_compile_flags("-O2") + add_compile_flags("-O1") elseif(OPTIMIZE STREQUAL "5") + add_compile_flags("-O2") +elseif(OPTIMIZE STREQUAL "6") add_compile_flags("-O3") +elseif(OPTIMIZE STREQUAL "7") + add_compile_flags("-Ofast") endif() # Link-time code generation @@ -78,25 +79,13 @@ if(LTCG) add_compile_flags("-flto -Wno-error=clobbered") endif() -add_compile_flags("-fno-strict-aliasing") - if(ARCH STREQUAL "i386") add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - add_compile_flags("-momit-leaf-frame-pointer") - endif() + if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + add_compile_flags("-momit-leaf-frame-pointer") endif() elseif(ARCH STREQUAL "amd64") add_compile_flags("-mpreferred-stack-boundary=4") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - endif() -elseif(ARCH STREQUAL "arm") - if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer") - endif() endif() # Other @@ -174,7 +163,7 @@ SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} set(CMAKE_ASM_COMPILE_OBJECT " -x assembler-with-cpp -o -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ") set(CMAKE_RC_COMPILE_OBJECT " -O coff -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} ") -set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc -E -xc-header -MMD -MF -MT \" ") +set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX} -E -xc-header -MMD -MF -MT \" ") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT) From 73e8d00d1d03d7186f0ffa2effbedbc3c0dccaf0 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Tue, 22 Jan 2013 22:41:31 +0000 Subject: [PATCH 36/71] [VGAFONTS] Add bitmap font for code page 862. Hebrew glyphs are from X11 font "Schumacher Clean" (see license below), modified by Baruch Rutman (peterooch*at*gmail*dot*com). CORE-6912. Copyright 1989 Dale Schumacher, dal@syntel.mn.org 399 Beacon Ave. St. Paul, MN 55104-3527 Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Dale Schumacher not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Dale Schumacher makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. svn path=/trunk/; revision=58202 --- reactos/media/vgafonts/862-8x8.bin | Bin 0 -> 2048 bytes reactos/media/vgafonts/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+) create mode 100644 reactos/media/vgafonts/862-8x8.bin diff --git a/reactos/media/vgafonts/862-8x8.bin b/reactos/media/vgafonts/862-8x8.bin new file mode 100644 index 0000000000000000000000000000000000000000..ac3591df534a205ed52cb1f9c9b3922c2e586ae8 GIT binary patch literal 2048 zcmYLKPiyN&5FZloyNEc)1sez2cgtm8-P(c(8{T*5<()+G*uKL;eR2g=mE_h#KS1*V zdg-~>fFPjuu;krBz{dFGTpq!vL=++Q_gmR?gfu&|voo{vPa-X3*MD5!-dtx{vuN&~ zn#|U9orcG99Ht(JX-GzT+%i%T6-7#aH{oeyS}`*ytw#bliz%Zo}Qu)H&^SjF4tFba5SkWM+eZFDV0SE$BYppmy5;E zy=p(s`cOKyOWB-U8zQyrtt_94ikx zNwgL%)>=w`EC@P%NrjXEv^QD_h9Oqt6={SzH61)m)5fe3$!Ist)6t8v)xkijybMT(ab6;y)muOKW`o$U`@-kqj=x6SglrhA{q)R=cFK-_>MN!z$ z+l!$O=G`*sdz$AGx1RNR&%au|*alRz2lZNT`k{V?J}7}M^5H@vb@7|}2KExzjpIak z`Ji(k2@6CesAmZO4~_P*AtMP=AO0ZEzw3{c^tE1V-Dh9;mjqZc=hX-dM1jT__6E`DOk~mlOhqF2 zKNyKjNq5K}0YnBndK$F+DY_DUDZ}x1@801Y0!6jc!xq}b1Z4;gie0??iO6``8xF@5 z_aJX5kMrCg^hM5yBa&WGyO_ubo6H~<-45iZhr{7;fO31Q;|}Sv%b%JCgCoB0*22^pMlPhE}t+oulrIhokZ47 z1Z++tNzrB)G^`UqmFGlKF%ox$TMdot0x!ltem>ldD8$P+GlUer24(QoukG{wpY5~w zY4OaLciltj7o{R*GG2T_L~4)s{Fe^-d%*6Fe(4~~LO!vA78HqxR28Hwn4G!=N|M?HP?2$wO literal 0 HcmV?d00001 diff --git a/reactos/media/vgafonts/CMakeLists.txt b/reactos/media/vgafonts/CMakeLists.txt index a0987bca31c..d4df67a8ae5 100644 --- a/reactos/media/vgafonts/CMakeLists.txt +++ b/reactos/media/vgafonts/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/775-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/850-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/852-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/862-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/866-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin From 9ba418e493266678228200c97fd2ddcce2bd2df8 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Tue, 22 Jan 2013 22:46:45 +0000 Subject: [PATCH 37/71] [TRANSLATION] Hebrew translations by Baruch Rutman. CORE-6904. svn path=/trunk/; revision=58203 --- reactos/base/applications/calc/lang/he-IL.rc | 732 +++++++ reactos/base/applications/calc/resource.rc | 3 + .../base/applications/charmap/lang/he-IL.rc | 50 + reactos/base/applications/charmap/rsrc.rc | 3 + .../base/applications/dxdiag/lang/he-IL.rc | 227 +++ reactos/base/applications/dxdiag/rsrc.rc | 4 + .../base/applications/fontview/fontview.rc | 4 + .../base/applications/fontview/lang/he-IL.rc | 14 + .../games/solitaire/lang/he-IL.rc | 93 + .../base/applications/games/solitaire/rsrc.rc | 3 + .../applications/games/spider/lang/he-IL.rc | 86 + .../base/applications/games/spider/rsrc.rc | 3 + .../applications/games/winmine/lang/he-IL.rc | 94 + .../base/applications/games/winmine/rsrc.rc | 4 + .../base/applications/kbswitch/lang/he-IL.rc | 11 + reactos/base/applications/kbswitch/rsrc.rc | 4 + .../base/applications/magnify/lang/he-IL.rc | 65 + reactos/base/applications/magnify/rsrc.rc | 4 + reactos/base/applications/mmc/lang/he-IL.rc | 21 + reactos/base/applications/mmc/rsrc.rc | 4 + .../base/applications/mplay32/lang/he-IL.rc | 30 + reactos/base/applications/mplay32/rsrc.rc | 3 + .../base/applications/msconfig/lang/he-IL.rc | 175 ++ reactos/base/applications/msconfig/rsrc.rc | 3 + .../mscutils/devmgmt/lang/he-IL.rc | 84 + .../applications/mscutils/devmgmt/rsrc.rc | 3 + .../mscutils/devmgmt_new/lang/he-IL.rc | 77 + .../applications/mscutils/devmgmt_new/rsrc.rc | 4 + .../mscutils/eventvwr/lang/he-IL.rc | 123 ++ .../applications/mscutils/eventvwr/rsrc.rc | 3 + .../mscutils/servman/lang/he-IL.rc | 282 +++ .../applications/mscutils/servman/rsrc.rc | 3 + .../base/applications/mspaint/lang/he-IL.rc | 206 ++ reactos/base/applications/mspaint/rsrc.rc | 3 + reactos/base/applications/mstsc/lang/he-IL.rc | 64 + reactos/base/applications/mstsc/rsrc.rc | 4 + .../base/applications/notepad/lang/he-IL.rc | 206 ++ reactos/base/applications/notepad/rsrc.rc | 3 + reactos/base/applications/rapps/lang/he-IL.rc | 194 ++ reactos/base/applications/rapps/rsrc.rc | 3 + .../base/applications/regedit/lang/he-IL.rc | 608 ++++++ reactos/base/applications/regedit/rsrc.rc | 3 + .../screensavers/3dtext/lang/he-IL.rc | 17 + .../applications/screensavers/3dtext/rsrc.rc | 3 + .../screensavers/logon/lang/he-IL.rc | 7 + .../applications/screensavers/logon/logon.rc | 3 + .../base/applications/shutdown/lang/he-IL.rc | 103 + reactos/base/applications/shutdown/rsrc.rc | 3 + .../base/applications/sndrec32/lang/he-IL.rc | 54 + reactos/base/applications/sndrec32/rsrc.rc | 3 + .../base/applications/sndvol32/lang/he-IL.rc | 57 + reactos/base/applications/sndvol32/rsrc.rc | 3 + .../base/applications/taskmgr/lang/he-IL.rc | 643 +++++++ reactos/base/applications/taskmgr/rsrc.rc | 4 + reactos/base/applications/wordpad/He.rc | 274 +++ reactos/base/applications/wordpad/rsrc.rc | 3 + reactos/base/applications/write/He.rc | 30 + reactos/base/applications/write/rsrc.rc | 3 + reactos/base/setup/reactos/lang/he-IL.rc | 153 ++ reactos/base/setup/reactos/rsrc.rc | 5 +- reactos/base/setup/usetup/lang/he-IL.h | 1699 +++++++++++++++++ reactos/base/setup/usetup/muilanguages.h | 2 +- reactos/base/setup/vmwinst/lang/he-IL.rc | 132 ++ reactos/base/setup/vmwinst/rsrc.rc | 3 + reactos/base/setup/welcome/lang/he-IL.rc | 62 + reactos/base/setup/welcome/rsrc.rc | 3 + reactos/base/shell/explorer-new/explorer.rc | 3 + reactos/base/shell/explorer-new/lang/he-IL.rc | 147 ++ reactos/base/system/rundll32/lang/he-IL.rc | 10 + reactos/base/system/rundll32/rsrc.rc | 3 + reactos/base/system/runonce/lang/he-IL.rc | 11 + reactos/base/system/runonce/rsrc.rc | 3 + reactos/base/system/userinit/lang/he-IL.rc | 11 + reactos/base/system/userinit/rsrc.rc | 3 + reactos/base/system/winlogon/lang/he-IL.rc | 45 + reactos/base/system/winlogon/rsrc.rc | 4 + reactos/boot/bootdata/txtsetup.sif | 2 +- reactos/dll/cpl/access/lang/he-IL.rc | 305 +++ reactos/dll/cpl/access/rsrc.rc | 4 + reactos/dll/cpl/appwiz/lang/he-IL.rc | 51 + reactos/dll/cpl/appwiz/rsrc.rc | 3 + reactos/dll/cpl/console/lang/he-IL.rc | 150 ++ reactos/dll/cpl/console/rsrc.rc | 3 + reactos/dll/cpl/desk/lang/he-IL.rc | 267 +++ reactos/dll/cpl/desk/rsrc.rc | 3 + reactos/dll/cpl/hdwwiz/lang/he-IL.rc | 148 ++ reactos/dll/cpl/hdwwiz/rsrc.rc | 3 + reactos/dll/cpl/inetcpl/lang/He.rc | 30 +- reactos/dll/cpl/input/lang/he-IL.rc | 252 +++ reactos/dll/cpl/input/rsrc.rc | 3 + reactos/dll/cpl/intl/lang/he-IL.rc | 200 ++ reactos/dll/cpl/intl/rsrc.rc | 3 + reactos/dll/cpl/joy/lang/he-IL.rc | 84 + reactos/dll/cpl/joy/rsrc.rc | 3 + reactos/dll/cpl/liccpa/lang/he-IL.rc | 27 + reactos/dll/cpl/liccpa/rsrc.rc | 3 + reactos/dll/cpl/main/lang/he-IL.rc | 172 ++ reactos/dll/cpl/main/rsrc.rc | 3 + reactos/dll/cpl/mmsys/lang/he-IL.rc | 270 +++ reactos/dll/cpl/mmsys/rsrc.rc | 3 + reactos/dll/cpl/powercfg/lang/he-IL.rc | 164 ++ reactos/dll/cpl/powercfg/rsrc.rc | 3 + reactos/dll/cpl/sysdm/lang/he-IL.rc | 310 +++ reactos/dll/cpl/sysdm/rsrc.rc | 3 + reactos/dll/cpl/telephon/lang/he-IL.rc | 7 + reactos/dll/cpl/telephon/rsrc.rc | 3 + reactos/dll/cpl/timedate/lang/he-IL.rc | 68 + reactos/dll/cpl/timedate/rsrc.rc | 3 + reactos/dll/cpl/usrmgr/lang/he-IL.rc | 223 +++ reactos/dll/cpl/usrmgr/rsrc.rc | 3 + reactos/dll/cpl/wined3dcfg/lang/he-IL.rc | 27 + reactos/dll/cpl/wined3dcfg/rsrc.rc | 4 + reactos/dll/shellext/deskadp/lang/he-IL.rc | 48 + reactos/dll/shellext/deskadp/rsrc.rc | 3 + reactos/dll/shellext/deskmon/lang/he-IL.rc | 22 + reactos/dll/shellext/deskmon/rsrc.rc | 3 + reactos/dll/shellext/slayer/lang/he-IL.rc | 38 + reactos/dll/shellext/slayer/rsrc.rc | 3 + reactos/dll/win32/aclui/lang/he-IL.rc | 32 + reactos/dll/win32/aclui/rsrc.rc | 3 + reactos/dll/win32/avifil32/avifile_He.rc | 55 + reactos/dll/win32/avifil32/rsrc.rc | 3 + reactos/dll/win32/browseui/browseui.rc | 6 + reactos/dll/win32/browseui/lang/he-IL.rc | 275 +++ reactos/dll/win32/comctl32/comctl_He.rc | 36 +- reactos/dll/win32/credui/credui.rc | 3 + reactos/dll/win32/credui/credui_He.rc | 54 + reactos/dll/win32/crypt32/crypt32.rc | 3 + reactos/dll/win32/crypt32/crypt32_He.rc | 243 +++ reactos/dll/win32/cryptdlg/cryptdlg.rc | 3 + reactos/dll/win32/cryptdlg/cryptdlg_He.rc | 40 + reactos/dll/win32/cryptui/cryptui.rc | 3 + reactos/dll/win32/cryptui/cryptui_He.rc | 460 +++++ reactos/dll/win32/devmgr/devmgr.rc | 3 + reactos/dll/win32/devmgr/lang/he-IL.rc | 230 +++ reactos/dll/win32/hhctrl.ocx/He.rc | 72 + reactos/dll/win32/hhctrl.ocx/hhctrl.rc | 3 + reactos/dll/win32/iccvid/iccvid_He.rc | 29 + reactos/dll/win32/iccvid/rsrc.rc | 3 + reactos/dll/win32/jscript/jscript_He.rc | 49 + reactos/dll/win32/jscript/rsrc.rc | 3 + reactos/dll/win32/localspl/localspl.rc | 3 + reactos/dll/win32/localspl/spl_He.rc | 32 + reactos/dll/win32/localui/localui.rc | 3 + reactos/dll/win32/localui/ui_He.rc | 58 + reactos/dll/win32/mapi32/He.rc | 32 + reactos/dll/win32/mapi32/version.rc | 3 + reactos/dll/win32/modemui/lang/he-IL.rc | 613 ++++++ reactos/dll/win32/modemui/modemui.rc | 4 + reactos/dll/win32/mpr/mpr.rc | 3 + reactos/dll/win32/mpr/mpr_He.rc | 50 + reactos/dll/win32/msacm32/msacm.rc | 3 + reactos/dll/win32/msacm32/msacm_He.rc | 58 + reactos/dll/win32/msgina/lang/he-IL.rc | 58 + reactos/dll/win32/msgina/msgina.rc | 1 + reactos/dll/win32/mshtml/He.rc | 70 + reactos/dll/win32/mshtml/rsrc.rc | 3 + reactos/dll/win32/msi/msi_He.rc | 39 + reactos/dll/win32/msports/lang/he-IL.rc | 21 + reactos/dll/win32/msports/msports.rc | 3 + reactos/dll/win32/msrle32/msrle_He.rc | 34 + reactos/dll/win32/msrle32/rsrc.rc | 3 + reactos/dll/win32/msvfw32/msvfw32_He.rc | 55 + reactos/dll/win32/msvfw32/rsrc.rc | 3 + reactos/dll/win32/netcfgx/lang/he-IL.rc | 230 +++ reactos/dll/win32/netcfgx/netcfgx.rc | 3 + reactos/dll/win32/netid/lang/he-IL.rc | 79 + reactos/dll/win32/netid/rsrc.rc | 3 + reactos/dll/win32/netshell/lang/he-IL.rc | 126 ++ reactos/dll/win32/netshell/netshell.rc | 3 + reactos/dll/win32/newdev/lang/he-IL.rc | 109 ++ reactos/dll/win32/newdev/rsrc.rc | 4 + reactos/dll/win32/oleacc/oleacc.rc | 3 + reactos/dll/win32/oleacc/oleacc_He.rc | 94 + reactos/dll/win32/oleaut32/oleaut32.rc | 3 + reactos/dll/win32/oleaut32/oleaut32_He.rc | 35 + 176 files changed, 13370 insertions(+), 34 deletions(-) create mode 100644 reactos/base/applications/calc/lang/he-IL.rc create mode 100644 reactos/base/applications/charmap/lang/he-IL.rc create mode 100644 reactos/base/applications/dxdiag/lang/he-IL.rc create mode 100644 reactos/base/applications/fontview/lang/he-IL.rc create mode 100644 reactos/base/applications/games/solitaire/lang/he-IL.rc create mode 100644 reactos/base/applications/games/spider/lang/he-IL.rc create mode 100644 reactos/base/applications/games/winmine/lang/he-IL.rc create mode 100644 reactos/base/applications/kbswitch/lang/he-IL.rc create mode 100644 reactos/base/applications/magnify/lang/he-IL.rc create mode 100644 reactos/base/applications/mmc/lang/he-IL.rc create mode 100644 reactos/base/applications/mplay32/lang/he-IL.rc create mode 100644 reactos/base/applications/msconfig/lang/he-IL.rc create mode 100644 reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc create mode 100644 reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc create mode 100644 reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc create mode 100644 reactos/base/applications/mscutils/servman/lang/he-IL.rc create mode 100644 reactos/base/applications/mspaint/lang/he-IL.rc create mode 100644 reactos/base/applications/mstsc/lang/he-IL.rc create mode 100644 reactos/base/applications/notepad/lang/he-IL.rc create mode 100644 reactos/base/applications/rapps/lang/he-IL.rc create mode 100644 reactos/base/applications/regedit/lang/he-IL.rc create mode 100644 reactos/base/applications/screensavers/3dtext/lang/he-IL.rc create mode 100644 reactos/base/applications/screensavers/logon/lang/he-IL.rc create mode 100644 reactos/base/applications/shutdown/lang/he-IL.rc create mode 100644 reactos/base/applications/sndrec32/lang/he-IL.rc create mode 100644 reactos/base/applications/sndvol32/lang/he-IL.rc create mode 100644 reactos/base/applications/taskmgr/lang/he-IL.rc create mode 100644 reactos/base/applications/wordpad/He.rc create mode 100644 reactos/base/applications/write/He.rc create mode 100644 reactos/base/setup/reactos/lang/he-IL.rc create mode 100644 reactos/base/setup/vmwinst/lang/he-IL.rc create mode 100644 reactos/base/setup/welcome/lang/he-IL.rc create mode 100644 reactos/base/shell/explorer-new/lang/he-IL.rc create mode 100644 reactos/base/system/rundll32/lang/he-IL.rc create mode 100644 reactos/base/system/runonce/lang/he-IL.rc create mode 100644 reactos/base/system/userinit/lang/he-IL.rc create mode 100644 reactos/base/system/winlogon/lang/he-IL.rc create mode 100644 reactos/dll/cpl/access/lang/he-IL.rc create mode 100644 reactos/dll/cpl/appwiz/lang/he-IL.rc create mode 100644 reactos/dll/cpl/console/lang/he-IL.rc create mode 100644 reactos/dll/cpl/desk/lang/he-IL.rc create mode 100644 reactos/dll/cpl/hdwwiz/lang/he-IL.rc create mode 100644 reactos/dll/cpl/input/lang/he-IL.rc create mode 100644 reactos/dll/cpl/intl/lang/he-IL.rc create mode 100644 reactos/dll/cpl/joy/lang/he-IL.rc create mode 100644 reactos/dll/cpl/liccpa/lang/he-IL.rc create mode 100644 reactos/dll/cpl/main/lang/he-IL.rc create mode 100644 reactos/dll/cpl/mmsys/lang/he-IL.rc create mode 100644 reactos/dll/cpl/powercfg/lang/he-IL.rc create mode 100644 reactos/dll/cpl/sysdm/lang/he-IL.rc create mode 100644 reactos/dll/cpl/telephon/lang/he-IL.rc create mode 100644 reactos/dll/cpl/timedate/lang/he-IL.rc create mode 100644 reactos/dll/cpl/usrmgr/lang/he-IL.rc create mode 100644 reactos/dll/cpl/wined3dcfg/lang/he-IL.rc create mode 100644 reactos/dll/shellext/deskadp/lang/he-IL.rc create mode 100644 reactos/dll/shellext/deskmon/lang/he-IL.rc create mode 100644 reactos/dll/shellext/slayer/lang/he-IL.rc create mode 100644 reactos/dll/win32/aclui/lang/he-IL.rc create mode 100644 reactos/dll/win32/avifil32/avifile_He.rc create mode 100644 reactos/dll/win32/browseui/lang/he-IL.rc create mode 100644 reactos/dll/win32/credui/credui_He.rc create mode 100644 reactos/dll/win32/crypt32/crypt32_He.rc create mode 100644 reactos/dll/win32/cryptdlg/cryptdlg_He.rc create mode 100644 reactos/dll/win32/cryptui/cryptui_He.rc create mode 100644 reactos/dll/win32/devmgr/lang/he-IL.rc create mode 100644 reactos/dll/win32/hhctrl.ocx/He.rc create mode 100644 reactos/dll/win32/iccvid/iccvid_He.rc create mode 100644 reactos/dll/win32/jscript/jscript_He.rc create mode 100644 reactos/dll/win32/localspl/spl_He.rc create mode 100644 reactos/dll/win32/localui/ui_He.rc create mode 100644 reactos/dll/win32/mapi32/He.rc create mode 100644 reactos/dll/win32/modemui/lang/he-IL.rc create mode 100644 reactos/dll/win32/mpr/mpr_He.rc create mode 100644 reactos/dll/win32/msacm32/msacm_He.rc create mode 100644 reactos/dll/win32/msgina/lang/he-IL.rc create mode 100644 reactos/dll/win32/mshtml/He.rc create mode 100644 reactos/dll/win32/msi/msi_He.rc create mode 100644 reactos/dll/win32/msports/lang/he-IL.rc create mode 100644 reactos/dll/win32/msrle32/msrle_He.rc create mode 100644 reactos/dll/win32/msvfw32/msvfw32_He.rc create mode 100644 reactos/dll/win32/netcfgx/lang/he-IL.rc create mode 100644 reactos/dll/win32/netid/lang/he-IL.rc create mode 100644 reactos/dll/win32/netshell/lang/he-IL.rc create mode 100644 reactos/dll/win32/newdev/lang/he-IL.rc create mode 100644 reactos/dll/win32/oleacc/oleacc_He.rc create mode 100644 reactos/dll/win32/oleaut32/oleaut32_He.rc diff --git a/reactos/base/applications/calc/lang/he-IL.rc b/reactos/base/applications/calc/lang/he-IL.rc new file mode 100644 index 00000000000..be61f9673b7 --- /dev/null +++ b/reactos/base/applications/calc/lang/he-IL.rc @@ -0,0 +1,732 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +// Translated by Baruch Rutman +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מחשבון ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,5,14,141,20 + CONTROL "הקסהדסימלי",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,21,30,10 + CONTROL "עשרוני",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,41,21,30,10 + CONTROL "אוקטלי",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,74,21,30,10 + CONTROL "בינארי",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,107,21,30,10 + GROUPBOX "",IDC_STATIC,5,34,84,20 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,41,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,49,41,29,10 + CTEXT "",IDC_TEXT_PARENT,93,38,18,16,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,126,38,18,16,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,5,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,5,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,5,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,5,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,5,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,60,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,60,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,123,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,123,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,123,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,123,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,123,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,156,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,156,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,156,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,156,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,156,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,182,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,182,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,182,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,182,120,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,182,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,208,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,208,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,208,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,208,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,208,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,234,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,234,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,234,100,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,234,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,234,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,260,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,260,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,260,100,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,260,120,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,260,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,286,60,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,286,80,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,286,100,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,286,120,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,286,140,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,147,14,163,20 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,150,21,38,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,190,21,38,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,230,21,38,10 + CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,270,21,38,10 + CONTROL "מעלות",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON, + 150,21,45,10 + CONTROL "רדיאנים",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON, + 204,21,45,10 + CONTROL "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 258,21,45,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,267,38,43,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,222,38,43,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,177,38,43,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,5,1,305,14,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מחשבון ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,123,23,41,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,80,23,41,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,36,23,42,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,5,1,159,14,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,36,45,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,36,65,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,36,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,36,105,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,62,45,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,62,65,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,62,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,62,105,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,88,45,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,88,65,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,88,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,88,105,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,114,45,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,114,65,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,114,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,114,105,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,140,45,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,140,65,24,18,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,140,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,140,105,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,8,24,18,16,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,5,45,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,5,65,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,5,85,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,5,105,24,18,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מחשבון ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "המר",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,5,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "קטגוריה:",IDC_STATIC,5,20,56,8 + COMBOBOX IDC_COMBO_FROM,5,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "המר מ:",IDC_STATIC,5,49,56,8 + COMBOBOX IDC_COMBO_TO,5,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "המר ל:",IDC_STATIC,5,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,5,1,312,14,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,18 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,18 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,18 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,18 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,18 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,18 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,18 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,18 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,18 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,18 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,18 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,18 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,18 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,18 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,18 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,18 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,18 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,18 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,18 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,18 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,18,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,18 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,18 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,18 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,18 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אודות המחשבון ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "אישור",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "מחשבון ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "גירסה ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "נכתבה על ידי Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,5,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "תיבת סטטיסטיקה" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "עריכה" + BEGIN + MENUITEM "העתק\tCtrl+C", IDM_EDIT_COPY + MENUITEM "הדבק\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "תצוגה" + BEGIN + MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED + MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "עשרוני\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "אוקטלי\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "בינארי\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "מעלות\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "רדיאנים\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "קיבוץ ספרות", IDM_VIEW_GROUP, CHECKED + END + POPUP "עזרה" + BEGIN + MENUITEM "נושאי עזרה", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "אודות המחשבון ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "עריכה" + BEGIN + MENUITEM "העתק\tCtrl+C", IDM_EDIT_COPY + MENUITEM "הדבק\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "תצוגה" + BEGIN + MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED + MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "עשרוני\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "אוקטלי\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "בינארי\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "קיבוץ ספרות", IDM_VIEW_GROUP, CHECKED + END + POPUP "עזרה" + BEGIN + MENUITEM "נושאי עזרה", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "אודות המחשבון ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "עריכה" + BEGIN + MENUITEM "העתק\tCtrl+C", IDM_EDIT_COPY + MENUITEM "הדבק\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "תצוגה" + BEGIN + MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED + MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "קיבוץ ספרות", IDM_VIEW_GROUP, CHECKED + END + POPUP "עזרה" + BEGIN + MENUITEM "נושאי עזרה", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "אודות המחשבון ReactOS", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "שגיאה" + IDS_QUICKHELP "עזרה מהירה" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "זוית" + IDS_CONV_AREA "שטח" + IDS_CONV_CONSUMPTION "Consumption (engines)" + IDS_CONV_CURRENCY "מטבע" + IDS_CONV_ENERGY "אנרגיה" + IDS_CONV_LENGTH "מרחק" + IDS_CONV_POWER "כוח" + IDS_CONV_PRESSURE "לחץ" + IDS_CONV_TEMPERATURE "טמפרטורה" + IDS_CONV_TIME "זמן" + IDS_CONV_VELOCITY "Velocity" + IDS_CONV_VOLUME "נפח" + IDS_CONV_WEIGHT "משקל" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "מעלות" + IDS_ANGLE_GRADIANS "Gradians" + IDS_ANGLE_RADIANS "רדיאנים" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "דונמים" + IDS_AREA_ACRES_BRAZIL "דונמים (ברזיל)" + IDS_AREA_ACRES_FRANCE "דונמים (צרפת)" + IDS_AREA_ACRES_SCOTS "דונמים (סקוטלנד)" + IDS_AREA_ACRES_US "דונמים (ארצות הברית)" + IDS_AREA_ARES "Ares" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "Hectares" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "סנטימטר מרובע" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "Square fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "רגל מרובע" + IDS_AREA_SQUARE_INCHES "אינצ'ים מרובעים" + IDS_AREA_SQUARE_KILOMETERS "קילומטר מרובע" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "מטר רבוע" + IDS_AREA_SQUARE_MILES "מיילים מרובעים" + IDS_AREA_SQUARE_MILLIMETERS "מילימטרים מרובעים" + IDS_AREA_SQUARE_SHAKU "Square shaku" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Tsubo" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "קילומטר/ליטר" + IDS_CONSUMPTION_L_PER_100_KM "ליטרים/קילומטרים" + IDS_CONSUMPTION_MILES_GALLON_UK "מיילים/גלונים (בריטניה)" + IDS_CONSUMPTION_MILES_GALLON_US "מיילים/גלונים (ארצות הברית)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "שילינג אוסטרי" + IDS_CURRENCY_BELGIAN_FRANC "פרנק בלגי" + IDS_CURRENCY_CYPRIOT_POUND "לירה קפריסאית" + IDS_CURRENCY_CZECH_KORUNA "קורונה צ'כי" + IDS_CURRENCY_DEUTSCHE_MARK "מארק גרמני" + IDS_CURRENCY_DUTCH_GUILDER "גילדר הולנדי" + IDS_CURRENCY_EURO "אירו" + IDS_CURRENCY_FINNISH_MARKKA "מארקה פינית" + IDS_CURRENCY_FRENCH_FRANC "פרנק צרפתי" + IDS_CURRENCY_GREEK_DRACHMA "דרכמה יוונית" + IDS_CURRENCY_IRISH_POUND "לירה אירית" + IDS_CURRENCY_ITALIAN_LIRA "לירה איטלקית" + IDS_CURRENCY_LUXEMBOURG_FRANC "פרנק לוקסמבורגי" + IDS_CURRENCY_MALTESE_LIRA "לירה מלטזי" + IDS_CURRENCY_PORTOGUESE_ESCUDO "אסקודו פורטגלי" + IDS_CURRENCY_SLOVAK_KORUNA "קורונה סלובקית" + IDS_CURRENCY_SLOVENIAN_TOLAR "טולר סלובני" + IDS_CURRENCY_SPANISH_PESETA "פזטה ספרדית" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 °C calories" + IDS_ENERGY_BTUS "British Thermal Units" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "Ångströms" + IDS_LENGTH_ASTRONOMICAL_UNITS "יחידות אסטרונומיות" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "סנטימטרים" + IDS_LENGTH_CHAINS_UK "Chains (UK)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Fathoms" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" + IDS_LENGTH_FEET "רגל" + IDS_LENGTH_FURLONGS "Furlongs" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "אינצ'ים" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "קילומטרים" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "שנות אור" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "מטרים" + IDS_LENGTH_MICRONS "מיקרונים" + IDS_LENGTH_MILES "מיילים" + IDS_LENGTH_MILLIMETERS "מילימטרים" + IDS_LENGTH_NAUTICAL_MILES "מייל ימי" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "פרסק" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "Ri (Japan)" + IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RODS "Rods" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Shaku" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "Sun" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "יארד" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "British Thermal Units per minute" + IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" + IDS_POWER_HORSEPOWER "כוח סוס" + IDS_POWER_KILOWATTS "קילוואט" + IDS_POWER_MEGAWATTS "מגהוואט" + IDS_POWER_WATTS "וואט" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "אטמוספירות" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_HECTOPASCALS "Hectopascals" + IDS_PRESSURE_KILOPASCALS "Kilopascals" + IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PSI "Pounds-force per square inch" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "צלזיוס" + IDS_TEMPERATURE_FAHRENHEIT "פרנהייט" + IDS_TEMPERATURE_KELVIN "קלוין" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "ימים" + IDS_TIME_HOURS "שעות" + IDS_TIME_NANOSECONDS "ננושניות" + IDS_TIME_MICROSECONDS "מיקרושניות" + IDS_TIME_MILLISECONDS "מילישניות" + IDS_TIME_MINUTES "דקות" + IDS_TIME_SECONDS "שניות" + IDS_TIME_WEEKS "שבועות" + IDS_TIME_YEARS "שנים" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "סנטימטר/שעה" + IDS_VELOCITY_FEET_HOUR "רגל/שעה" + IDS_VELOCITY_FEET_SECOND "רגל/שניה" + IDS_VELOCITY_KILOMETERS_HOUR "קילומטר/שעה" + IDS_VELOCITY_KNOTS "קשר" + IDS_VELOCITY_MACH "מאך" + IDS_VELOCITY_METERS_SECOND "מטרים/שניה" + IDS_VELOCITY_MILES_HOUR "מיילים/שעה" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "חביות (בריטניה)" + IDS_VOLUME_BARRELS_OIL "חביות נפט" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "Bushels (UK)" + IDS_VOLUME_BUSHELS_US "Bushels (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "סנטימטר מעוקב" + IDS_VOLUME_CUBIC_FEET "רגל מעוקב" + IDS_VOLUME_CUBIC_INCHES "אינצ' מעוקב" + IDS_VOLUME_CUBIC_METERS "מטר מעוקב" + IDS_VOLUME_CUBIC_YARDS "יארד מעוקב" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" + IDS_VOLUME_GALLONS_UK "גלונים (בריטניה)" + IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "ליטרים" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "מיליליטרים" + IDS_VOLUME_PINTS_UK "Pints (UK)" + IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" + IDS_VOLUME_QUARTS_UK "Quarts (UK)" + IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "גרם" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin (China)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "קילוגרם" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang (China)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Ounces, troy" + IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "טונות" + IDS_WEIGHT_TONS_UK "טון (ארצות הברית)" + IDS_WEIGHT_TONS_US "טון (בריטניה)" +END diff --git a/reactos/base/applications/calc/resource.rc b/reactos/base/applications/calc/resource.rc index 2e7390e5ff5..ae7b1ea73e3 100644 --- a/reactos/base/applications/calc/resource.rc +++ b/reactos/base/applications/calc/resource.rc @@ -66,6 +66,9 @@ IDB_BITMAP_ROS BITMAP DISCARDABLE "res/ROS_logo.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/charmap/lang/he-IL.rc b/reactos/base/applications/charmap/lang/he-IL.rc new file mode 100644 index 00000000000..6edb893e679 --- /dev/null +++ b/reactos/base/applications/charmap/lang/he-IL.rc @@ -0,0 +1,50 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 292, 224 +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE +BEGIN + LTEXT "גופן", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "עזרה", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "תווים להעתקה:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "בחר", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "העתק", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + CONTROL "תצוגה מתקדמת",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 +END + +IDD_ADVANCED DIALOGEX 0, 0, 292, 64 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ערכת תווים:",IDC_STATIC,8,8,48,8 + COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "קבץ לפי:",IDC_STATIC,8,28,50,8 + COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "חפש",IDC_BUTTON_SEARCH,200,44,50,14 + EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL + LTEXT "חפש את:",IDC_STATIC,8,48,42,8 + LTEXT "מעבר ל-Unicode:",IDC_STATIC,200,8,30,8 + EDITTEXT IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "אודות מפת תווים" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_ABOUT "&אודות..." + IDS_TITLE "מפת תווים" +END diff --git a/reactos/base/applications/charmap/rsrc.rc b/reactos/base/applications/charmap/rsrc.rc index 6310490610a..b0db75791be 100644 --- a/reactos/base/applications/charmap/rsrc.rc +++ b/reactos/base/applications/charmap/rsrc.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/base/applications/dxdiag/lang/he-IL.rc b/reactos/base/applications/dxdiag/lang/he-IL.rc new file mode 100644 index 00000000000..27d7088a718 --- /dev/null +++ b/reactos/base/applications/dxdiag/lang/he-IL.rc @@ -0,0 +1,227 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "כלי אבחון - ReactX" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "&עזרה", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&העמוד הבא", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&שמור את כל המידע...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&יציאה", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "כלי זה מדווח על מידע מפורט אודות הרכיבים ומנהלי ההתקנים של ReactX המותקנים במערכת שלך.", -1, 10, 10, 443, 17 + LTEXT "אם ידוע לך התחום שגורם לבעיה, לחץ על הכרטיסייה המתאימה לעיל. אחרת, באפשרותך להשתמש בלחצן ""העמוד הבא"" להלן, כיד לבקר בכל עמוד לפי סדר", -1, 10, 30, 443, 25 + GROUPBOX "מידע מערכת", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "תאריך/שעה נוכחיים:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "שם מחשב:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "מערכת הפעלה:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "שפה:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "יצרן המערכת:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "דגם המערכת:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "מעבד:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "זיכרון:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "קובץ החלפה:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "גרסת ReactX:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "התקן", -1, 10, 10, 250, 100 + RTEXT "שם:", -1, 20, 25, 70, 10 + RTEXT "יצרן:", -1, 20, 35, 70, 10 + RTEXT "סוג שבב:", -1, 20, 45, 70, 10 + RTEXT "סוג DAC:", -1, 20, 55, 70, 10 + RTEXT "זיכרון כולל בקירוב:", -1, 20, 65, 70, 10 + RTEXT "מצב תצוגה נוכחי:", -1, 20, 75, 70, 10 + RTEXT "צג:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "מנהלי התקנים", -1, 270, 10, 190, 100 + RTEXT "מנהל התקן ראשי:", -1, 275, 25, 55, 10 + RTEXT "גרסה:", -1, 275, 35, 55, 10 + RTEXT "תאריך", -1, 275, 45, 55, 10 + RTEXT "סימול WHQL:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "גירסת DD:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "תכונות ReactX", -1, 10, 115, 450, 60 + RTEXT "תאוצת DirectDraw:", -1, 15, 130, 110, 12 + RTEXT "תאוצת Direct3D:", -1, 15, 145, 110, 12 + RTEXT "תאוצת AGP Texture:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "אפשר", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "אפשר", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "אפשר", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "בדיקת DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "בדיקת Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14 + + GROUPBOX "הערות", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "התקן", -1, 10, 10, 250, 100 + RTEXT "שם:", -1, 20, 25, 70, 10 + RTEXT "מזהה חומרה:", -1, 20, 35, 70, 10 + RTEXT "מזהה יצרן:", -1, 20, 45, 70, 10 + RTEXT "מזהה מוצר:", -1, 20, 55, 70, 10 + RTEXT "סוג:", -1, 20, 65, 70, 10 + RTEXT "התקן ברירת מחדל:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "מנהלי התקנים", -1, 270, 10, 190, 100 + RTEXT "שם:", -1, 275, 25, 55, 10 + RTEXT "גרסה:", -1, 275, 35, 55, 10 + RTEXT "תאריך:", -1, 275, 45, 55, 10 + RTEXT "סימול WHQL:", -1, 275, 55, 55, 10 + RTEXT "קבצים אחרים:", -1, 275, 65, 55, 10 + RTEXT "ספק:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "תכונות ReactX", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "רמת תאוצת קול של חומרה:", -1, 20, 135, 90, 20 + PUSHBUTTON "בדוק DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "הערות", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "התקני DirectInput", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "התקני קלט", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "הערות", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ספקי שירות רשומים של DirectPlay", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "כלי אבחון ReactX" + IDS_SYSTEM_DIALOG "מערכת" + IDS_DISPLAY_DIALOG "תצוגה" + IDS_SOUND_DIALOG "צליל" + IDS_MUSIC_DIALOG "מוזיקה" + IDS_INPUT_DIALOG "קלט" + IDS_NETWORK_DIALOG "רשת" + IDS_HELP_DIALOG "עזרה" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB בשימוש, %I64u MB זמין" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "גרסה לא ידועה" + IDS_DEVICE_STATUS_ATTACHED "מחובר" + IDS_DEVICE_STATUS_MISSING "מנותק" + IDS_DEVICE_STATUS_UNKNOWN "לא ידוע" + IDS_DEVICE_NAME "שם התקן" + IDS_DEVICE_STATUS "מצב" + IDS_DEVICE_CONTROLLER "מזהה בקר" + IDS_DEVICE_MANUFACTURER "מזהה ספק" + IDS_DEVICE_PRODUCT "מזהה מוצר" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback מנהל התקן" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "כן" + IDS_DIRECTPLAY_COL_NAME1 "שם" + IDS_DIRECTPLAY_COL_NAME2 "רשום" + IDS_DIRECTPLAY_COL_NAME3 "קובץ" + IDS_DIRECTPLAY_COL_NAME4 "גרסה" + IDS_DIRECTPLAY8_MODEMSP "ספק שירות מודם של DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "ספק שירות חיבור טורי של DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "ספק שירות IPX של DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "ספק שירות TCP/IP של DirectPlay8" + IDS_DIRECTPLAY_TCPCONN "חיבור רשת TCP/IP עבור DirectPlay" + IDS_DIRECTPLAY_IPXCONN "חיבור IPX עבור DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "חיבור מודם עבור DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "חיבור טורי עבור DirectPlay" + IDS_REG_SUCCESS "אישור" + IDS_REG_FAIL "שגיאה" + IDS_DDTEST_ERROR "הבדיקה נכשלה!" + IDS_DDTEST_DESCRIPTION "פעולה זו תבדוק את DirectDraw בהתקן זה. האם להמשיך?" + IDS_DDPRIMARY_DESCRIPTION "הבדיקה הבאה תשתמש ב- DirectDraw כדי לצייר על המשטח הראשי במצב רגיל (לא מסך מלא). אתה אמור לראשות מלבנים שחורים ולבנים על המסך." + IDS_DDPRIMARY_RESULT "האם ראית מלבנים שחורים ולבנים לחילופין על המסך?" + IDS_DDOFFSCREEN_DESCRIPTION "הבדיקה הבאה תשתמש ב- DirectDraw כדי לצייר על המשטח מחוץ למסך במצב רגיל (לא מסך מלא). אתה אמור לראות תיבה לבנה קופצת." + IDS_DDOFFSCREEN_RESULT "האם ראית תיבה לבנה קופצת?" + IDS_DDFULLSCREEN_DESCRIPTION "הבדיקה הבאה תשתמש ב- DirectDraw כדי לצייר במצב מסך מלא. אתה אמור לראות תיבה לבנה קופצת." + IDS_DDFULLSCREEN_RESULT "האם ראית תיבה לבנה קופצת במסך מלא?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_OPTION_NO "לא" + IDS_D3DTEST_DESCRIPTION "פעולה זו תבדוק Direct3D בהתקן זה. האם להמשיך?" + IDS_D3DTEST_D3Dx "בדיקה זו תשתמש בממשקי Direct3D %u המואצים באמצעות חומרה." +END diff --git a/reactos/base/applications/dxdiag/rsrc.rc b/reactos/base/applications/dxdiag/rsrc.rc index e4df715a40b..bb5f17f179c 100644 --- a/reactos/base/applications/dxdiag/rsrc.rc +++ b/reactos/base/applications/dxdiag/rsrc.rc @@ -1,5 +1,6 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -18,6 +19,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif diff --git a/reactos/base/applications/fontview/fontview.rc b/reactos/base/applications/fontview/fontview.rc index 2440b4780e9..d358c89ba15 100644 --- a/reactos/base/applications/fontview/fontview.rc +++ b/reactos/base/applications/fontview/fontview.rc @@ -19,6 +19,7 @@ END // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -34,6 +35,9 @@ END #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_LT_LT #include "lang/lt-LT.rc" #endif diff --git a/reactos/base/applications/fontview/lang/he-IL.rc b/reactos/base/applications/fontview/lang/he-IL.rc new file mode 100644 index 00000000000..3130ac81d65 --- /dev/null +++ b/reactos/base/applications/fontview/lang/he-IL.rc @@ -0,0 +1,14 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INSTALL, "התקן" + IDS_PRINT, "הדפס" + IDS_STRING, "דג סקרן שט לו בים זך אך לפתע פגש חבורה נחמדה שצצה כך. 1234567890" + IDS_OPEN, "פתח גופן..." + IDS_ERROR, "שגיאה" + IDS_ERROR_NOMEM, "אין מספיק זיכרון כדי להשלים את הפעולה." + IDS_ERROR_NOFONT, "הקובץ %1 אינו קובץ גופנים חוקי." + IDS_ERROR_NOCLASS, "Could not initialize window class." +END diff --git a/reactos/base/applications/games/solitaire/lang/he-IL.rc b/reactos/base/applications/games/solitaire/lang/he-IL.rc new file mode 100644 index 00000000000..7e4573e970c --- /dev/null +++ b/reactos/base/applications/games/solitaire/lang/he-IL.rc @@ -0,0 +1,93 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/he-IL.rc + * PURPOSE: Hebrew Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de) + * TRANSLATOR: Baruch Rutman + */ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "אפשרויות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "משיכה", -1, 7, 7, 90, 40 + AUTORADIOBUTTON "משוך &אחד", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "משוך &שלושה", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + + AUTOCHECKBOX "משחק קצוב בזמן", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "שורת מצב", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "אישור", IDOK, 35, 97, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 +CAPTION "בחירת גב הקלפים" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "אישור", IDOK, 66, 84, 54, 13 + PUSHBUTTON "ביטול", IDCANCEL, 126, 84, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "סוליטייר" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "להפסיק את המשחק הנוכחי?" + IDS_SOL_WIN "כל הכבוד, ניצחת!" + IDS_SOL_DEAL "לחלק שוב?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&משחק" + BEGIN + MENUITEM "&חלק\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "ח&פיסה...", IDM_GAME_DECK + MENUITEM "&אפשרויות", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&יציאה", IDM_GAME_EXIT + END + POPUP "&עזרה" + BEGIN + MENUITEM "&תוכן העניינים\tF1", IDM_HELP_CONTENTS + MENUITEM "&אודות", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/reactos/base/applications/games/solitaire/rsrc.rc b/reactos/base/applications/games/solitaire/rsrc.rc index e28832fd5ec..054b51bd5b2 100644 --- a/reactos/base/applications/games/solitaire/rsrc.rc +++ b/reactos/base/applications/games/solitaire/rsrc.rc @@ -34,6 +34,9 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/games/spider/lang/he-IL.rc b/reactos/base/applications/games/spider/lang/he-IL.rc new file mode 100644 index 00000000000..41962a02a31 --- /dev/null +++ b/reactos/base/applications/games/spider/lang/he-IL.rc @@ -0,0 +1,86 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/he-IL.rc + * PURPOSE: Hebrew Language File for Spider Solitaire + * TRANSLATOR: Baruch Rutman + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 186, 104 +CAPTION "בחר חפיסה" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32 + DEFPUSHBUTTON "אישור", IDOK, 66, 84, 54, 13 + PUSHBUTTON "ביטול", IDCANCEL, 126, 84, 54, 13 +END + +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "רמת קושי" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "קל: סדרה אחת", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "בינוני: שתי סדרות", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "קשה: ארבע סדרות", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + + DEFPUSHBUTTON "אישור", IDOK, 8, 58, 40, 14 + PUSHBUTTON "ביטול", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "עכביש" + IDS_SPI_ABOUT "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_QUIT "להפסיק את המשחק הנוכחי?" + IDS_SPI_WIN "כל הכבוד, ניצחת!" + IDS_SPI_DEAL "לחלק שוב?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&משחק" + BEGIN + MENUITEM "משחק &חדש\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "ח&פיסה...", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "י&ציאה", IDM_GAME_EXIT + END + POPUP "&עזרה" + BEGIN + MENUITEM "&תוכן\tF1", IDM_HELP_CONTENTS + MENUITEM "&אודות", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/reactos/base/applications/games/spider/rsrc.rc b/reactos/base/applications/games/spider/rsrc.rc index 3e390a231c2..7dd6f343af3 100644 --- a/reactos/base/applications/games/spider/rsrc.rc +++ b/reactos/base/applications/games/spider/rsrc.rc @@ -22,6 +22,9 @@ IDI_SPIDER ICON DISCARDABLE "spider.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/games/winmine/lang/he-IL.rc b/reactos/base/applications/games/winmine/lang/he-IL.rc new file mode 100644 index 00000000000..4ad084872f3 --- /dev/null +++ b/reactos/base/applications/games/winmine/lang/he-IL.rc @@ -0,0 +1,94 @@ +/* + * WineMine + * Hebrew Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * + * Translated by Baruch Rutman (peterooch) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE BEGIN + IDS_APPNAME, "WineMine" + IDS_NOBODY, "אף אחד" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" +END + +MENU_WINEMINE MENU +BEGIN + POPUP "&אפשרויות" BEGIN + MENUITEM "&חדש\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ // to be invented + MENUITEM SEPARATOR + MENUITEM "&מתחיל", IDM_BEGINNER + MENUITEM "מ&תקדם", IDM_ADVANCED + MENUITEM "מומ&חה", IDM_EXPERT + MENUITEM "מותא&ם...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "י&ציאה\tAlt-X", IDM_EXIT + END + POPUP "מי&דע" BEGIN + MENUITEM "ה&כי מהירים...", IDM_TIMES + MENUITEM "אודו&ת", IDM_ABOUT + END +END + +DLG_TIMES DIALOGEX 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "שיאני שולה המוקשים" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "הכי מהירים", -1, 10, 10, 140, 45 + LTEXT "מתחיל", -1, 20, 20, 40, 8 + LTEXT "מתקדם", -1, 20, 30, 40, 8 + LTEXT "מומחה", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "אישור", IDOK, 55, 60, 50, 15 +END + +DLG_CONGRATS DIALOGEX 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "כל הכבוד!" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "הקש את שמך", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "אישור", IDOK, 60, 40, 40, 15 +END + +DLG_CUSTOM DIALOGEX 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "משחק מותאם" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "גובה", -1, 5, 5, 30, 10 + LTEXT "רוחב", -1, 5, 35, 30, 10 + LTEXT "מוקשים", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "אישור", IDOK, 40, 30, 50, 15 + PUSHBUTTON "ביטול", IDCANCEL, 40, 50, 50, 15 +END diff --git a/reactos/base/applications/games/winmine/rsrc.rc b/reactos/base/applications/games/winmine/rsrc.rc index 3a0cdec0a0d..501f8e5fc0c 100644 --- a/reactos/base/applications/games/winmine/rsrc.rc +++ b/reactos/base/applications/games/winmine/rsrc.rc @@ -44,6 +44,7 @@ MINES BITMAP rc/mines.bmp /* include localised resources */ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -68,6 +69,9 @@ MINES BITMAP rc/mines.bmp #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/kbswitch/lang/he-IL.rc b/reactos/base/applications/kbswitch/lang/he-IL.rc new file mode 100644 index 00000000000..e523fcd1dc7 --- /dev/null +++ b/reactos/base/applications/kbswitch/lang/he-IL.rc @@ -0,0 +1,11 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&העדפות...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "&יציאה", ID_EXIT + END +END diff --git a/reactos/base/applications/kbswitch/rsrc.rc b/reactos/base/applications/kbswitch/rsrc.rc index 7c9af0ad1b7..fa5a261ff71 100644 --- a/reactos/base/applications/kbswitch/rsrc.rc +++ b/reactos/base/applications/kbswitch/rsrc.rc @@ -1,5 +1,6 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -18,6 +19,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/magnify/lang/he-IL.rc b/reactos/base/applications/magnify/lang/he-IL.rc new file mode 100644 index 00000000000..35df35d588a --- /dev/null +++ b/reactos/base/applications/magnify/lang/he-IL.rc @@ -0,0 +1,65 @@ +// Translate by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&יציאה", IDM_EXIT + MENUITEM "&אפשרויות", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "או&דות", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "אודות" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "זכוכית מגדלת גרסה 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "אישור",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות זכוכית מגדלת" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "יציאה",IDOK,96,161,50,14 + PUSHBUTTON "עזרה",IDC_BUTTON_HELP,38,161,50,14 + LTEXT "רמת הגדלה:",IDC_STATIC,6,8,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "מעקב",IDC_STATIC,7,25,139,59 + GROUPBOX "תצוגה",IDC_STATIC,7,87,139,57 + CONTROL "עקוב אחר סמן העכבר",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "עקוב אחר מוקד לוח מקשים",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "עקוב אחר עריכת טקסט",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "הפוך צבעים",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "הפעל ממוזער",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "הראה זכוכית מגדלת",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "זכוכית מגדלת של ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "אישור",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "זכוכית המגדלת מיועדת לספק רמת שימושיות מינימלית עבור משתמשים בעלי ליוקיי ראייה קלים. מרבית המשתמשים עם ליקויי ראייה יזדקקו לתוכנית שירות בעלת שימושיות גבוהה יותר לשימוש יומיומי.",IDC_STATIC,36,7,207,33 + CONTROL "אל תראה הודעה זו שוב",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "זכוכית מגדלת" +END diff --git a/reactos/base/applications/magnify/rsrc.rc b/reactos/base/applications/magnify/rsrc.rc index 3f6fc51608c..ae68d0a985b 100644 --- a/reactos/base/applications/magnify/rsrc.rc +++ b/reactos/base/applications/magnify/rsrc.rc @@ -3,6 +3,7 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -18,6 +19,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/mmc/lang/he-IL.rc b/reactos/base/applications/mmc/lang/he-IL.rc new file mode 100644 index 00000000000..588dde9530a --- /dev/null +++ b/reactos/base/applications/mmc/lang/he-IL.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&יציאה\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&עזרה" + BEGIN + MENUITEM "&אודות ReactOS Management Console...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Management Console" + IDS_CONSOLETITLE "Console%1!u!" +END diff --git a/reactos/base/applications/mmc/rsrc.rc b/reactos/base/applications/mmc/rsrc.rc index e75272df2e1..4025359c64a 100644 --- a/reactos/base/applications/mmc/rsrc.rc +++ b/reactos/base/applications/mmc/rsrc.rc @@ -3,6 +3,7 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -27,6 +28,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/mplay32/lang/he-IL.rc b/reactos/base/applications/mplay32/lang/he-IL.rc new file mode 100644 index 00000000000..df8440e8166 --- /dev/null +++ b/reactos/base/applications/mplay32/lang/he-IL.rc @@ -0,0 +1,30 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&פתח...", IDM_OPEN_FILE + MENUITEM "&סגור", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "&יציאה", IDM_EXIT + END + POPUP "&עזרה" + BEGIN + MENUITEM "&אודות", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "כל הקבצים הנתמכים (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "נגן" + IDS_TOOLTIP_STOP "עצור" + IDS_TOOLTIP_EJECT "הוצא" + IDS_TOOLTIP_BACKWARD "דלג אחורנית" + IDS_TOOLTIP_SEEKBACK "חפש אחורנית" + IDS_TOOLTIP_SEEKFORW "חפש קדימה" + IDS_TOOLTIP_FORWARD "דלג קדימה" + IDS_APPTITLE "נגן המולטימדיה של ReactOS" + IDS_PLAY "נגן" +END diff --git a/reactos/base/applications/mplay32/rsrc.rc b/reactos/base/applications/mplay32/rsrc.rc index 1990e71c77d..ecfcb5cad6a 100644 --- a/reactos/base/applications/mplay32/rsrc.rc +++ b/reactos/base/applications/mplay32/rsrc.rc @@ -21,6 +21,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/msconfig/lang/he-IL.rc b/reactos/base/applications/msconfig/lang/he-IL.rc new file mode 100644 index 00000000000..7e9977dbf69 --- /dev/null +++ b/reactos/base/applications/msconfig/lang/he-IL.rc @@ -0,0 +1,175 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "כלי שירות לקביעת תצורת המערכת" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "אישור", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&עזרה", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "החל", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "הפעל הכל",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "בטל הכל",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_SYSTEM_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 + PUSHBUTTON "הזז למעלה", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "הזז למטה", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "הפעל", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "בטל", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "חפש", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&חדש", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "&ערוך", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "הפעל הכל", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "בטל הכל",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&פתח", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "הפעל הכל",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "בטל הכל",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "בחירת אתחול", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "אתחול רגיל - טען את כל מנהלי ההתקנים והשירותים", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "אתחול מאבחן - טען התקנים ושירותים בסיסיים בלבד", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "אתחול סלקטיבי", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + AUTOCHECKBOX "עבד את הקובץ SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&טען שירותי מערכת", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "טען פריטי אתחול", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&בדוק את כל נתיבי האתחול", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&קבע כברירת מחדל", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "הזז למעלה", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "הזז למטה", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "אפשרויות אתחול", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "&אפשרויות מתקדמות", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "זמן קצוב:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "שניות", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "אישור", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "ביטול", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "כלי שירות לקביעת תצורת המערכת" + IDS_TAB_GENERAL "כללי" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "שירותים" + IDS_TAB_STARTUP "אתחול" + IDS_TAB_TOOLS "כלים" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "שירות" + IDS_SERVICES_COLUMN_REQ "בסיסי" + IDS_SERVICES_COLUMN_VENDOR "יצרן" + IDS_SERVICES_COLUMN_STATUS "מצב" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "שם כלי" + IDS_TOOLS_COLUMN_DESCR "תיאור" + + IDS_TOOLS_CMD_NAME "שורת הפקודה" + IDS_TOOLS_CMD_DESCR "פותח חלון שורת פקודה" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "אודות ReactOS" + IDS_TOOLS_INFO_DESCR "מציג את גירסת ReactOS המותקנת כעת במערכת" + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "עורך הרישום" + IDS_TOOLS_REGEDIT_DESCR "בצע שינויים ברשום של ReactOS." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "מאפייני המערכת" + IDS_TOOLS_SYSDM_DESCR "הצג מידע בסיסי אודות הגדרות המערכת של המחשב שלך." + IDS_TOOLS_SYSDM_CMD "control.exe" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" // what? + IDS_STARTUP_COLUMN_CMD "פקודה" + IDS_STARTUP_COLUMN_PATH "נתיב" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "מופעל" + IDS_SERVICES_STATUS_STOPPED "נעצר" + IDS_SERVICES_YES "כן" + IDS_SERVICES_UNKNOWN "לא ידוע" +END diff --git a/reactos/base/applications/msconfig/rsrc.rc b/reactos/base/applications/msconfig/rsrc.rc index 013c3093ebd..96ea0cadf37 100644 --- a/reactos/base/applications/msconfig/rsrc.rc +++ b/reactos/base/applications/msconfig/rsrc.rc @@ -32,6 +32,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc b/reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc new file mode 100644 index 00000000000..2b4cd6fd066 --- /dev/null +++ b/reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc @@ -0,0 +1,84 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&יציאה", IDC_EXIT + END + POPUP "פעולה" + BEGIN + MENUITEM "הדפס", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "מאפיינים", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "עזרה", IDC_PROGHELP, GRAYED + END + POPUP "תצוגה" + BEGIN + MENUITEM "התקנים לפי סוג", IDC_DEVBYTYPE + MENUITEM "התקנים לפי חיבור", IDC_DEVBYCONN + MENUITEM "משאבים לפי סוג", IDC_RESBYTYPE, GRAYED + MENUITEM "משאבים לפי חיבור", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "הראה התקנים מוסתרים", IDC_SHOWHIDDEN + END + POPUP "עזרה" + BEGIN + MENUITEM "עזרה", IDC_PROGHELP + MENUITEM "אודות", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "מאפיינים", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "עזרה", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "אודות מנהל ההתקנים" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "מאפיינים" + IDS_TOOLTIP_REFRESH "רענן" + IDS_TOOLTIP_HELP "עזרה" + IDS_TOOLTIP_EXIT "יציאה" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "מנהל ההתקנים של ReactOS" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " סוגר את התכנית." + IDS_HINT_REFRESH " מרענן את רשימת השירותים." + IDS_HINT_PROP " Open property sheet for the current selection." + IDS_HINT_HELP " מראה חלון עזרה." + IDS_HINT_ABOUT " אודות מנהל ההתקנים של ReactOS" + + IDS_HINT_SYS_RESTORE " מחזיר את החלון לגודלו הרגיל" + IDS_HINT_SYS_MOVE " מזיז חלון זה" + IDS_HINT_SYS_SIZE " משנה גודל חלון זה" + IDS_HINT_SYS_MINIMIZE " מוריד חלון זה לסמל" + IDS_HINT_SYS_MAXIMIZE " מרחיב את החלון לכל המסך." + IDS_HINT_SYS_CLOSE " סוגר חלון זה." +END diff --git a/reactos/base/applications/mscutils/devmgmt/rsrc.rc b/reactos/base/applications/mscutils/devmgmt/rsrc.rc index b37b99c512a..d4d805d8fa2 100644 --- a/reactos/base/applications/mscutils/devmgmt/rsrc.rc +++ b/reactos/base/applications/mscutils/devmgmt/rsrc.rc @@ -35,6 +35,9 @@ IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc new file mode 100644 index 00000000000..a3b86066b8e --- /dev/null +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc @@ -0,0 +1,77 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&יציאה", IDC_EXIT + END + POPUP "פעולות" + BEGIN + MENUITEM "הדפס", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "מאפיינים", IDC_PROP, GRAYED + END + POPUP "תצוגה" + BEGIN + MENUITEM "התקנים לפי סוג", IDC_DEVBYTYPE, CHECKED + MENUITEM "התקנים לפי חיבור", IDC_STATIC, GRAYED + MENUITEM "משאבים לפי סוג", IDC_STATIC, GRAYED + MENUITEM "משאבים לפי חיבור", IDC_STATIC, GRAYED + END + POPUP "עזרה" + BEGIN + MENUITEM "אודות", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "מאפיינים", IDC_PROP, GRAYED + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "אודות מנהל ההתקנים" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "מאפיינים" + IDS_TOOLTIP_REFRESH "רענן" + IDS_TOOLTIP_HELP "עזרה" + IDS_TOOLTIP_EXIT "יציאה" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "מנהל ההתקנים של ReactOS" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " Exits the program." + IDS_HINT_REFRESH " Refresh the service list." + IDS_HINT_PROP " Open property sheet for the current selection." + IDS_HINT_HELP " Display help window." + IDS_HINT_ABOUT " אודות מנהל ההתקנים של ReactOS" + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END diff --git a/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc b/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc index b94037f9473..5befae90424 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc @@ -57,6 +57,10 @@ IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" // UTF-8 #pragma code_page(65001) + +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc b/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc new file mode 100644 index 00000000000..60bc09dfbdc --- /dev/null +++ b/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/he-IL.rc + * PURPOSE: Hebrew Language File for ReactOS Event Viewer + * TRANSLATORS: Baruch Rutman + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "מציג האירועים (מקומי)" + BEGIN + MENUITEM "יישום", ID_LOG_APPLICATION + MENUITEM "אבטחה", ID_LOG_SECURITY + MENUITEM "מערכת", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "יציאה", IDM_EXIT + END + POPUP "תצוגה" + BEGIN + MENUITEM "רענן", IDM_REFRESH + END + MENUITEM "אפשרויות", ID_OPTIONS + POPUP "עזרה" + BEGIN + MENUITEM "עזרה", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "אודות...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "אודות" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "מציג האירועים של ReactOS גרסה 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "אישור",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER +CAPTION "חכה.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CTEXT "טוען יומני אירועים. נא לחכות...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "מאפייני אירוע" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "סגור",IDOK,12,258,50,14 + PUSHBUTTON "הקודם",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "הבא",IDNEXT,144,258,50,14 + PUSHBUTTON "עזרה",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "תיאור",IDC_STATIC,15,70,39,8 + LTEXT "תאריך:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "זמן:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "משתמש:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "מחשב:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "מזהה אירוע:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "מקור:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "סוג:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "קטגוריה:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "נתונים:",IDC_STATIC,14,194,20,8 + CONTROL "בתים",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "מילים",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "יומן האירועים" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTLOG_ERROR_TYPE "שגיאה" + IDS_EVENTLOG_WARNING_TYPE "אזהרה" + IDS_EVENTLOG_INFORMATION_TYPE "מידע" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDS_EVENTLOG_SUCCESS "הצלחה" + IDS_EVENTLOG_UNKNOWN_TYPE "אירוע לא ידוע" +END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "סוג" + IDS_COLUMNDATE "תאריך" + IDS_COLUMNTIME "זמן" + IDS_COLUMNSOURCE "מקור" + IDS_COLUMNCATEGORY "קטגוריה" + IDS_COLUMNEVENT "אירוע" + IDS_COLUMNUSER "משתמש" + IDS_COLUMNCOMPUTER "מחשב" + IDS_COLUMNEVENTDATA "מידע יומן" +END + +STRINGTABLE +BEGIN + IDS_NONE "ללא" + IDS_NOT_AVAILABLE "לא זמין" +END diff --git a/reactos/base/applications/mscutils/eventvwr/rsrc.rc b/reactos/base/applications/mscutils/eventvwr/rsrc.rc index a9bfb92eaf9..2902327ed35 100644 --- a/reactos/base/applications/mscutils/eventvwr/rsrc.rc +++ b/reactos/base/applications/mscutils/eventvwr/rsrc.rc @@ -29,6 +29,9 @@ IDI_ERRORICON ICON "res/error.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/mscutils/servman/lang/he-IL.rc b/reactos/base/applications/mscutils/servman/lang/he-IL.rc new file mode 100644 index 00000000000..9dc7d24cb7d --- /dev/null +++ b/reactos/base/applications/mscutils/servman/lang/he-IL.rc @@ -0,0 +1,282 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "קובץ" + BEGIN + MENUITEM "יצוא...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "יציאה", ID_EXIT + END + POPUP "פעולה" + BEGIN + MENUITEM "התקשרות למחשב אחר...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "הפעל", ID_START, GRAYED + MENUITEM "הפסק", ID_STOP, GRAYED + MENUITEM "השהה", ID_PAUSE, GRAYED + MENUITEM "חדש", ID_RESUME, GRAYED + MENUITEM "הפעל מחדש", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "רענן", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "עריכה...", ID_EDIT, GRAYED + MENUITEM "יצירה...", ID_CREATE, GRAYED + MENUITEM "מחיקה...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "מאפיינים", ID_PROP, GRAYED + END + POPUP "תצוגה" + BEGIN + MENUITEM "סמלים גדולים", ID_VIEW_LARGE + MENUITEM "סמלים קטנים", ID_VIEW_SMALL + MENUITEM "רשימה", ID_VIEW_LIST + MENUITEM "פרטים", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "התאמה אישית...",ID_VIEW_CUST, GRAYED + END + POPUP "עזרה" + BEGIN + MENUITEM "עזרה", ID_HELP + MENUITEM "אודות", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "הפעל", ID_START, GRAYED + MENUITEM "הפסק", ID_STOP, GRAYED + MENUITEM "השהה", ID_PAUSE, GRAYED + MENUITEM "חדש", ID_RESUME, GRAYED + MENUITEM "הפעל מחדש", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "רענן", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "עריכה...", ID_EDIT, GRAYED + MENUITEM "מחיקה...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "מאפיינים...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "עזרה...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "אודות מנהל השירותים" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 135, 30 + PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "כללי" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "הפעל", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "הפסק", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "השהה", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "חדש", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "שם שירות:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "שם תצוגה:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "תיאור:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "נתיב אל קובץ הפעלה:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "סוג הפעלה:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "מצב שירות:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "באפשרותך לציין את פרמטרי ההפעלה שיחולו בעת הפעל השירות מכאן.",IDC_STATIC, 6,177,240,15 + LTEXT "פרמטרי הפעלה:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "עריכה", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "יחסי תלות" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67 + LTEXT "שירותים מסוימים תלויים בשירותים אחרים, במנהלים של התקנים של המערכת ובקבוצות סדר טעינה. אם רכיב מערכת הופסק או שאינו פועל כראוי, ייתכן ששירותים התלויים בו יושפעו.", IDC_STATIC,8, 7, 238, 26 + LTEXT "שירות זה תלוי ברכיבי המערכת הבאים", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "צור שירות" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*שם שירות :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*שם תצוגה :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*נתיב לקובץ הפעלה :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "תיאור :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "אישור", IDOK, 126, 192, 44, 13 + PUSHBUTTON "ביטול", IDCANCEL, 176, 192, 46, 13 + LTEXT "אפשרויות נוספות (לחץ עזרה למידע נוסף)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "עזרה", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "מחק שירות" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Are you sure you want to delete the following service? This cannot be undone once removed!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "שם השירות:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "כן", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "לא", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Stop Other Services" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "Options" +FONT 8, "MS Shell Dlg",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "Service Control" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&Close", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Name" + IDS_SECONDCOLUMN "Description" + IDS_THIRDCOLUMN "Status" + IDS_FOURTHCOLUMN "Startup Type" + IDS_FITHCOLUMN "Log On As" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Started" + IDS_SERVICES_STOPPED "Stopped" + IDS_SERVICES_AUTO "Automatic" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Disabled" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Num Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Properties" + IDS_TOOLTIP_REFRESH "Refresh" + IDS_TOOLTIP_EXPORT "Export list" + IDS_TOOLTIP_CREATE "Create a new service" + IDS_TOOLTIP_DELETE "Deletes an existing service" + IDS_TOOLTIP_START "Start service" + IDS_TOOLTIP_STOP "Stop service" + IDS_TOOLTIP_PAUSE "Pause service" + IDS_TOOLTIP_RESTART "Restart service" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" + IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" + IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" + IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" + IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" + IDS_DELETE_STOP "You must manually stop the service before deleting!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= \r\n (default = own)\r\n start= \r\n (default = demand) \r\n error= \r\n (default = normal)\r\n group= \r\n tag= \r\n depend= \r\n obj= \r\n (default = LocalSystem)\r\n password= \r\n" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Exports the current list to a file." + IDS_HINT_EXIT " Exits the program." + + IDS_HINT_CONNECT " Manage a different computer." + IDS_HINT_START " Start the selected service." + IDS_HINT_STOP " Stop the selected service." + IDS_HINT_PAUSE " Pause the selected service." + IDS_HINT_RESUME " Resume the selected service." + IDS_HINT_RESTART " Stop and start the selected service." + IDS_HINT_REFRESH " Refresh the service list." + IDS_HINT_EDIT " Edit the properties of the selected service." + IDS_HINT_CREATE " Create a new service." + IDS_HINT_DELETE " Delete the selected service." + IDS_HINT_PROP " Open property sheet for the current selection." + + IDS_HINT_LARGE " Display items by using large icons." + IDS_HINT_SMALL " Display items by using small icons." + IDS_HINT_LIST " Display item in a list." + IDS_HINT_DETAILS " Display information about each item in a window." + IDS_HINT_CUST " Customizes the view." + + IDS_HINT_HELP " Display help window." + IDS_HINT_ABOUT " About ReactOS Service Manager." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END diff --git a/reactos/base/applications/mscutils/servman/rsrc.rc b/reactos/base/applications/mscutils/servman/rsrc.rc index 1381f99a87f..2a18ee445c0 100644 --- a/reactos/base/applications/mscutils/servman/rsrc.rc +++ b/reactos/base/applications/mscutils/servman/rsrc.rc @@ -40,6 +40,9 @@ IDI_DRIVER ICON "res/driver.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/base/applications/mspaint/lang/he-IL.rc b/reactos/base/applications/mspaint/lang/he-IL.rc new file mode 100644 index 00000000000..3aaa9181e63 --- /dev/null +++ b/reactos/base/applications/mspaint/lang/he-IL.rc @@ -0,0 +1,206 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: unknown (LGPL assumed) + * FILE: base/applications/mspaint/lang/he-IL.rc + * PURPOSE: Hebrew Language resource file + * TRANSLATORS: first times touched from en-US.rc file + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ID_MENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&חדש\tCtrl+N", IDM_FILENEW + MENUITEM "&פתח\tCtrl+O", IDM_FILEOPEN + MENUITEM "&שמור\tCtrl+S", IDM_FILESAVE + MENUITEM "שמור בש&ם...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "קבע כרקע שולחן העבודה (פרוש)", IDM_FILEASWALLPAPERPLANE + MENUITEM "קבע כרקע שולחן העבודה (מרכז)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "קבע כרקע שולחן העבודה (מלא)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "י&ציאה\tAlt+F4", IDM_FILEEXIT + END + + POPUP "&עריכה" + BEGIN + MENUITEM "בטל\tCtrl+Z", IDM_EDITUNDO + MENUITEM "בצע שוב\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "גזור\tCtrl+X", IDM_EDITCUT + MENUITEM "העתק\tCtrl+C", IDM_EDITCOPY + MENUITEM "הדבק\tCtrl+V", IDM_EDITPASTE + MENUITEM "מחק בחירה\tDel", IDM_EDITDELETESELECTION + MENUITEM "Invert selection", IDM_EDITINVERTSELECTION + MENUITEM "בחר הכל\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "העתק ל...", IDM_EDITCOPYTO + MENUITEM "הדבק מ...", IDM_EDITPASTEFROM + END + + POPUP "&תצוגה" + BEGIN + MENUITEM "ערכת כלים\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "ערכת צבעים\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Status bar", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Text Toolbar", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "Zoom" + BEGIN + POPUP "הגדרת משתמש" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "הראה רשת\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + END + MENUITEM "מסך מלא\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "ת&מונה" + BEGIN + MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "שנה גודל...\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "חתוך", IDM_IMAGECROP + MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "מחק תמונה\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "צביעה אטומה", IDM_IMAGEDRAWOPAQUE + END + + POPUP "&צבעים" + BEGIN + MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE + END + + POPUP "&?" + BEGIN + MENUITEM "נושאי עזרה", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "מידע", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^G", IDM_VIEWSHOWGRID + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "סובב והפוך את התמונה" +BEGIN + GROUPBOX "סובב או הפוך", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Mirror horizontally", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Mirror vertically", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "סובב בזווית", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "אישור", IDOK, 125, 8, 48, 14 + PUSHBUTTON "ביטול", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 225, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "תכונות" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 + LTEXT "רוחב:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "גובה:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "תאריך קובץ:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "גודל קובץ:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "גודל תמונה:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "לא זמין", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 + LTEXT "לא זמין", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 + LTEXT "לא זמין", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 + GROUPBOX "יחידות מדידה", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 + AUTORADIOBUTTON "אינצ'ים", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "סנטימטרים", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "פיקסלים", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + GROUPBOX "צבעים", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 + AUTORADIOBUTTON "שחור ולבן", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "צבעוני", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "אישור", IDOK, 170, 8, 48, 14 + PUSHBUTTON "ביטול", IDCANCEL, 170, 24, 48, 14 + PUSHBUTTON "ברירת מחדל", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 225, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "שינוי גודל" +BEGIN + GROUPBOX "שנה גודל", IDD_CHANGESIZEGROUP, 6, 6, 158, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 + LTEXT "אופקי", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 + LTEXT "מאוזן", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + DEFPUSHBUTTON "אישור", IDOK, 170, 8, 48, 14 + PUSHBUTTON "ביטול", IDCANCEL, 170, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "צייר" + IDS_WINDOWTITLE, "%s - צייר" + IDS_INFOTITLE, "צייר עבור ReactOS" + IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_SAVEPROMPTTEXT, "האם ברצונך לשמור את השינויים של %s?" + IDS_DEFAULTFILENAME, "ללא שם.bmp" + IDS_MINIATURETITLE, "Miniature" + IDS_TOOLTIP1, "בחירה חופשית" + IDS_TOOLTIP2, "Selection" + IDS_TOOLTIP3, "מחק" + IDS_TOOLTIP4, "מלא עם צבע" + IDS_TOOLTIP5, "Select color" + IDS_TOOLTIP6, "זכוכית מגדלת" + IDS_TOOLTIP7, "עפרון" + IDS_TOOLTIP8, "מברשת" + IDS_TOOLTIP9, "מברשת אוויר" + IDS_TOOLTIP10, "טקסט" + IDS_TOOLTIP11, "קו" + IDS_TOOLTIP12, "Bezier curve" + IDS_TOOLTIP13, "מרובע" + IDS_TOOLTIP14, "מצולע" + IDS_TOOLTIP15, "אליפסה" + IDS_TOOLTIP16, "מרובע עם קודקודים מרובעים" + IDS_OPENFILTER, "קבצי מפת סיביות (*.bmp;*.dib)\1*.bmp;*.dib\1All files (*.*)\1*.*\1" + IDS_SAVEFILTER, "קבצי מפת סיביות של 24 סיביות (*.bmp;*.dib)\1*.bmp;*.dib\1" + IDS_FILESIZE, "%d bytes" + IDS_PRINTRES, "%d x %d פיקסלים למטר" +END diff --git a/reactos/base/applications/mspaint/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc index a0b32306391..4a752e020af 100644 --- a/reactos/base/applications/mspaint/rsrc.rc +++ b/reactos/base/applications/mspaint/rsrc.rc @@ -45,6 +45,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/mstsc/lang/he-IL.rc b/reactos/base/applications/mstsc/lang/he-IL.rc new file mode 100644 index 00000000000..b64473bfd34 --- /dev/null +++ b/reactos/base/applications/mstsc/lang/he-IL.rc @@ -0,0 +1,64 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "הגדרות כניסה",IDC_STATIC,7,7,228,89 + GROUPBOX "הגדרות חיבור",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "הזן את כתובת השרת",IDC_STATIC,47,24,81,8 + LTEXT "שרת:",IDC_STATIC,47,41,25,8 + LTEXT "שם משתמש:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "שמור",IDC_SAVE,67,139,50,14 + PUSHBUTTON "שמור בשם...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "פתח...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "שמור את הגדרות החיבור הנוכחיות או פתח חיבור שמור.",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "תצורת תצוגה",IDC_STATIC,7,7,228,68 + GROUPBOX "צבעים",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "בחר את גודלו של שולחן העבודה המרוחק שלך. גרור את המחוון עד\nלקצה השמאלי כדי להשתמש במסך מלא.",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "שימו לב: ההגדרות במחשב המרוחק יכולות לשנות את ההגדרות שלכם.",IDC_STATIC,56,143,165,18 + LTEXT "פחות",IDC_STATIC,35,42,15,8 + LTEXT "יותר",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "חיבור לשולחן עבודה מרוחק" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "התחבר",IDOK,147,245,50,14 + PUSHBUTTON "ביטול",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "כללי" + IDS_TAB_DISPLAY "תצוגה" + IDS_256COLORS "256 צבעים" + IDS_HIGHCOLOR15 "32,768 צבעים (15 bit)" + IDS_HIGHCOLOR16 "65,536 צבעים (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 צבעים (24 bit)" + IDS_PIXEL "%lux%lu פיקסלים" + IDS_FULLSCREEN "מסך מלא" + IDS_BROWSESERVER "" + IDS_HEADERTEXT1 "שולחן עבודה מרוחק" + IDS_HEADERTEXT2 "חיבור" +END diff --git a/reactos/base/applications/mstsc/rsrc.rc b/reactos/base/applications/mstsc/rsrc.rc index 94a1abc6851..70c4e236aa8 100644 --- a/reactos/base/applications/mstsc/rsrc.rc +++ b/reactos/base/applications/mstsc/rsrc.rc @@ -14,6 +14,7 @@ IDB_SPECT BITMAP "res/spectrum.bmp" // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -38,6 +39,9 @@ IDB_SPECT BITMAP "res/spectrum.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/notepad/lang/he-IL.rc b/reactos/base/applications/notepad/lang/he-IL.rc new file mode 100644 index 00000000000..b3a1558948f --- /dev/null +++ b/reactos/base/applications/notepad/lang/he-IL.rc @@ -0,0 +1,206 @@ +/* + * Notepad (Herbrew resources) + * + * Copyright 1997,98 Marcel Baur + * Proofread 1998 by David Lee Lambert + * Copyright 2002 Sylvain Petreolle + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&חדש\tCtrl+N", CMD_NEW + MENUITEM "&פתח...\tCtrl+O", CMD_OPEN + MENUITEM "&שמור\tCtrl+S", CMD_SAVE + MENUITEM "שמור &בשם...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "הגדרת עמ&וד", CMD_PAGE_SETUP + MENUITEM "הד&פסה\tCtrl+P", CMD_PRINT + MENUITEM "הג&דרת מדפסת...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&יציאה", CMD_EXIT + END + POPUP "ע&ריכה" + BEGIN + MENUITEM "&בטל\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "ג&זור\tCtrl+X", CMD_CUT + MENUITEM "הע&תק\tCtrl+C", CMD_COPY + MENUITEM "הדב&ק\tCtrl+V", CMD_PASTE + MENUITEM "מ&חק\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&מצא\tCtrl+F", CMD_SEARCH + MENUITEM "חפ&ש את הבא\tF3", CMD_SEARCH_NEXT + MENUITEM "החלפה\tCtrl+H", CMD_REPLACE + MENUITEM "מעבר א&ל...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "בחר הכל\tCtrl+A", CMD_SELECT_ALL + MENUITEM "תאריך/שעה\tF5", CMD_TIME_DATE + END + POPUP "עיצוב" + BEGIN + MENUITEM "גלישת שורות", CMD_WRAP + MENUITEM "&גופן...", CMD_FONT + END + POPUP "&תצוגה" + BEGIN + MENUITEM "שו&רת מצב", CMD_STATUSBAR + END + POPUP "&עזרה" + BEGIN + MENUITEM "תוכן העניינים", CMD_HELP_CONTENTS + MENUITEM "חפש...", CMD_HELP_SEARCH + MENUITEM "עזרה בעזרה", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "אודות", CMD_ABOUT + MENUITEM "מידע", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "הגדרת עמוד" +BEGIN +LTEXT "כותרת עליונה:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "כותרת תחתונה:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "שוליים:", 0x144, 10, 43,160, 45 +LTEXT "שמאליים:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "עליונים:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "ימניים:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "תחתונים:", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "אישור", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "עזרה", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "קידוד" +BEGIN +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "קידוד:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Endlines:",0x156,5,20,41,12 // what? +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0,0,165,50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "מעבר אל שורה" +BEGIN +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "מספר שורה:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "אישור", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "אודות פנקס הרשימות של ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur \r\nCopyright 2000 Mike McCormack \r\nCopyright 2002 Sylvain Petreolle \r\nCopyright 2002 Andriy Palamarchuk\r\n", + -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 + CONTROL " ", + -1,"Static",0x50000000,8,48,272,11 + DEFPUSHBUTTON "סגור",IDOK,114,149,44,15,WS_GROUP + ICON IDI_NPICON,-1,12,9,20,30 + EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_LICENSE, "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE DISCARDABLE +BEGIN +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "עמוד &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 מ""מ" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 מ""מ" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 מ""מ" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 מ""מ" /* FIXME */ + +STRING_NOTEPAD, "פנקס רשימות" +STRING_ERROR, "שגיאה" +STRING_WARNING, "אזהרה" +STRING_INFO, "מידע" + +STRING_UNTITLED, "(ללא שם)" + +STRING_ALL_FILES, "כל הקבצים (*.*)" +STRING_TEXT_FILES_TXT, "קבצי טקסט (*.txt)" + +STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ +Please use a different editor." +STRING_NOTEXT, "You didn't enter any text. \ +\nPlease type something and try again" +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +Do you want to create a new file ?" +STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +Would you like to save the changes ?" +STRING_NOTFOUND, "'%s' לא נמצא." +STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ +task. \nClose one or more applications to increase the amount of \nfree memory." +STRING_CANNOTFIND "לא יכול למצוא את '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "חלונות" +STRING_LF, "יוניקס" +STRING_CR, "מקינטוש" +STRING_LINE_COLUMN, "שורה %d, עמודה %d" +END diff --git a/reactos/base/applications/notepad/rsrc.rc b/reactos/base/applications/notepad/rsrc.rc index c7a3f077b98..336e66079f6 100644 --- a/reactos/base/applications/notepad/rsrc.rc +++ b/reactos/base/applications/notepad/rsrc.rc @@ -66,6 +66,9 @@ IDI_NPICON ICON "res/notepad.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/rapps/lang/he-IL.rc b/reactos/base/applications/rapps/lang/he-IL.rc new file mode 100644 index 00000000000..aa3803808f8 --- /dev/null +++ b/reactos/base/applications/rapps/lang/he-IL.rc @@ -0,0 +1,194 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&הגדרות", ID_SETTINGS + MENUITEM SEPARATOR + MENUITEM "&יציאה", ID_EXIT + END + POPUP "&תכניות" + BEGIN + MENUITEM "התקנה", ID_INSTALL + MENUITEM "הסרה",ID_UNINSTALL + MENUITEM "שינוי", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "הסרה מהרשום", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "רענון", ID_REFRESH + END + POPUP "עזרה" + BEGIN + MENUITEM "עזרה", ID_HELP, GRAYED + MENUITEM "אודות", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "פתיחת קישור בדפדפן", ID_OPEN_LINK + MENUITEM "העתקת קישור", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "התקנה", ID_INSTALL + MENUITEM "הסרה", ID_UNINSTALL + MENUITEM "שינוי", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "הסרה מהרשום", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "רענן", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "כללי", -1, 4, 2, 240, 61 + AUTOCHECKBOX "שמור מיקום חלון", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 222, 12 + AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + + GROUPBOX "הורדה", -1, 4, 65, 240, 51 + LTEXT "תיקיית הורדות:", -1, 16, 75, 100, 9 + EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "בחר", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "מחק את קובץ ההתקנה לאחר סיום ההתקנה", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + + PUSHBUTTON "ברירת מחדל", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "אישור", IDOK, 116, 124, 60, 14 + PUSHBUTTON "ביטול", IDCANCEL, 181, 124, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת תכנית" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 + + AUTORADIOBUTTON "התקן מתוך דיסק (CD או DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "הורד והתקן", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + + PUSHBUTTON "אישור", IDOK, 86, 78, 60, 14 + PUSHBUTTON "ביטול", IDCANCEL, 150, 78, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "הורדה..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "ביטול", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "אודות" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "סגירה", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "התקנה" + IDS_TOOLTIP_UNINSTALL "הסרה" + IDS_TOOLTIP_MODIFY "שינוי" + IDS_TOOLTIP_SETTINGS "הגדרות" + IDS_TOOLTIP_REFRESH "רענון" + IDS_TOOLTIP_EXIT "יציאה" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "שם" + IDS_APP_INST_VERSION "גרסה" + IDS_APP_DESCRIPTION "תיאור" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nגרסה: " + IDS_INFO_DESCRIPTION "\nתאור: " + IDS_INFO_PUBLISHER "\nמפרסם: " + IDS_INFO_HELPLINK "\nקקישור תמיכה: " + IDS_INFO_HELPPHONE "\nטלפון תמיכה: " + IDS_INFO_README "\nקרא אותי: " + IDS_INFO_REGOWNER "\nבעלים רשומים: " + IDS_INFO_PRODUCTID "\nמזהה מוצר " + IDS_INFO_CONTACT "\nצור קשר: " + IDS_INFO_UPDATEINFO "\nמידע על עדכונים: " + IDS_INFO_INFOABOUT "\nמידע אודות: " + IDS_INFO_COMMENTS "\nתגובות: " + IDS_INFO_INSTLOCATION "\nמיקום התקנה: " + IDS_INFO_INSTALLSRC "\nמקור התקנה: " + IDS_INFO_UNINSTALLSTR "\nמחרוזת הסרה: " + IDS_INFO_MODIFYPATH "\nנתיב שינוי: " + IDS_INFO_INSTALLDATE "\nתאריך התקנה: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nגרסה: " + IDS_AINFO_DESCRIPTION "\nתיאור: " + IDS_AINFO_SIZE "\nגודל: " + IDS_AINFO_URLSITE "\nדף בית: " + IDS_AINFO_LICENCE "\nרישיון: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "צלילים" + IDS_CAT_DEVEL "פיתוח" + IDS_CAT_DRIVERS "מנהלי התקנים" + IDS_CAT_EDU "Edutainment" + IDS_CAT_ENGINEER "הנדסה" + IDS_CAT_FINANCE "כלכלי" + IDS_CAT_GAMES "משחקים וכיף" + IDS_CAT_GRAPHICS "גרפיקה" + IDS_CAT_INTERNET "אינטרנט ורשת" + IDS_CAT_LIBS "ספריות" + IDS_CAT_OFFICE "משרד" + IDS_CAT_OTHER "אחרים" + IDS_CAT_SCIENCE "מדע" + IDS_CAT_TOOLS "כלים" + IDS_CAT_VIDEO "וידאו" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "מנהל היישומים של ReactOS" + IDS_SEARCH_TEXT "חפש..." + IDS_INSTALL "התקנה" + IDS_UNINSTALL "הסרה" + IDS_MODIFY "שינוי" + IDS_APPS_COUNT "ספירת יישומים: %d" + IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" + IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "מותקן" + IDS_AVAILABLEFORINST "זמין להתקנה" + IDS_UPDATES "עדכונים" + IDS_APPLICATIONS "יישומים" + IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:" + IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?" + IDS_USER_NOT_ADMIN "You must be an administrator to start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "מידע" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" +END diff --git a/reactos/base/applications/rapps/rsrc.rc b/reactos/base/applications/rapps/rsrc.rc index d18bff60984..e58ce662ac9 100644 --- a/reactos/base/applications/rapps/rsrc.rc +++ b/reactos/base/applications/rapps/rsrc.rc @@ -17,6 +17,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/regedit/lang/he-IL.rc b/reactos/base/applications/regedit/lang/he-IL.rc new file mode 100644 index 00000000000..519893f68b0 --- /dev/null +++ b/reactos/base/applications/regedit/lang/he-IL.rc @@ -0,0 +1,608 @@ +/* + * Regedit resources + * + * Copyright 2002 Robert Dickenson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Translated by Baruch Rutman + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT + "^F", ID_EDIT_FIND + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT +END + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&יציאה", ID_REGISTRY_EXIT + END + POPUP "&עזרה" + BEGIN + MENUITEM "&אודות...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "ייבוא...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "ייצוא...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "טעינת כוורת (Hive)...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "ביטול טעינת כוורת (Hive)...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "התחברות לרישום ברשת...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "התנתקות מרישום ברשת...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "הד&פס\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&יציאה", ID_REGISTRY_EXIT + END + POPUP "&עריכה" + BEGIN + MENUITEM "&שנה", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&חדש" + BEGIN + MENUITEM "&מפתח", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "מחר&וזת", ID_EDIT_NEW_STRINGVALUE + MENUITEM "ערך &בינארי", ID_EDIT_NEW_BINARYVALUE + MENUITEM "ערך DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "ערך מרובה מחרוזות", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "ערך מחרוזת הניתן להרחבה", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + MENUITEM SEPARATOR + MENUITEM "&הרשאות...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "מחק\tDel", ID_EDIT_DELETE + MENUITEM "שנה שם", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "העתק שם מפתח", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "חיפוש\tCtrl+F", ID_EDIT_FIND + MENUITEM "חפש את הבא\tF3", ID_EDIT_FINDNEXT + END + POPUP "תצוגה" + BEGIN + MENUITEM "שורת מצב", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "פצל", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "רענן\tF5", ID_VIEW_REFRESH + END + POPUP "מועדפים" + BEGIN + MENUITEM "הוסף למועדפים", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED + MENUITEM "הסר פריט מועדף", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED + END + POPUP "עזרה" + BEGIN + MENUITEM "נושאי עזרה\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "אודות עורך הרישום", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "שנה", ID_EDIT_MODIFY + MENUITEM "שינוי נתונים בינאריים", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "מחק\tDel", ID_EDIT_DELETE + MENUITEM "שנה שם", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "חדש" + BEGIN + MENUITEM "מפתח", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "מחרוזת", ID_EDIT_NEW_STRINGVALUE + MENUITEM "ערך בינארי", ID_EDIT_NEW_BINARYVALUE + MENUITEM "ערך DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "ערך מרובה מחרוזות", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "ערך מחרוזת הניתן להרחבה", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + END + POPUP "" + BEGIN + MENUITEM "הרחב/קפל", ID_TREE_EXPANDBRANCH + POPUP "חדש" + BEGIN + MENUITEM "מפתח", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "מחרוזת", ID_EDIT_NEW_STRINGVALUE + MENUITEM "ערך בינארי", ID_EDIT_NEW_BINARYVALUE + MENUITEM "ערך DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "ערך מרובה מחרוזות", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "ערך מחרוזת הניתן להרחבה", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + MENUITEM "מצא", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "מחק", ID_TREE_DELETE + MENUITEM "שנה שם", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "יצא", ID_TREE_EXPORT + MENUITEM "הרשאות...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "העתק שם מפתח", ID_EDIT_COPYKEYNAME + END + POPUP "" + BEGIN + MENUITEM "גזור", ID_HEXEDIT_CUT + MENUITEM "העתק", ID_HEXEDIT_COPY + MENUITEM "הדבק", ID_HEXEDIT_PASTE + MENUITEM "מחק", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "בחר הכל", ID_HEXEDIT_SELECT_ALL + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "עריכת מחרוזת" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שם הערך:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "נתוני ערך:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור",IDOK,142,64,50,14 + PUSHBUTTON "ביטול",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Multi-String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שם הערך:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "תוכן הערך:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "אישור",IDOK,142,154,50,14 + PUSHBUTTON "ביטול",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "עריכת ערך בינארי" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שם הערך:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "תוכן הערך:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "אישור",IDOK,142,154,50,14 + PUSHBUTTON "ביטול",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שם הערך:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "תוכן הערך:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "בסיס",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "הקסהדסימלי",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "עשרוני",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "אישור",IDOK,142,82,50,14 + PUSHBUTTON "ביטול",IDCANCEL,196,82,50,14 +END + + +IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "רשימת משאבים" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 150, 75 + DEFPUSHBUTTON "אישור", IDOK, 27, 100, 50, 14 + PUSHBUTTON "הראה...", IDC_SHOW_RESOURCE, 93, 100, 50, 14, WS_DISABLED +} + + +IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "משאבים" +FONT 8, "MS Shell Dlg" +{ + LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 + CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 + LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 + LTEXT "זיכרון:", IDC_STATIC, 10, 91, 32, 8 + CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 + LTEXT "יציאה:", IDC_STATIC, 10, 134, 38, 8 + CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 + LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8 + CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 + GROUPBOX "שימוש", IDC_STATIC, 10, 219, 125, 39 + LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "משותף", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "התקן בלעדי", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "מנהל התקן בלעדי", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "סוג ממשק:", IDC_STATIC, 144, 220, 58, 8 + LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 + RTEXT "Bus Number:", IDC_STATIC, 151, 230, 51, 8 + LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 + RTEXT "גרסה:", IDC_STATIC, 151, 240, 51, 8 + LTEXT "", IDC_VERSION, 205, 240, 66, 8 + RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + LTEXT "", IDC_REVISION, 205, 250, 66, 8 + DEFPUSHBUTTON "אישור",IDOK, 92, 263, 40, 14 + PUSHBUTTON "מידע...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED +} + + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "שם" + IDS_LIST_COLUMN_TYPE "סוג" + IDS_LIST_COLUMN_DATA "מידע" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "עורך הרשום" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Contains commands for working with the whole registry" + ID_EDIT_MENU "Contains commands for editing values or keys" + ID_VIEW_MENU "Contains commands for customising the registry window" + ID_FAVOURITES_MENU "Contains commands for accessing frequently used keys" + ID_HELP_MENU "Contains commands for displaying help and information about registry editor" + ID_EDIT_NEW_MENU "Contains commands for creating new keys or values" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Modifies the value's data" + ID_EDIT_NEW_KEY "Adds a new key" + ID_EDIT_NEW_STRINGVALUE "Adds a new string value" + ID_EDIT_NEW_BINARYVALUE "Adds a new binary value" + ID_EDIT_NEW_DWORDVALUE "Adds a new double word value" + ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" + ID_REGISTRY_EXPORTREGISTRYFILE + "Exports all or part of the registry to a text file" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Connects to a remote computer's registry" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Disconnects from a remote computer's registry" + ID_REGISTRY_PRINT "Prints all or part of the registry" +/* ID_HELP_HELPTOPICS "Opens registry editor help" */ + ID_HELP_ABOUT "Displays program information, version number and copyright" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Quits the registry editor" + ID_FAVOURITES_ADDTOFAVOURITES "Adds keys to the favourites list" + ID_FAVOURITES_REMOVEFAVOURITE "Removes keys from the favourites list" + ID_VIEW_STATUSBAR "Shows or hides the status bar" + ID_VIEW_SPLIT "Change position of split between two panes" + ID_VIEW_REFRESH "Refreshes the window" + ID_EDIT_DELETE "Deletes the selection" + ID_EDIT_RENAME "Renames the selection" + ID_EDIT_COPYKEYNAME "Copies the name of the selected key to the clipboard" + ID_EDIT_FIND "Finds a text string in a key, value or data" + ID_EDIT_FINDNEXT "Finds next occurrence of text specified in previous search" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "שגיאה" + IDS_WARNING "אזהרה" + IDS_BAD_KEY "Can't query key '%s'" + IDS_BAD_VALUE "Can't query value '%s'" + IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" + IDS_TOO_BIG_VALUE "Value is too big (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list." + IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?" + IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete" + IDS_QUERY_DELETE_ONE "Are you sure you want to delete this value?" + IDS_QUERY_DELETE_MORE "Are you sure you want to delete these values?" + IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete" + IDS_ERR_DELVAL_CAPTION "Error Deleting Values" + IDS_ERR_DELETEVALUE "Unable to delete all specified values!" + IDS_ERR_RENVAL_CAPTION "Error Renaming Value" + IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" + IDS_NEW_KEY "New Key #%d" + IDS_NEW_VALUE "New Value #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(zero-length binary value)" + IDS_DEFAULT_VALUE_NAME "(Default)" + IDS_VALUE_NOT_SET "(value not set)" + IDS_UNKNOWN_TYPE "Unknown type: (0x%lx)" + IDS_MY_COMPUTER "My Computer" + IDS_IMPORT_REG_FILE "Import Registry File" + IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" + IDS_INVALID_DWORD "(invalid DWORD value)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILE "Registration File" + IDS_FLT_REGFILES "Registration Files (*.reg)" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "All Files (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Full Control" + IDS_ACCESS_READ "Read" + IDS_ACCESS_QUERYVALUE "Query Value" + IDS_ACCESS_SETVALUE "Set Value" + IDS_ACCESS_CREATESUBKEY "Create Subkey" + IDS_ACCESS_ENUMERATESUBKEYS "Enumerate Subkeys" + IDS_ACCESS_NOTIFY "Notify" + IDS_ACCESS_CREATELINK "Create Link" + IDS_ACCESS_DELETE "Delete" + IDS_ACCESS_WRITEDAC "Write DAC" + IDS_ACCESS_WRITEOWNER "Write Owner" + IDS_ACCESS_READCONTROL "Read Control" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "This key only" + IDS_INHERIT_THISKEYANDSUBKEYS "This key and subkeys" + IDS_INHERIT_SUBKEYSONLY "Subkeys only" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expand" + IDS_COLLAPSE "&Collapse" + IDS_GOTO_SUGGESTED_KEY "&Go to '%s'" + IDS_FINISHEDFIND "Finished searching through the registry." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BUSNUMBER "Bus Number" + IDS_INTERFACE "Interface" + IDS_DMA_CHANNEL "Channel" + IDS_DMA_PORT "Port" + IDS_INTERRUPT_VECTOR "Vector" + IDS_INTERRUPT_LEVEL "Level" + IDS_INTERRUPT_AFFINITY "Affinity" + IDS_INTERRUPT_TYPE "Type" + IDS_MEMORY_ADDRESS "Physical Address" + IDS_MEMORY_LENGTH "Length" + IDS_MEMORY_ACCESS "Access" + IDS_PORT_ADDRESS "Physical Address" + IDS_PORT_LENGTH "Length" + IDS_PORT_ACCESS "Access" + IDS_SPECIFIC_RESERVED1 "Reserved 1" + IDS_SPECIFIC_RESERVED2 "Reserved 2" + IDS_SPECIFIC_DATASIZE "Data Size" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PORT_PORT_IO "Port" + IDS_PORT_MEMORY_IO "Memory" + IDS_INTERRUPT_EDGE_SENSITIVE "Edge Sensitive" + IDS_INTERRUPT_LEVEL_SENSITIVE "Level Sensitive" + IDS_MEMORY_READ_ONLY "Read Only" + IDS_MEMORY_WRITE_ONLY "Write Only" + IDS_MEMORY_READ_WRITE "Read / Write" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BUS_UNDEFINED "Undefined" + IDS_BUS_INTERNAL "Internal" + IDS_BUS_ISA "ISA" + IDS_BUS_EISA "EISA" + IDS_BUS_MICROCHANNEL "MicroChannel" + IDS_BUS_TURBOCHANNEL "TurboChannel" + IDS_BUS_PCIBUS "PCI" + IDS_BUS_VMEBUS "VME" + IDS_BUS_NUBUS "NuBus" + IDS_BUS_PCMCIABUS "PCMCIA" + IDS_BUS_CBUS "C-Bus" + IDS_BUS_MPIBUS "MPI-Bus" + IDS_BUS_MPSABUS "MPSA-Bus" + IDS_BUS_PROCESSORINTERNAL "Processor Internal" + IDS_BUS_INTERNALPOWERBUS "Internal Power Bus" + IDS_BUS_PNPISABUS "PnP-ISA Bus" + IDS_BUS_PNPBUS "PnP Bus" + IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 + CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +// +// Dialog resources +// +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} + +IDD_ADDFAVORITES DIALOGEX DISCARDABLE 0, 0, 186, 46 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Add to Favorites" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 + LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL +END + +IDD_REMOVEFAVORITES DIALOGEX DISCARDABLE 0, 0, 164, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favorites" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12 +END + +IDD_FIND DIALOGEX DISCARDABLE 0, 0, 254, 82 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Find Next",IDOK,197,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14 + GROUPBOX "Look at",IDC_STATIC,7,25,63,51 + LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + DEFPUSHBUTTON "&Cancel",IDCANCEL,93,29,45,14 + LTEXT "Searching the registry...",IDC_STATIC,33,12,83,8 +END + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Opens Registry Editor Help." + * ID_HELP_ABOUT "Displays program information, version number, and copyright." + *END + */ + +/*****************************************************************/ diff --git a/reactos/base/applications/regedit/rsrc.rc b/reactos/base/applications/regedit/rsrc.rc index 2411e17d124..18c7452196f 100644 --- a/reactos/base/applications/regedit/rsrc.rc +++ b/reactos/base/applications/regedit/rsrc.rc @@ -46,6 +46,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc b/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc new file mode 100644 index 00000000000..1e8a50de2ae --- /dev/null +++ b/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc @@ -0,0 +1,17 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות שומר מסך של טקסט תלת מימדי" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "אישור",IDOK,216,7,50,14 + PUSHBUTTON "ביטול",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "טקסט מותאם אישית:",IDC_STATIC,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "שומר מסר של טקסט תלת מימדי" +END diff --git a/reactos/base/applications/screensavers/3dtext/rsrc.rc b/reactos/base/applications/screensavers/3dtext/rsrc.rc index 56adce0006d..06f38c1fc67 100644 --- a/reactos/base/applications/screensavers/3dtext/rsrc.rc +++ b/reactos/base/applications/screensavers/3dtext/rsrc.rc @@ -33,6 +33,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/screensavers/logon/lang/he-IL.rc b/reactos/base/applications/screensavers/logon/lang/he-IL.rc new file mode 100644 index 00000000000..c843c7b9976 --- /dev/null +++ b/reactos/base/applications/screensavers/logon/lang/he-IL.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "שומר מסך של התחברות" + IDS_TEXT "אין אפשרויות כדי להגדיר" +END diff --git a/reactos/base/applications/screensavers/logon/logon.rc b/reactos/base/applications/screensavers/logon/logon.rc index 9238335f0eb..016bec90d33 100644 --- a/reactos/base/applications/screensavers/logon/logon.rc +++ b/reactos/base/applications/screensavers/logon/logon.rc @@ -37,6 +37,9 @@ IDB_SERVER BITMAP DISCARDABLE "res/1.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/shutdown/lang/he-IL.rc b/reactos/base/applications/shutdown/lang/he-IL.rc new file mode 100644 index 00000000000..e2e040ed68e --- /dev/null +++ b/reactos/base/applications/shutdown/lang/he-IL.rc @@ -0,0 +1,103 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* Dialog */ +IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "כיבוי מרחוק" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "אישור",IDC_OK,125,232,50,14 + PUSHBUTTON "ביטול",IDC_CANCEL,178,232,50,14 + CTEXT "מחשבים:", IDC_STATIC,9,9,35,36 + LISTBOX IDC_COMPUTER_LIST,8,19,162,55 + PUSHBUTTON "הוסף...",IDC_ADD_SYSTEM,179,19,50,14 + PUSHBUTTON "הסר",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED + PUSHBUTTON "סייר...",IDC_BROWSE_SYSTEM,179,53,50,14 + CTEXT "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14 + COMBOBOX IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN + CHECKBOX "הזהר משתמשים",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP + CTEXT "הצג אזהרה ל-",IDC_SHOW_WARN_ONE,11,99,65,14 + EDITTEXT IDC_SHOW_WARN,78,97,41,14 + CTEXT "שניה/ות",IDC_SHOW_WARN_TWO,124,99,32,10 + GROUPBOX "מעקב אירועי כיבוי",IDC_STATIC,5,114,224,114 + CTEXT "סיבה:",IDC_STATIC,16,130,27,8 + CHECKBOX "מתוכנן...",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN + CTEXT "הערה:",IDC_COMMENT_CAPTION,17,159,30,8 + EDITTEXT IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL +END + +/* Information and error messages */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "ReactOS Shutdown Utility\n\ +\n\ +Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ + [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\ +\n\ + No arguments or /? Display this help.\n\ + /i Show the graphical user interface (GUI). This option must be the\n\ + first one.\n\ + /l Log off on the local system only. Cannot be used with /m or /d.\n\ + /s Shutdown the computer.\n\ + /r Restart the computer.\n\ + /g Restart the computer and restart all the registered applications.\n\ + /a Cancel a delayed shutdown. Can only be used during the delay\n\ + period.\n\ + /p Shutdown the local computer without any timeout or warning. Can be\n\ + used with /d or /f.\n\ + /h Hibernate the local computer. Usable with /f.\n\ + /e Document the reason for the unexpected computer shutdown.\n\ + /m \\\\computer Specify the target computer (UNC/IP address).\n\ + /t xxx Set the timeout period to xxx seconds before shutting down.\n\ + The valid range starts from 0 to 315360000 (10 years),\n\ + 30 being the default value.\n\ + /c ""comment"" Comment on the reason for shutdown or restart.\n\ + 512 characters maximum allowed.\n\ + /f Force running applications to close without warning users. If you\n\ + do not specify any other parameter, this option will also log off.\n\ + /d [p|u:]xx:yy Give the reason code for the shutdown or the restart.\n\ + p indicates that the shutdown or the restart is planned.\n\ + u indicates that the reason is defined by the user.\n\ + If neither p nor u are specified, the shutdown or the restart are\n\ + not planned.\n\ + xx is the major reason code (positive integer smaller than 256).\n\ + yy is the minor reason code (positive integer smaller than 65536).\n" + + IDS_ERROR_SHUTDOWN_REBOOT, "ERROR: Unable to shutdown and restart at the same time.\n" + IDS_ERROR_TIMEOUT, "ERROR: Timeout value of %u is out of bounds (0-315360000).\n" + IDS_ERROR_ABORT, "ERROR: Unable to abort the shutdown of the system.\n" + IDS_ERROR_LOGOFF, "ERROR: Unable to logoff the system.\n" + IDS_ERROR_SHUTDOWN, "ERROR: Unable to shutdown the system.\n" + IDS_ERROR_RESTART, "ERROR: Unable to restart the system.\n" + IDS_ERROR_MAX_COMMENT_LENGTH, "ERROR: Comment length exceeds maximum character limit set by the system.\n" + IDS_ERROR_HIBERNATE, "ERROR: Unable to send system into hibernation mode.\n" + IDS_ERROR_HIBERNATE_LOCAL, "ERROR: Hibernation mode cannot be started remotely.\n" + IDS_ERROR_HIBERNATE_ENABLED, "ERROR: Hibernation mode is not enabled.\n" + IDS_ERROR_DIALOG_CAPTION, "Remote Shutdown" + IDS_ERROR_DIALOG_INIT, "Unable to display the graphical user interface." +END + +/* Remote shutdown action strings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACTION_SHUTDOWN, "כבה את המערכת" + IDS_ACTION_RESTART, "הפעל מחדש את המערכת" + IDS_ACTION_UNEXPECTED_SHUTDOWN, "Annotate the unexpected shutdown" +END + +/* Remote shutdown reason strings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_REASON_OTHER, "אחר" + IDS_REASON_HARDWARE_MAINTENANCE, "חומרה: תחזוקה" + IDS_REASON_HARDWARE_INSTALL, "חומרה: התקנה" + IDS_REASON_OS_RECOVER, "מערכת הפעלה: שחזור" + IDS_REASON_OS_RECONFIGURE, "מערכת הפעלה: הגדרה מחדש" + IDS_REASON_APP_MAINTENANCE, "יישום: תחזוקה" + IDS_REASON_APP_INSTALL, "יישום: התקנה" + IDS_REASON_APP_UNRESPONSIVE, "יישום: לא מגיב" + IDS_REASON_APP_UNSTABLE, "יישום: לא יציב" + IDS_REASON_SECURITY, "בעיית בטיחות" + IDS_REASON_NETWORK, "איבוד קישוריות רשת" +END diff --git a/reactos/base/applications/shutdown/rsrc.rc b/reactos/base/applications/shutdown/rsrc.rc index 1b1a9a586d3..5da4bae5913 100644 --- a/reactos/base/applications/shutdown/rsrc.rc +++ b/reactos/base/applications/shutdown/rsrc.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/sndrec32/lang/he-IL.rc b/reactos/base/applications/sndrec32/lang/he-IL.rc new file mode 100644 index 00000000000..9c2745f2910 --- /dev/null +++ b/reactos/base/applications/sndrec32/lang/he-IL.rc @@ -0,0 +1,54 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "אודות הרשמקול של ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON IDI_SNDREC32,-1,19,14,21,20 + LTEXT "רשמקול של ReactOS גרסה 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "זכויות יוצרים (C) 2009",IDC_STATIC,55,25,114,8 + DEFPUSHBUTTON "אישור",IDOK,139,54,50,14,WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "קובץ" + BEGIN + MENUITEM "חדש", ID_NEW + MENUITEM "פתח...", ID_FILE_OPEN + MENUITEM "שמור", ID_FILE_SAVE, GRAYED + MENUITEM "שמור בשם...", ID_FILE_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "יציאה", ID_EXIT + END + MENUITEM "todo1", 0 + MENUITEM "todo2", 0 + POPUP "?" + BEGIN + MENUITEM "אודות...", ID__ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "רשמקול" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END + +STRINGTABLE +BEGIN + IDS_STRPOS "מיקום: %.2f s" + IDS_STRDUR "אורך: %.2f s" + IDS_STRBUF "מתווך: %.2f kb" + IDS_STRFMT "%.1f kHz %u bits" + IDS_STRMONO "מונו" + IDS_STRSTEREO "סטריאו" + IDS_STRCHAN "%s" +END diff --git a/reactos/base/applications/sndrec32/rsrc.rc b/reactos/base/applications/sndrec32/rsrc.rc index 0fca4dbcc45..abe0229cf12 100644 --- a/reactos/base/applications/sndrec32/rsrc.rc +++ b/reactos/base/applications/sndrec32/rsrc.rc @@ -33,6 +33,9 @@ IDB_BITMAP2_STOP_DIS BITMAP "resources/but_stop_dis.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/applications/sndvol32/lang/he-IL.rc b/reactos/base/applications/sndvol32/lang/he-IL.rc new file mode 100644 index 00000000000..10820ad6bd5 --- /dev/null +++ b/reactos/base/applications/sndvol32/lang/he-IL.rc @@ -0,0 +1,57 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "אפשרויות" + BEGIN + MENUITEM "מאפיינים", IDC_PROPERTIES + MENUITEM "&Advanced Controls", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "יציאה", IDC_EXIT + END + POPUP "עזרה" + BEGIN + MENUITEM "נושאי עזרה", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "אודות בקרת עוצמה", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "בקרת עוצמה" + IDS_NOMIXERDEVICES "אין התקני ערבול פעילים זמינים! היישום יצא עכשיו" +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מאפייני" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "התקן ערבול:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "התאם עוצמה ל:", -1, 7,25,211,77 + PUSHBUTTON "נגינה", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "הקלטה", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "אחר:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "הצג את בקרי העוצמה הבאים:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "אישור", IDOK, 114,226,50,14 + PUSHBUTTON "ביטול", IDCANCEL, 168,226,50,14 +END + +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "איזון", -1, 4, 35, 80, 42 + LTEXT "עוצמה", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "השתק", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END diff --git a/reactos/base/applications/sndvol32/rsrc.rc b/reactos/base/applications/sndvol32/rsrc.rc index 707af2af096..448af197aac 100644 --- a/reactos/base/applications/sndvol32/rsrc.rc +++ b/reactos/base/applications/sndvol32/rsrc.rc @@ -28,6 +28,9 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/taskmgr/lang/he-IL.rc b/reactos/base/applications/taskmgr/lang/he-IL.rc new file mode 100644 index 00000000000..55d0f627ba5 --- /dev/null +++ b/reactos/base/applications/taskmgr/lang/he-IL.rc @@ -0,0 +1,643 @@ +// Hebrew (Israel) resources +// Translated by Baruch Rutman (peterooch) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "משימה &חדשה", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "י&ציאה", ID_FILE_EXIT + END + POPUP "&אפשרויות" + BEGIN + MENUITEM "תמיד &עליון", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&מזער בעת שימוש", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&הסתר בעת שימוש", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "הצג משימות של 16 &סיביות", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "ת&צוגה" + BEGIN + MENUITEM "&רענן כעת", ID_VIEW_REFRESH + POPUP "מה&ירות עדכון" + BEGIN + MENUITEM "&גבוהה", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&רגילה", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&נמוכה", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&מושהה", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "סמלים ג&דולים", ID_VIEW_LARGE + MENUITEM "סמלים ק&טנים", ID_VIEW_SMALL + MENUITEM "מ&אפיינים", ID_VIEW_DETAILS, CHECKED + MENUITEM "ב&חירת עמודות...", ID_VIEW_SELECTCOLUMNS + POPUP "&היסטורית מעבד" + BEGIN + MENUITEM "&עמודה אחת עבור כל המעבדים", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "עמ&ודה אחת לכל מעבד", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "הראה זמני &ליבה", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&חלונות" + BEGIN + MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&מזער", ID_WINDOWS_MINIMIZE + MENUITEM "&הגדל", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&עזרה" + BEGIN + MENUITEM "&נושאי עזרה של מנהל המשימות", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&אודות מנהל המשימות", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&מזער", ID_WINDOWS_MINIMIZE + MENUITEM "&הגדל", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "משימה &חדשה", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "סמלים &גדולים", ID_VIEW_LARGE + MENUITEM "סמלים &קטנים", ID_VIEW_SMALL + MENUITEM "&מאפיינים", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&עבור אל", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&מזער", ID_WINDOWS_MINIMIZE + MENUITEM "&הגדל", ID_WINDOWS_MAXIMIZE + MENUITEM "&Cascade", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "&סיים משימה", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&עבור אל תהליך", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&שחזר", ID_RESTORE + MENUITEM "&סגור", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&תמיד מעל", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&סיים תהליך", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "סיים &עץ תהליכים", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&ניפוי שגיאות", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "&קבע עדיפות" + BEGIN + MENUITEM "&זמן אמת", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&גבוהה", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "&מעל לרגילה", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&רגילה", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "מ&תחת לרגילה", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&נמוכה", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "הגדרת &קירבה", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "מנהל המשימות" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&משימה חדשה",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&עבוד אל",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "&סיים משימה",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&סיים תהליך",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&הראה תהליכים מכל המשתמשים",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "שימוש במעבד",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "שימוש בזיכרון",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT + GROUPBOX "סך הכל",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Physical Memory (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Kernel Memory (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "מזהים יחודיים",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "תהליכים",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER + LTEXT "Peak",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "סך הכל",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "זמין",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "מטמון המערכת",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "סך הכל",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "מאגר בקובץ ההחלפה",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "מאגר שלא בקובץ ההחלפה",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + GROUPBOX "היסטורית שימוש במעבד",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "היסטורית שימוש בזכרון",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU Usage Display",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "MEM Usage Display",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "היסטורית שימוש במעבד",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "היסטורית שימוש בזכרון",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Debug Channels" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Close",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "קירבה בין מעבדים" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "אישור",IDOK,120,133,50,14 + PUSHBUTTON "ביטול",IDCANCEL,174,133,50,14 + LTEXT "The Processor Affinity setting controls which CPUs the process will be allowed to execute on.", + IDC_STATIC,5,5,220,16 + CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "בחירת עמודות" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "אישור",IDOK,84,178,50,14 + PUSHBUTTON "ביטול",IDCANCEL,138,178,50,14 + LTEXT "Select the columns that will appear on the Process page of the Task Manager.", + IDC_STATIC,7,7,181,17 + CONTROL "&Image Name",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "&זיהוי תהליך",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "&שימוש במעבד",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "&זמן מעבד",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "שימוש ב&זיכרון",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "Memory Usage &Delta",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "Pea&k Memory Usage",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "Page &Faults",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "&USER Objects",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "I/O Reads",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "I/O Read Bytes",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "&Session ID",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "שם &משתמש",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Page F&aults Delta",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "&Virtual Memory Size",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Pa&ged Pool",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "N&on-paged Pool",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "&עדיפות",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "&Handle Count",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Thread Count",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "GDI Objects",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "I/O Writes",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "I/O Write Bytes",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "I/O Other",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "I/O Other Bytes",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "מנהל המשימות" + IDC_TASKMGR "מנהל המשימות" + IDS_IDLE_PROCESS "תהליך לא פעיל של המערכת" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "מפעיל תכנית חדשה" + ID_OPTIONS_ALWAYSONTOP "Task Manager remains in front of all other windows unless minimized" + ID_OPTIONS_MINIMIZEONUSE + "Task Manager is minimized when a SwitchTo operation is performed" + ID_OPTIONS_HIDEWHENMINIMIZED "Hide the Task Manager when it is minimized" + ID_VIEW_REFRESH "Force Task Manager to update now, regardless of Update Speed setting" + ID_VIEW_LARGE "Displays tasks by using large icons" + ID_VIEW_SMALL "Displays tasks by using small icons" + ID_VIEW_DETAILS "Displays information about each task" + ID_VIEW_UPDATESPEED_HIGH "Updates the display twice per second" + ID_VIEW_UPDATESPEED_NORMAL "Updates the display every two seconds" + ID_VIEW_UPDATESPEED_LOW "Updates the display every four seconds" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Does not automatically update" + ID_WINDOWS_TILEHORIZONTALLY + "Tiles the windows horizontally on the desktop" + ID_WINDOWS_TILEVERTICALLY "Tiles the windows vertically on the desktop" + ID_WINDOWS_MINIMIZE "Minimizes the windows" + ID_WINDOWS_MAXIMIZE "Maximizes the windows" + ID_WINDOWS_CASCADE "Cascades the windows diagonally on the desktop" + ID_WINDOWS_BRINGTOFRONT "Brings the window front, but does not switch to it" + ID_HELP_TOPICS "Displays Task Manager help topics" + ID_HELP_ABOUT "Displays program information, version number, and copyright" + ID_FILE_EXIT "Exits the Task Manager application" + ID_OPTIONS_SHOW16BITTASKS + "Shows 16-bit tasks under the associated ntvdm.exe" + ID_VIEW_SELECTCOLUMNS "Select which columns will be visible on the Process page" + ID_VIEW_SHOWKERNELTIMES "Displays kernel time in the performance graphs" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "A single history graph shows total CPU usage" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Each CPU has its own history graph" + ID_APPLICATION_PAGE_SWITCHTO + "Brings a task to the foreground, switch focus to that task" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Tells the selected tasks to close" + ID_GOTOPROCESS "Switches the focus to the process of the selected task" + ID_RESTORE "Restores the Task Manager from its hidden state" + ID_PROCESS_PAGE_ENDPROCESS "Removes the process from the system" + ID_PROCESS_PAGE_ENDPROCESSTREE + "Removes this process and all descendants from the system" + ID_PROCESS_PAGE_DEBUG "Attaches the debugger to this process" + ID_PROCESS_PAGE_SETAFFINITY + "Controls which processors the process will be allowed to run on" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Sets process to the REALTIME priority class" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Sets process to the HIGH priority class" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Sets process to the ABOVE NORMAL priority class" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Sets process to the NORMAL priority class" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Sets process to the BELOW NORMAL priority class" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "Processes" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "Task" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Image Name" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Username" + IDS_TAB_SESSIONID "Session ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU Time" + IDS_TAB_MEMUSAGE "Mem Usage" + IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" + IDS_TAB_MEMDELTA "Mem Delta" + IDS_TAB_PAGEFAULT "Page Faults" + IDS_TAB_PFDELTA "PF Delta" + IDS_TAB_VMSIZE "VM Size" + IDS_TAB_PAGEDPOOL "Paged Pool" + IDS_TAB_NPPOOL "NP Pool" + IDS_TAB_BASEPRI "Base Pri" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "USER Objects" + IDS_TAB_GDIOBJECTS "GDI Objects" + IDS_TAB_IOREADS "I/O Reads" + IDS_TAB_IOWRITES "I/O Writes" + IDS_TAB_IOOTHER "I/O Other" + IDS_TAB_IOREADBYTES "I/O Read Bytes" + IDS_TAB_IOWRITESBYTES "I/O Write Bytes" + IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_MENU_SELECTCOLUMNS "&Select Columns..." + IDS_MENU_16BITTASK "&Show 16-bit tasks" + IDS_MENU_WINDOWS "&Windows" + IDS_MENU_LARGEICONS "Lar&ge Icons" + IDS_MENU_SMALLICONS "S&mall Icons" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&One Graph, All CPUs" + IDS_MENU_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_MENU_CPUHISTORY "&CPU History" + IDS_MENU_SHOWKERNELTIMES "&Show Kernel Times" + IDS_CREATENEWTASK "Create New Task" + IDS_CREATENEWTASK_DESC "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you." + IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" + IDS_MSG_PROCESSONEPRO "The process must have affinity with at least one processor." + IDS_MSG_INVALIDOPTION "Invalid Option" + IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_WARNINGDEBUG "WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?" + IDS_MSG_TASKMGRWARNING "Task Manager Warning" + IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" + IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" + IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" + IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_PROCESSES "Processes: %d" + IDS_Not_Responding "Not Responding" + IDS_Running "Running" +END diff --git a/reactos/base/applications/taskmgr/rsrc.rc b/reactos/base/applications/taskmgr/rsrc.rc index 3db38de3b8a..922099849fc 100644 --- a/reactos/base/applications/taskmgr/rsrc.rc +++ b/reactos/base/applications/taskmgr/rsrc.rc @@ -1,5 +1,6 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -24,6 +25,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/applications/wordpad/He.rc b/reactos/base/applications/wordpad/He.rc new file mode 100644 index 00000000000..6019da0c8a1 --- /dev/null +++ b/reactos/base/applications/wordpad/He.rc @@ -0,0 +1,274 @@ +/* + * Copyright 2004 by Krzysztof Foltman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Translated by Baruch Rutman 2013 + */ + +#include "wordpad.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_MAINMENU MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&חדש...\tCtrl+N", ID_FILE_NEW + MENUITEM "&פתח...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&שמור\tCtrl+S", ID_FILE_SAVE + MENUITEM "שמור &בשם...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "הד&פס...\tCtrl+P", ID_PRINT + MENUITEM "&תצוגה מקדימה...", ID_PREVIEW + MENUITEM "&הגדרת עמוד...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&יציאה", ID_FILE_EXIT + END + POPUP "&עריכה" + BEGIN + MENUITEM "בטל\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "בצע שוב\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "גזור\tCtrl+X", ID_EDIT_CUT + MENUITEM "העתק\tCtrl+C", ID_EDIT_COPY + MENUITEM "הדבק\tCtrl+V", ID_EDIT_PASTE + MENUITEM "נקה\tDEL", ID_EDIT_CLEAR + MENUITEM "בחר הכל\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "מצא...\tCtrl+F", ID_FIND + MENUITEM "מצא הבא\tF3", ID_FIND_NEXT + MENUITEM "החלפה...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "קריאה בלבד", ID_EDIT_READONLY + MENUITEM "השתנה", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "תוספות" + BEGIN + MENUITEM "מידע בחירה", ID_EDIT_SELECTIONINFO + MENUITEM "עיצוב תווים", ID_EDIT_CHARFORMAT + MENUITEM "&Def. char format", ID_EDIT_DEFCHARFORMAT + MENUITEM "עיצוב פיסקה", ID_EDIT_PARAFORMAT + MENUITEM "השג טקסט", ID_EDIT_GETTEXT + END + END + POPUP "תצוגה" + BEGIN + MENUITEM "סרגל כלים", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "שורת מצב", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "אפשרויות...", ID_VIEWPROPERTIES + END + POPUP "הכנס" + BEGIN + MENUITEM "תאריך ושעה...", ID_DATETIME + END + POPUP "עיצוב" + BEGIN + MENUITEM "גופן...", ID_FONTSETTINGS + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "פסקה...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS + POPUP "רקע" + BEGIN + MENUITEM "מערכת\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 + END + END + POPUP "עזרה" + BEGIN + MENUITEM "אודות הכתבן של Wine", ID_ABOUT + END +END + +IDM_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "גזור", ID_EDIT_CUT + MENUITEM "העתק", ID_EDIT_COPY + MENUITEM "הדבק", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "פיסקה...", ID_PARAFORMAT + END +END + +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "שחור", ID_COLOR_BLACK + MENUITEM "Maroon", ID_COLOR_MAROON + MENUITEM "ירוק", ID_COLOR_GREEN + MENUITEM "ירוק זית", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "סגול", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "אפור", ID_COLOR_GRAY + MENUITEM "כסוף", ID_COLOR_SILVER + MENUITEM "אדום", ID_COLOR_RED + MENUITEM "ירוק ליים", ID_COLOR_LIME + MENUITEM "צהוב", ID_COLOR_YELLOW + MENUITEM "כחול", ID_COLOR_BLUE + MENUITEM "פוקסיה", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "לבן", ID_COLOR_WHITE + MENUITEM "אוטומטי", ID_COLOR_AUTOMATIC + END +END + +IDD_DATETIME DIALOG 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "תאריך ושעה" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "תצורות זמינות",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "אישור",IDOK,87,12,40,12 + PUSHBUTTON "ביטול",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "חדש" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "סוג המסמך החדש",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "אישור",IDOK,97,12,40,12 + PUSHBUTTON "ביטול",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "עיצוב פסקה" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Left", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Right", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "First line", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Alignment", -1, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "אישור", IDOK, 137, 15, 50, 15 + PUSHBUTTON "ביטול", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tabs" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "הוסף", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "הסר", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "אישור", IDOK, 137, 15, 50, 15 + PUSHBUTTON "ביטול", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "הסר הכל", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG 0, 0, 280, 110 +STYLE DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "גלישת שורות", -1, 10, 10, 130, 85 + RADIOBUTTON "ללא גלישת שורות", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "סרגלי כלים", -1, 150, 10, 120, 85 + CHECKBOX "סרגל כלים", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "סרגל עיצוב", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "שורת מצב", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE +BEGIN + STRING_ALL_FILES, "כל המסמכים (*.*)" + STRING_TEXT_FILES_TXT, "מסמכי טקסט (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "מסמך טקסט (יוניקוד) (*.txt)" + STRING_RICHTEXT_FILES_RTF, "פורמט טקסט עשיר (*.rtf)" + STRING_NEWFILE_RICHTEXT, "מסמך טקסט עשיר" + STRING_NEWFILE_TXT, "מסמך טקסט" + STRING_NEWFILE_TXT_UNICODE, "מסמך טקסט (יוניקוד)" + STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" +END + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "שמאל" + STRING_ALIGN_RIGHT, "ימין" + STRING_ALIGN_CENTER, "מרכז" +END + +STRINGTABLE +BEGIN + STRING_VIEWPROPS_TITLE, "אפשרויות" + STRING_VIEWPROPS_TEXT, "טקסט" + STRING_VIEWPROPS_RICHTEXT, "טקסט עשיר" +END + +STRINGTABLE +BEGIN + STRING_PREVIEW_PRINT, "הדפס" + STRING_PREVIEW_NEXTPAGE, "הדף הבא" + STRING_PREVIEW_PREVPAGE, "הדף הקודם" + STRING_PREVIEW_TWOPAGES, "שני עמודים" + STRING_PREVIEW_ONEPAGE, "עמוד אחד" + STRING_PREVIEW_ZOOMIN, "הגדל" + STRING_PREVIEW_ZOOMOUT, "הקטן" + STRING_PREVIEW_CLOSE, "סגור" + STRING_PREVIEW_PAGE, "עמוד" + STRING_PREVIEW_PAGES, "עמודים" + STRING_UNITS_CM, "ס""מ" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "נק'" +END + +STRINGTABLE +BEGIN + STRING_DEFAULT_FILENAME, "מסמך" + STRING_PROMPT_SAVE_CHANGES, "שמור שינויים ל '%s'?" + STRING_SEARCH_FINISHED, "סיים לחפש במסמך." + STRING_LOAD_RICHED_FAILED, "נכשלה טעינת ספריית RichEdit." + STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, which will cause all formatting to be lost. Are you sure that you wish to do this?" + STRING_INVALID_NUMBER, "Invalid number format" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_WRITE_FAILED, "Could not save the file." + STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." + STRING_OPEN_FAILED, "Could not open the file." + STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." + STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" + STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." +END + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "שמאל" + STRING_ALIGN_RIGHT, "ימין" + STRING_ALIGN_CENTER, "מרכז" +END diff --git a/reactos/base/applications/wordpad/rsrc.rc b/reactos/base/applications/wordpad/rsrc.rc index 731c56fb1ec..f018a3ae70d 100644 --- a/reactos/base/applications/wordpad/rsrc.rc +++ b/reactos/base/applications/wordpad/rsrc.rc @@ -88,6 +88,9 @@ IDC_ZOOM CURSOR "zoom.cur" #ifdef LANGUAGE_FR_FR #include "Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "It.rc" #endif diff --git a/reactos/base/applications/write/He.rc b/reactos/base/applications/write/He.rc new file mode 100644 index 00000000000..641c9adf742 --- /dev/null +++ b/reactos/base/applications/write/He.rc @@ -0,0 +1,30 @@ +/* + * Hebrew language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Translated by Baruch Rutman 2013 + */ + +#include "resources.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "הפעלת כתבן נכשלה" +} diff --git a/reactos/base/applications/write/rsrc.rc b/reactos/base/applications/write/rsrc.rc index 24c2dc982cd..738241ff10c 100644 --- a/reactos/base/applications/write/rsrc.rc +++ b/reactos/base/applications/write/rsrc.rc @@ -58,6 +58,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "It.rc" #endif diff --git a/reactos/base/setup/reactos/lang/he-IL.rc b/reactos/base/setup/reactos/lang/he-IL.rc new file mode 100644 index 00000000000..bfe03e84bf2 --- /dev/null +++ b/reactos/base/setup/reactos/lang/he-IL.rc @@ -0,0 +1,153 @@ +// Translate by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "You cannot install ReactOS directly from this CD yet! Please restart your computer from this CD in order to install ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Create Partition" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Size:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 + + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Setup partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END +/* EOF */ diff --git a/reactos/base/setup/reactos/rsrc.rc b/reactos/base/setup/reactos/rsrc.rc index 12909930335..fbf8a3804ff 100644 --- a/reactos/base/setup/reactos/rsrc.rc +++ b/reactos/base/setup/reactos/rsrc.rc @@ -4,6 +4,7 @@ /* Language-specific resources */ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -31,6 +32,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif @@ -64,4 +68,3 @@ #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif - diff --git a/reactos/base/setup/usetup/lang/he-IL.h b/reactos/base/setup/usetup/lang/he-IL.h index 9c18824630c..3dba3f8ee15 100644 --- a/reactos/base/setup/usetup/lang/he-IL.h +++ b/reactos/base/setup/usetup/lang/he-IL.h @@ -6,3 +6,1702 @@ MUI_LAYOUTS heILLayouts[] = { L"040D", L"0000040D" }, { NULL, NULL } }; + +static MUI_ENTRY heILLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ReactOS", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 ENTER ReactOS", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair or update ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = R = L = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licensing:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + ":", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + ":", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + ":", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + " :", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + ":", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Accept these device settings", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + ".", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + " ENTER", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = U = R = ENTER = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY heILComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ESC = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + " ReactOS .", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + " ENTER ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY heILSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY heILInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "installation folder.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "This may take several minutes to complete.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 ... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR and VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Skip install bootloader.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ESC = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Please select a layout to be installed by default.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ESC = F3 = ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY heILPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY heILSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY heILRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR heILErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3 = Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup.\n" + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL + }, + { + NULL, + NULL + } +}; + +MUI_PAGE heILPages[] = +{ + { + LANGUAGE_PAGE, + heILLanguagePageEntries + }, + { + START_PAGE, + heILWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + heILIntroPageEntries + }, + { + LICENSE_PAGE, + heILLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + heILDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + heILRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + heILComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + heILDisplayPageEntries + }, + { + FLUSH_PAGE, + heILFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + heILSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + heILSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + heILFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + heILDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + heILInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + heILPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + heILFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + heILKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + heILBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + heILLayoutSettingsEntries + }, + { + QUIT_PAGE, + heILQuitPageEntries + }, + { + SUCCESS_PAGE, + heILSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + heILBootPageEntries + }, + { + REGISTRY_PAGE, + heILRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING heILStrings[] = +{ + {STRING_PLEASEWAIT, + " ..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = C = F3 = "}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = D = F3 = "}, + {STRING_PARTITIONSIZE, + " :"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = ESC = F3 = "}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup installs ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= ENTER = "}, + {STRING_REBOOTCOMPUTER, + "ENTER = "}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " : %S"}, + {STRING_SETUPCOPYINGFILES, + " ..."}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " ..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = "}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, + {STRING_KB, + ""}, + {STRING_MB, + ""}, + {STRING_GB, + ""}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, + {0, 0} +}; diff --git a/reactos/base/setup/usetup/muilanguages.h b/reactos/base/setup/usetup/muilanguages.h index ac2021f6d82..340e49cbbe5 100644 --- a/reactos/base/setup/usetup/muilanguages.h +++ b/reactos/base/setup/usetup/muilanguages.h @@ -619,7 +619,7 @@ const MUI_LANGUAGE LanguageList[] = {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"1", enUSPages, enUSErrorEntries, enUSStrings, HebrewFonts, heILLayouts }, + {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"1", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, #endif #ifdef LANGUAGE_HI_IN {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, diff --git a/reactos/base/setup/vmwinst/lang/he-IL.rc b/reactos/base/setup/vmwinst/lang/he-IL.rc new file mode 100644 index 00000000000..4b21a1f2f45 --- /dev/null +++ b/reactos/base/setup/vmwinst/lang/he-IL.rc @@ -0,0 +1,132 @@ +//Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "תכנית ההתקנה זיהתה שהינך מריץ את ReactOS בתוך VMware(r)", -1, 117, 8, 140, 24 + LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 117, 140, 140, 24 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS Setup doesn't come with the VMware(r) SVGA driver.\n\nTherefore go to 'VM' in your VMware(r) workstation menu bar and select 'Install VMware tools...'\n\n\nClick 'Next' to continue or 'Cancel' to skip the SVGA driver installation.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The VMware(r) SVGA driver has been successfully installed. Please choose your favorite screen resolution:",-1,25,5,225,20 + PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Please select your favorite color quality:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS Setup was unable to install the VMware(r) SVGA driver.\n\n\nClick 'Finish' to continue the installation process.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The VMware(r) SVGA driver is already installed.\n\nPlease choose what you like to do:",-1,25,5,225,30 + PUSHBUTTON "Configure the screen settings", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Use a different graphics driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Uninstall the VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 19 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Please select the graphics driver you would like to use:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Driver", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Driver (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Click 'Finish' to complete the operation or 'Cancel' to exit the setup without changes.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "התקנת מנהל ההתקן של כרטיס המסך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS setup is about to uninstall your VMware(r) SVGA driver!!!\n\n\nClick 'Finish' to uninstall the driver or 'Cancel' to leave it as it is.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) detected" + IDS_FAILEDTOLOCATEDRIVERS "The ReactOS Setup couldn't find the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted." + IDS_FAILEDTOCOPYFILES "The ReactOS Setup failed to copy the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted.\n" + IDS_FAILEDTOACTIVATEDRIVER "Failed to activate the VMware(r) SVGA driver!" + IDS_FAILEDTOSELVGADRIVER "Failed to activate the ReactOS VGA driver!" + IDS_FAILEDTOSELVBEDRIVER "Failed to activate the ReactOS VBE driver!" + IDS_UNINSTNOTICE "The VMware(r) SVGA driver files have not yet been deleted.\nPlease delete them manually after a system reboot." + IDS_FAILEDTOADDREGENTRIES "Failed to create registry entries for the VMware(r) SVGA driver!" +END + +STRINGTABLE +BEGIN + 10001 "Lowest (8BPP)" + 10002 "Medium (16BPP)" + 10003 "Highest (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Searching for VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "Copying files..." + IDS_ENABLINGDRIVER "Enabling VMware(r) SVGA driver..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Please insert the VMware tool CD-Rom." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Search and copy the VMware (r) SVGA driver." + IDD_CONFIGTITLE "VMware (r) SVGA driver installation wizard" + IDD_CONFIGSUBTITLE "Select your favorite screen resolution." + IDD_INSTALLATION_FAILEDTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSTALLATION_FAILEDSUBTITLE "The VMware (r) SVGA driver installation failed." + IDD_CHOOSEACTIONTITLE "VMware (r) SVGA driver installation wizard" + IDD_CHOOSEACTIONSUBTITLE "Choose what you like to do." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA driver installation wizard" + IDD_SELECTDRIVERSUBTITLE "Select a driver." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA driver installation wizard" + IDD_DOUNINSTALLSUBTITLE "Uninstall the driver." +END diff --git a/reactos/base/setup/vmwinst/rsrc.rc b/reactos/base/setup/vmwinst/rsrc.rc index 32438a9078e..434db264857 100644 --- a/reactos/base/setup/vmwinst/rsrc.rc +++ b/reactos/base/setup/vmwinst/rsrc.rc @@ -38,6 +38,9 @@ IDB_HEADER BITMAP "resources/header.bmp" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/setup/welcome/lang/he-IL.rc b/reactos/base/setup/welcome/lang/he-IL.rc new file mode 100644 index 00000000000..0c84c8fef31 --- /dev/null +++ b/reactos/base/setup/welcome/lang/he-IL.rc @@ -0,0 +1,62 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ברוכים הבאים - ReactOS" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "ברוכים הבאים למערכת ההפעלה React,\nבחר נושא מצד ימין" +// IDS_CHECKTEXT "הראה חלון זה שוב" +// IDS_CLOSETEXT "יציאה" +END +/* The topic pane needs to be in the right side because Hebrew is written in opposite of english */ + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "התקנת ReactOS" + IDS_TOPICBUTTON1 "סייר בתוכן הדיסק" + IDS_TOPICBUTTON2 "יציאה" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "התקנת ReactOS" + IDS_TOPICTITLE1 "סייר בתוכן הדיסק" + IDS_TOPICTITLE2 "יציאה" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "צור התקנה חדשה של ReactOS במחשבך או שדרג את ההתקנה הנוכחית." + IDS_TOPICDESC1 "סייר בתוכן הדיסק." + IDS_TOPICDESC2 "לחץ כדי לסגור יישום זה." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ diff --git a/reactos/base/setup/welcome/rsrc.rc b/reactos/base/setup/welcome/rsrc.rc index ffedc74d915..9cf1bbe0579 100644 --- a/reactos/base/setup/welcome/rsrc.rc +++ b/reactos/base/setup/welcome/rsrc.rc @@ -68,6 +68,9 @@ END #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/shell/explorer-new/explorer.rc b/reactos/base/shell/explorer-new/explorer.rc index 820db57fa05..c72ecda8b43 100644 --- a/reactos/base/shell/explorer-new/explorer.rc +++ b/reactos/base/shell/explorer-new/explorer.rc @@ -42,6 +42,9 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/base/shell/explorer-new/lang/he-IL.rc b/reactos/base/shell/explorer-new/lang/he-IL.rc new file mode 100644 index 00000000000..629cd0df1a3 --- /dev/null +++ b/reactos/base/shell/explorer-new/lang/he-IL.rc @@ -0,0 +1,147 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM SEPARATOR + MENUITEM "התאם תאריך/שעה", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "התאם הודעות...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM SEPARATOR + MENUITEM "חלונות מדורגים", ID_SHELL_CMD_CASCADE_WND + MENUITEM "הצג חלונות מוערמים", ID_SHELL_CMD_TILE_WND_H + MENUITEM "הצג חולונות זה לצד זה", ID_SHELL_CMD_TILE_WND_V + MENUITEM "הצג את שולחן העבודה", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "בטל", ID_SHELL_CMD_UNDO_ACTION + MENUITEM SEPARATOR + MENUITEM "מנהל המשימות", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM SEPARATOR + MENUITEM "נעל את שורת המשימות", ID_LOCKTASKBAR + MENUITEM "מאפיינים", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "כל התכניות", IDM_PROGRAMS + BEGIN + MENUITEM "(ריק)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "מועדפים", IDM_FAVORITES + BEGIN + MENUITEM "(ריק)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "מסמכים", IDM_DOCUMENTS + BEGIN + MENUITEM "(ריק)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "הגדרות", IDM_SETTINGS + BEGIN + MENUITEM "לוח הבקרה", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "אבטחה", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "חיבורי רשת", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "מדפסות ופקסים", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "שורת המשימות ותפריט התחל", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "חיפוש", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "עזרה ותמיכה", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "הפעל...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "סנכרן", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "נתק את %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "התנתק...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Undock Comput&er", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "כיבוי...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "שורת המשימות" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "מראה שורת המשימות", IDC_STATIC, 6,6,240,104 + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 + AUTOCHECKBOX "נעל את שורת המשימות", IDC_TASKBARPROP_LOCK, 13,45,200,10 + AUTOCHECKBOX "הסתר אוטמטית את שורת המשימות", IDC_TASKBARPROP_HIDE, 13,58,200,10 + AUTOCHECKBOX "השאר את שורת המשימות תמיד מעל", IDC_TASKBARPROP_ONTOP, 13,71,200,10 + AUTOCHECKBOX "קבץ לחצנים דומים", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "הראה את סרגל הפעלה מהירה", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "תפריט התחל" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "תפריט התחל", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "תפריט התחל קלאסי", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "פרטיות",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אזור ההודעות" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "סמלים", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "החבא סמלים לא פעילים", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "סמלי המערכת", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "בקרת עוצמה", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "רשת", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "צריכת חשמל", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "סרגלי כלים" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "אפשרויות מתקדמות", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "הראה שניות", IDC_TASKBARPROP_SECONDS, 13,18,200,10 + AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "התחל" + IDS_PROPERTIES "מאפיינים" + IDS_OPEN_ALL_USERS "פתח את כל המשתמשים" + IDS_EXPLORE_ALL_USERS "סייר בכל המשתמשים" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" +END diff --git a/reactos/base/system/rundll32/lang/he-IL.rc b/reactos/base/system/rundll32/lang/he-IL.rc new file mode 100644 index 00000000000..0aba4c581bb --- /dev/null +++ b/reactos/base/system/rundll32/lang/he-IL.rc @@ -0,0 +1,10 @@ +/* +* Traslated by Baruch Rutman + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + IDS_DllNotLoaded, "טעינת ספרייה '%s' נכשלה" + IDS_MissingEntry, "חסרה נקודת כניסה:%s\nב %s" +END diff --git a/reactos/base/system/rundll32/rsrc.rc b/reactos/base/system/rundll32/rsrc.rc index cda79842319..3ccfa685a0f 100644 --- a/reactos/base/system/rundll32/rsrc.rc +++ b/reactos/base/system/rundll32/rsrc.rc @@ -26,6 +26,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/system/runonce/lang/he-IL.rc b/reactos/base/system/runonce/lang/he-IL.rc new file mode 100644 index 00000000000..e119fc0863c --- /dev/null +++ b/reactos/base/system/runonce/lang/he-IL.rc @@ -0,0 +1,11 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_RUNONCE_DLG DIALOG DISCARDABLE 0, 0, 239, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "התקנת ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS מגדירה כעת את הפריטים באים:", -1, 38, 8, 196, 18 + LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 5, 6, 21, 20 +END diff --git a/reactos/base/system/runonce/rsrc.rc b/reactos/base/system/runonce/rsrc.rc index 0120760e882..fbd57de54a6 100644 --- a/reactos/base/system/runonce/rsrc.rc +++ b/reactos/base/system/runonce/rsrc.rc @@ -12,6 +12,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif diff --git a/reactos/base/system/userinit/lang/he-IL.rc b/reactos/base/system/userinit/lang/he-IL.rc new file mode 100644 index 00000000000..45184940882 --- /dev/null +++ b/reactos/base/system/userinit/lang/he-IL.rc @@ -0,0 +1,11 @@ +/* + * HEB + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +STRING_USERINIT_FAIL, "Userinit נכשל להפעיל את הממשק!\n" + +END diff --git a/reactos/base/system/userinit/rsrc.rc b/reactos/base/system/userinit/rsrc.rc index 31fb70ceaf9..ef846ddf123 100644 --- a/reactos/base/system/userinit/rsrc.rc +++ b/reactos/base/system/userinit/rsrc.rc @@ -27,6 +27,9 @@ LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/base/system/winlogon/lang/he-IL.rc b/reactos/base/system/winlogon/lang/he-IL.rc new file mode 100644 index 00000000000..14effd44c4a --- /dev/null +++ b/reactos/base/system/winlogon/lang/he-IL.rc @@ -0,0 +1,45 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "כיבוי המחשב" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "עכשיו זה בטוח לכבות את מחשבך.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "הפעל מחדש", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "שגיאת ממשק משתמש" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "The Logon User Interface DLL %s failed to load.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Contact your system administrator to replace the DLL, or restore the original DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "הפעל מחדש", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "מכין חיבורי רשת..." + IDS_APPLYINGCOMPUTERSETTINGS "מחיל הגדרות מחשב..." + IDS_RUNNINGSTARTUPSCRIPTS "מריץ תסריטי הפעלה..." + IDS_RUNNINGSHUTDOWNSCRIPTS "מריץ תסריטי כיבוי..." + IDS_APPLYINGYOURPERSONALSETTINGS "מחיל את הגדרותיך האישיות..." + IDS_RUNNINGLOGOFFSCRIPTS "מריץ תסריטי התנתקות..." + IDS_RUNNINGLOGONSCRIPTS "מריץ תסריטי התחברות..." + IDS_LOADINGYOURPERSONALSETTINGS "טוען את הגדרותיך האישיות..." + IDS_CLOSINGNETWORKCONNECTIONS "סוגר חיבורי רשת..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS מתכבה..." + IDS_PREPARETOSTANDBY "מתכונן להמתנה..." + IDS_PREPARETOHIBERNATE "מתכונן לשינה..." + IDS_SAVEYOURSETTINGS "שומר את הגדרותיך..." + IDS_REACTOSISSTARTINGUP "ReactOS מופעל..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon נכשל להפעיל את ממשק המשתמש!" +END + diff --git a/reactos/base/system/winlogon/rsrc.rc b/reactos/base/system/winlogon/rsrc.rc index e9ec68a7dd1..e5fc3e3a77b 100644 --- a/reactos/base/system/winlogon/rsrc.rc +++ b/reactos/base/system/winlogon/rsrc.rc @@ -7,6 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -28,6 +29,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif index a7c106a23d0..b34c51ef883 100644 --- a/reactos/boot/bootdata/txtsetup.sif +++ b/reactos/boot/bootdata/txtsetup.sif @@ -266,7 +266,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00001407 = "German (Liechtenstein)" 00000408 = "Greek" ;00000447 = "Gujarati (India)" -;0000040D = "Hebrew" +0000040D = "Hebrew" ;00000439 = "Hindi" 0000040E = "Hungarian" 0000040F = "Icelandic" diff --git a/reactos/dll/cpl/access/lang/he-IL.rc b/reactos/dll/cpl/access/lang/he-IL.rc new file mode 100644 index 00000000000..8f2e291dc13 --- /dev/null +++ b/reactos/dll/cpl/access/lang/he-IL.rc @@ -0,0 +1,305 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מקלדת" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "מקשים דביקים",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "השתמש במקשים דביקים",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "FilterKeys",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 + + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צליל" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "שומר קולי",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) + LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "השתמש בשומר הקולי",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "השתמש באזהרות הבאות:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תצןגה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "ניגודיות גבוהה",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "השתמש בניגודיות גבוהה",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "אפשרויות מצביע",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "מהירות הבהוב:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "בלי",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "מהיר",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + CTEXT "רוחב מצביע:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "צר",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "רחב",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 +END + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "עכבר" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "MouseKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "איפוס אוטומטי",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "התראות",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "הגדרות",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 + + GROUPBOX "הגדרות מנהליות",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 +END + + +IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות מקשים דביקים" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "מקשים",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "הפעל מקשים דביקים.",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "אפשרויות",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "התראות",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות מקשי סינון" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "קיצורי מקלדת",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for FilterKeys is: \nHold down for eight seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + + GROUPBOX "אפשרויות סינון",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "Ign&ore repeated keystrokes",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "Ig&nore quick keystrokes and slow down the repeat rate",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "הגדרות",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "הגדרות",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP + LTEXT "&Click here and type here to test the settings:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL + + GROUPBOX "התראות",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Toggle Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרות ניגודיות גבוהה" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "קיצורי מקלדת",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress .",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress .",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "מהירות מצביע",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "המהירות הכי גבוהה:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "נמוכה",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "גבוהה",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "האצה:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "איטית",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "מהירה",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "פועל",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "לא פועל",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "אזור בדיקה:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Baud rate:",-1,PROPSHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + DEFPUSHBUTTON "אישור", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "נגישות" + IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." + + IDS_SENTRY_NONE "[ללא]" + IDS_SENTRY_TITLE "הבהב את כותרת החלון" + IDS_SENTRY_WINDOW "הבהב את החלון הפעיל" + IDS_SENTRY_DISPLAY "הבהב את שולחן העבודה" + + IDS_SECONDS "שניות" + IDS_MINUTES "דקות" +END diff --git a/reactos/dll/cpl/access/rsrc.rc b/reactos/dll/cpl/access/rsrc.rc index 2a0a78872fc..4a4b575b604 100644 --- a/reactos/dll/cpl/access/rsrc.rc +++ b/reactos/dll/cpl/access/rsrc.rc @@ -46,6 +46,10 @@ // UTF-8 #pragma code_page(65001) + +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif diff --git a/reactos/dll/cpl/appwiz/lang/he-IL.rc b/reactos/dll/cpl/appwiz/lang/he-IL.rc new file mode 100644 index 00000000000..e7b47697164 --- /dev/null +++ b/reactos/dll/cpl/appwiz/lang/he-IL.rc @@ -0,0 +1,51 @@ +// Traslated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צור קישור" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צור קישור" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צור קיצור דרך" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "בחירת שם לתכנית" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "הקלד שם עבור קיצור דרך זה:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "לחץ על סיום כדי ליצור את קיצור הדרך.", -1, 118, 97, 178, 17 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "הוספת/הסרת תכניות" + IDS_CPLSYSTEMDESCRIPTION "מגדיר תכניות ויוצר קישורי דרך." + IDS_CREATE_SHORTCUT "צור קיצור דרך" + IDS_ERROR_NOT_FOUND "הקובץ %s לא נמצא." +END diff --git a/reactos/dll/cpl/appwiz/rsrc.rc b/reactos/dll/cpl/appwiz/rsrc.rc index c23a772e20b..10e56c616cd 100644 --- a/reactos/dll/cpl/appwiz/rsrc.rc +++ b/reactos/dll/cpl/appwiz/rsrc.rc @@ -37,6 +37,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/console/lang/he-IL.rc b/reactos/dll/cpl/console/lang/he-IL.rc new file mode 100644 index 00000000000..033d2b6ae6b --- /dev/null +++ b/reactos/dll/cpl/console/lang/he-IL.rc @@ -0,0 +1,150 @@ +/* + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/console/lang/he-IL.rc + * PURPOSE: Hebrew resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald@student.tugraz.at) + * TRANSLATORS: Baruch Rutman (peterooch@gmail.com) + */ + +#include + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "אפשרויות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "גודל סמן", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "קטן", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "בינוני", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "גדול", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "אפשרויות תצוגה", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "חלון", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "מסך מלא", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "היסטוריית פקודות:", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "גודל מתווך:", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "מספר המתווכים:", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "אפשרויות עריכה", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "גופן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "תצוגה מקדימה:", -1, 10, 10, 94, 10 + LTEXT "גודל:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "גופן:", -1, 10, 105, 33, 10 + CHECKBOX "גופנים מודגשים", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Each character is:", -1, 124, 166, 75, 10 + LTEXT "screen pixel wide\nscreen pixel high", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "תצורה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "תצוגה מקדימה:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "גודל מתווך המסך", -1, 130, 12, 115, 50 + LTEXT "רוחב:", -1, 140, 28, 40, 10 + LTEXT "גובה:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "גודל חלון", -1, 130, 65, 115, 47 + LTEXT "רוחב:", -1, 140, 78, 39, 10 + LTEXT "גובה:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "מיקום החלון", -1, 130, 116, 115, 64 + LTEXT "שמאל:", -1, 140, 132, 38, 10 + LTEXT "עליון:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "תן למערכת למקם את החלון.", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "צבעים" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "טקסט של המסך", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "רקע מסך", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "טקסט של חלון קופץ", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "רקע של חלון קופץ", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "ערכי הצבעים הנבחרים", -1, 129, 7, 118, 73 + LTEXT "אדום:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "ירוק:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "כחול:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "צבעי מסך נבחרים", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "צבעי חלונות קופצים נבחרים", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 +END + +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "החלת מאפיינים" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "החל מאפיינים לחון הנוכחי בלבד", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "שמור שינויים לחלונות עם אותה כותרת", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "אישור", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "שורת הפקודה" + IDS_CPLDESCRIPTION "Configures console properties." + IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" + IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" + IDS_RASTERFONTS "Raster Fonts" +END diff --git a/reactos/dll/cpl/console/rsrc.rc b/reactos/dll/cpl/console/rsrc.rc index c8cc349c743..2d3ff18dddb 100644 --- a/reactos/dll/cpl/console/rsrc.rc +++ b/reactos/dll/cpl/console/rsrc.rc @@ -39,6 +39,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/desk/lang/he-IL.rc b/reactos/dll/cpl/desk/lang/he-IL.rc new file mode 100644 index 00000000000..9e22c93c2cd --- /dev/null +++ b/reactos/dll/cpl/desk/lang/he-IL.rc @@ -0,0 +1,267 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "רקע" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "בחר תמונה שתשמש כרקע שולחן העבודה שלך:", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "סייר...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "צבע...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "מיקום", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "שומר מסך" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "שומר מסך", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "הגדרות", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "תצוגה מקדימה", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "חכה", IDC_WAITTEXT, 14, 125, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 54, 123, 12, 13 + LTEXT "דקות", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "שאל לסיסמה בעת חידוש", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + IDC_STATIC, 14, 166, 146, 20 + PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מראה" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "סגנון חזותי", IDC_STATIC, 7, 130, 64, 7 + COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "ערכת צבעים", IDC_STATIC, 7, 160, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "אפקטים...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "מתקדם...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "מראה מתקדם" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "גודל", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "צבע ראשון", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "צבע שני", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "גופן", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "גודל גופן", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + + LTEXT "צבע", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "ביטול", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "אישור", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "אפקטים" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "השתמש בסמלים גדולים",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "ביטול", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "אישור", IDOK, 172, 165, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "הגדרות" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,20 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,23,240,82,WS_EX_CLIENTEDGE + LTEXT "תצוגה:",1820,3,107,30,8 + LTEXT "",IDC_SETTINGS_DEVICE,9,116,224,8 + GROUPBOX "גודל תצוגה:",1818,3,127,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 + LTEXT "פחות",1815,9,137,15,8,NOT WS_GROUP + LTEXT "יותר",1816,93,137,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "צבעים",1817,125,127,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,155,103,9 + PUSHBUTTON "מתקדם...",IDC_SETTINGS_ADVANCED,170,174,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "תצוגה", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "גודל גופן", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "תאימות", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(צגים מרובים)" + IDS_UNKNOWNMONITOR "(צג לא ידוע)" + IDS_ADVANCEDTITLEFMT "%s ו %s" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "תצוגה" + IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_NONE "(ללא)" + IDS_CENTER "מרכז" + IDS_STRETCH "מתח" + IDS_TILE "פרוש" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 צבעים" + IDS_COLOR_8BIT "256 צבעים" + IDS_COLOR_16BIT "רמת צבעים גבוהה (16 Bit)" + IDS_COLOR_24BIT "צבע אמיתי (24 Bit)" + IDS_COLOR_32BIT "צבע אמיתי (32 Bit)" + IDS_PIXEL "%lux%lu פיקסל" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "תמונות (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "חלון לא פעיל" + IDS_ACTWIN "חלון פעיל" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "אישור" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "שולחן עבודה" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "תפריט" + IDS_ELEMENT_7 "פריטים נבחרים" + IDS_ELEMENT_8 "חלונות" + IDS_ELEMENT_9 "סרגלי גלילה" + IDS_ELEMENT_10 "עצמים תלת מימדיים" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "תיבת דו שיח" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DISPLAY_SETTINGS "הגדרות תצוגה" + IDS_APPLY_FAILED "Failed to apply new settings..." + IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." +END diff --git a/reactos/dll/cpl/desk/rsrc.rc b/reactos/dll/cpl/desk/rsrc.rc index 85d05a2cb5c..106d4bb6e39 100644 --- a/reactos/dll/cpl/desk/rsrc.rc +++ b/reactos/dll/cpl/desk/rsrc.rc @@ -52,6 +52,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/hdwwiz/lang/he-IL.rc b/reactos/dll/cpl/hdwwiz/lang/he-IL.rc new file mode 100644 index 00000000000..8c3fa4f05f0 --- /dev/null +++ b/reactos/dll/cpl/hdwwiz/lang/he-IL.rc @@ -0,0 +1,148 @@ +// Traslated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ברוכים הבאים לאשף הוספת החומרה", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "אשף זה יעזור לכם ב:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 + LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 + LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 +END + +IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 + LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP +END + +IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 + LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 +END + +IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 +END + +IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 + LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 + LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX + CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END + +IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 +END + +IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 + LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 +END + +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אשף הוספת החומרה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "הוסף חומרה" + IDS_CPLDESCRIPTION "הוסף חומרה למחשבך." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "האם החמורה מחוברת?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" + IDS_ADDNEWDEVICE "הוסף התקן חומרה חדש" + IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" +END diff --git a/reactos/dll/cpl/hdwwiz/rsrc.rc b/reactos/dll/cpl/hdwwiz/rsrc.rc index adb0554adb3..88921192c31 100644 --- a/reactos/dll/cpl/hdwwiz/rsrc.rc +++ b/reactos/dll/cpl/hdwwiz/rsrc.rc @@ -55,6 +55,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/inetcpl/lang/He.rc b/reactos/dll/cpl/inetcpl/lang/He.rc index a6dc8d44686..0f00ef5e599 100644 --- a/reactos/dll/cpl/inetcpl/lang/He.rc +++ b/reactos/dll/cpl/inetcpl/lang/He.rc @@ -4,6 +4,8 @@ * Copyright 2010 Detlef Riekenberg * Copyright 2010 Yaron Shahrabani * + * Updated by Baruch Rutman + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -41,11 +43,11 @@ BEGIN PUSHBUTTON "העמוד ה&נוכחי", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "עמוד &בררת המחדל", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "עמוד &ריק", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " היסטורית גלישה ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "הינך יכול למחוק את המטמון, עוגיות, היסוריה ועוד ...", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "מחק קבצים...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "הגדרות...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END @@ -61,19 +63,19 @@ BEGIN LTEXT "אישורים משמשים כדי לזהות אותך וגם כדי לזהות רשויות ומפיצים.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "אישורים...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "מפיצים...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "מפיצים...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" + IDS_CPL_NAME "הגדרות אינטרנט" + IDS_CPL_INFO "הגדר את דפדפן האינטרנט של Wine והגדרות קשורות." + IDS_SEC_SETTINGS "הגדרת אבטחה לאזור זה: " + IDS_SEC_LEVEL0 "מותאמת" + IDS_SEC_LEVEL1 "מאוד נמוכה" + IDS_SEC_LEVEL2 "נמוכה" + IDS_SEC_LEVEL3 "בינונית" + IDS_SEC_LEVEL4 "בינונית -גבוהה" + IDS_SEC_LEVEL5 "גבוהה" END diff --git a/reactos/dll/cpl/input/lang/he-IL.rc b/reactos/dll/cpl/input/lang/he-IL.rc new file mode 100644 index 00000000000..d1495798baa --- /dev/null +++ b/reactos/dll/cpl/input/lang/he-IL.rc @@ -0,0 +1,252 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "הגדרות" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 + PUSHBUTTON "קבע כברירת מחדל...", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "הוסף...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "הסר...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "מאפיניים...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "העדפות", -1, 7, 185, 240, 36 + PUSHBUTTON "הגדרות מקשים...", IDC_KEY_SET_BTN, 14, 198, 110, 14 +END + +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "הגדרות מתקדמות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "הגדרת מערכת", -1, 7, 7, 240, 70 + AUTOCHECKBOX "כבה שירותי טסקס מתקמים", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + +IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הגדרות מקשים מתקדמות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "כדי לכבות את מקש CAPS LOCK", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "לחץ על מקש CAPS LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "לחץ על מקש SHIFT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Hot keys for input languages", -1, 7, 37, 258, 95 + LTEXT "פעולה", -1, 14, 47, 60, 9 + RTEXT "רצף מקשים", -1, 177, 47, 79, 9 + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE + PUSHBUTTON "שנה רצף מקשים...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "אישור", IDOK, 66, 140, 70, 14 + PUSHBUTTON "ביטול", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOGEX 20, 20, 227, 90 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הוספת שפת כתיבה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שפת כתיבה:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "אישור", IDOK, 116, 68, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 169, 68, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "שינוי רצף מקשים" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "אישור", IDOK, 172, 9, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 172, 27, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "מאפייני שפת כתיבה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שפת כתיבה:", -1, 7, 7, 61, 8 + LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 + LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "אישור", IDOK, 116, 53, 52, 14 + PUSHBUTTON "ביטול", IDCANCEL, 169, 53, 52, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Text Services and Input Languages" + IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." + IDS_KEYBOARD "מקלדת" + IDS_NONE "(ללא)" + IDS_UNKNOWN "(לא ידוע)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_WHATS_THIS "מה זה?" + IDS_LANGUAGE "שפה" + IDS_LAYOUT "תצורת מקשים" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "אישור" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "החלף בין שפות כתיבה" +END + +STRINGTABLE +BEGIN + IDS_ALBANIAN_LAYOUT, "אלבנית" + IDS_ARABIC_101_LAYOUT, "ערבית (101)" + IDS_ARABIC_102_LAYOUT, "ערבית (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "ערבית (102) AZERTY" + IDS_ARMENIAN_EASTERN_LAYOUT, "ארמנית מזרחית" + IDS_ARMENIAN_WESTERN_LAYOUT, "ארמנית מערבית" + IDS_ASSAMESE_LAYOUT, "אסמית" + IDS_AZERI_CYRILLIC_LAYOUT, "אזרית קירילית" + IDS_AZERI_LATIN_LAYOUT, "אזרית לטינית" + IDS_BELARUSIAN_LAYOUT, "בלארוסית" + IDS_BELGIAN_COMMA_LAYOUT, "בלגית (פסיק)" + IDS_BELGIAN_FRENCH_LAYOUT, "צרפית בלגית" + IDS_BELGIAN_LAYOUT, "בלגית (נקודה)" + IDS_BENGALI_LAYOUT, "בנגלית" + IDS_BULGARIAN_LAYOUT, "בולגרית" + IDS_BULGARIAN_BDS_LAYOUT, "בולגרית BDS 5237-1978" + IDS_BULGARIAN_LATIN_LAYOUT, "בולגרית (לטינית)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "בולגרית פונטית (BDS 5237-1978)" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "בולגרית פונטית (קלאסית)" + IDS_BURMESE_LAYOUT, "בורמזית" + IDS_CANADIAN_FRENCH_LAYOUT, "צרפתית קנדית" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "צרפתית קנדית (Legacy)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CANTONESE_PHONETIC_LAYOUT, "קטונית פונטית" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "סינית (מופשטת) - Microsoft Pinyin IME 3.0" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "סינית (מופשטת) - NeiMa" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "סינית (מופשטת) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "סינית (מופשטת) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "סינית (מופשטת) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "סינית (מופשטת) - ZhengMa" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "סינית (מסורתית) - Alphanumeric" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "סינית (מסורתית) - Array" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "סינית (מסורתית) - Big5 Code" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "סינית (מסורתית) - ChangJie" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "סינית (מסורתית) - DaYi" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "סינית (מסורתית) - New ChangJie" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "סינית (מסורתית) - New Phonetic" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "סינית (מסורתית) - Phonetic" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "סינית (מסורתית) - Quick" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "סינית (מסורתית) - Unicode" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "סינית (מסורתית) - US Keyboard" + IDS_CROATIAN_LAYOUT, "קרואטית" + IDS_CZECH_LAYOUT, "צ'כית" + IDS_CZECH_PROGRAMMERS_LAYOUT, "צ'כית מתכנתים" + IDS_CZECH_QWERTY_LAYOUT, "צ'כית (QWERTY)" + IDS_DANISH_LAYOUT, "דנית" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" + IDS_DUTCH_LAYOUT, "הולנדית" + IDS_ESTONIAN_LAYOUT, "אסטונית" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FARSI_LAYOUT, "פרסית" + IDS_FINNISH_LAYOUT, "פינית" + IDS_FRENCH_LAYOUT, "צרפתית" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_GEORGIAN_LAYOUT, "גאורגית" + IDS_GERMAN_LAYOUT, "גרמנית" + IDS_GERMAN_DE_ERGO_LAYOUT, "גרמנית (de_ergo)" + IDS_GERMAN_IBM_LAYOUT, "גרמנית (IBM)" + IDS_GERMAN_NEO_11_LAYOUT, "גרמנית (NEO-1.1)" + IDS_GERMAN_RISTOME_LAYOUT, "גרמנית (RISTOME)" + IDS_GREEK_LAYOUT, "יוונית" + IDS_GREEK_220_LAYOUT, "יוונית (220)" + IDS_GREEK_220_LATIN_LAYOUT, "יוונית (220) לטינית" + IDS_GREEK_319_LAYOUT, "יוונית (319)" + IDS_GREEK_319_LATIN_LAYOUT, "יוונית (319) לטינית" + IDS_GREEK_LATIN_LAYOUT, "יוונית לטינית" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_HEBREW_LAYOUT, "עברית" // HEBREW!!! + IDS_HINDI_TRADITIONAL_LAYOUT, "הינדית מסורתית" + IDS_HUNGARIAN_LAYOUT, "הונגרית" + IDS_HUNGARIAN_101_KEY_LAYOUT, "הונגרית 101 מקשים" + IDS_ICELANDIC_LAYOUT, "איסלנדית" + IDS_IRISH_LAYOUT, "אירית" + IDS_ITALIAN_LAYOUT, "איטלקית" + IDS_ITALIAN_142_LAYOUT, "איטלקית (142)" + IDS_JAPANESE_LAYOUT, "יפנית" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "שיטת הזנה יפנית (MS-IME2002)" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_KAZAKH_LAYOUT, "קזחית" + IDS_KOREAN_LAYOUT, "קוריאנית" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "שיטת הזנה קוריאנית (MS-IME2002)" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_LATIN_AMERICAN_LAYOUT, "אמריקה הלטינית" + IDS_LATVIAN_LAYOUT, "לטבית" + IDS_LATVIAN_QWERTY_LAYOUT, "לטבית (QWERTY)" + IDS_LITHUANIAN_LAYOUT, "ליטאית" + IDS_LITHUANIAN_IBM_LAYOUT, "ליטאית IBM" + IDS_FYRO_MACEDONIAN_LAYOUT, "מקדונית FYRO" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "מונגולית קירילית" + IDS_NORWEGIAN_LAYOUT, "נורבגית" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_POLISH_214_LAYOUT, "פולנית (214)" + IDS_POLISH_LAYOUT, "פולנית (מתכנתים)" + IDS_PORTUGUESE_LAYOUT, "פורטוגזית" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "פורטוגזית (ברזילאית ABNT)" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "פורטוגזית (ברזלאית ABNT2)" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_ROMANIAN_LAYOUT, "רומנית" + IDS_RUSSIAN_LAYOUT, "רוסית" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "רוסית (מכונת כתיבה)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "סרבית (קירילית)" + IDS_SERBIAN_LATIN_LAYOUT, "סרבית (לטינית)" + IDS_SLOVAK_LAYOUT, "סלובקית" + IDS_SLOVAK_QWERTY_LAYOUT, "סלובקית (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "סלובנית" + IDS_SPANISH_LAYOUT, "ספרדית" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "שוודית" + IDS_SWISS_FRENCH_LAYOUT, "צרפתית שווצרית" + IDS_SWISS_GERMAN_LAYOUT, "גרמנית שווצרית" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_TAMIL_LAYOUT, "טמיל" + IDS_TATAR_LAYOUT, "טטרית" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_TURKISH_F_LAYOUT, "טורקית F" + IDS_TURKISH_Q_LAYOUT, "טורקית Q" + IDS_UKRAINIAN_LAYOUT, "אוקראינית" + IDS_UKRAINIAN_STUDENT_LAYOUT, "אוקראינית (Student)" + IDS_UNITED_KINGDOM_LAYOUT, "בריטניה" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "ארצות הברית-Dvorak" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "ארצות הברית-Dvorak לשמאליים" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ארצות הברית-Dvorak לימניים" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "ארצות הברית - בינלאומי" + IDS_URDU_LAYOUT, "Urdu" + IDS_US_LAYOUT, "ארצות הברית" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_UZBEK_CYRILLIC_LAYOUT, "אוזבקית קירילית" + IDS_VIETNAMESE_LAYOUT, "ויאטנמית" +END diff --git a/reactos/dll/cpl/input/rsrc.rc b/reactos/dll/cpl/input/rsrc.rc index 473cfe093a6..e984e0dd41e 100644 --- a/reactos/dll/cpl/input/rsrc.rc +++ b/reactos/dll/cpl/input/rsrc.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/dll/cpl/intl/lang/he-IL.rc b/reactos/dll/cpl/intl/lang/he-IL.rc new file mode 100644 index 00000000000..aef0c2c15fa --- /dev/null +++ b/reactos/dll/cpl/intl/lang/he-IL.rc @@ -0,0 +1,200 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "אפשרויות אזורית" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "סטנדרטים ועיצובי", -1, 5, 5, 234, 162 + LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 + LTEXT "Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "התאם...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "דוגמאות", -1, 14, 73, 70, 10 + LTEXT "מספרים:", -1, 16, 86, 48, 10 + LTEXT "מטבע:", -1, 16, 101, 48, 10 + LTEXT "זמן:", -1, 16, 116, 48, 10 + LTEXT "תאריך קצר:", -1, 16, 131, 48, 10 + LTEXT "תאריך ערוך:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + GROUPBOX "מיקום גאוגרפי", -1, 5, 172, 234, 55 + LTEXT "Set up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "שפות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Text input languages and services", -1, 5, 5, 234, 52 + LTEXT "To view or change language or text input methods press ""Details...""", -1, 12, 15, 220, 18 + PUSHBUTTON "תכונות...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "Additional language support", -1, 5, 62, 234, 82 + LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18 + CHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE + CHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE +END + +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Language for non-Unicode programs", -1, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 + LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 + GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 + GROUPBOX "Default user account settings", -1, 5, 193, 234, 30 + CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מספרים" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "דוגמת מראה", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "חיובי:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "שלילי:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "סימול עשרוני:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "No. of digi&ts after decimal:", -1, 8, 83, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Digit &grouping symbol:", -1, 8, 100, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "D&igit grouping:", -1, 8, 117, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "N&egative sign symbol:", -1, 8, 134, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Negative number &format:", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Display leading &zeros:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&List separator:", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "שיטת מדידה:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מטבע" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "דוגמת מראה", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "חיובי:", -1, 13, 21, 27, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "שלילי:", -1, 120, 21, 30, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "סמל מטבע:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "כמות חיובי:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "כמות שלילית:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "מפריד עשרוני:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 10, 156, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "D&igit grouping:", -1, 10, 173, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "זמן" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "דוגמת מראה", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "דוגמת זמן:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "פורמט זמן:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "הפרדת זמן:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "A&M symbol:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&PM symbol:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE + LTEXT "Time format notation\n\n\ +h = hour m = minute s = second t = am or pm\n\n\ +h = 12 hour H = 24 hour\n\ +hh, mm, ss = leading zero h, m, s = no leading zero", + -1, 13, 150, 214, 50, WS_CHILD | WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תאריך" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "לוח שנה", -1, 7, 7, 230, 74 + LTEXT "If year is typed as two digits, then assume it is a year between:", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "ו", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "סוג לוח שנה:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "לוח שנה מוסלמי:", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + GROUPBOX "פורמט זמן קצר", -1, 7, 83, 230, 81 + LTEXT "דוגמה:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "דוגמה - קריאה מימין לשמאל:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED + LTEXT "פורמט קצר:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "מפריד מרכיבי תאריך:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "פורמט זמן ארוך:", -1, 7, 167, 230, 64 + LTEXT "דוגמה:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP + LTEXT "דוגמה - קריאה מימין לשמאל:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED + LTEXT "פורמט ארוך:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "סידור" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "סידו", -1, 7, 7, 230, 74 + LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 + LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CUSTOMIZE_TITLE "התאם אפשרויות אזוריות" + IDS_SPAIN "ספרדית (ספרד)" + IDS_METRIC "מטרית" + IDS_IMPERIAL "מערכת היחידות הבריטית" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "אפשרויות אזוריות" + IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." +END diff --git a/reactos/dll/cpl/intl/rsrc.rc b/reactos/dll/cpl/intl/rsrc.rc index 6812250f63b..590532b24a8 100644 --- a/reactos/dll/cpl/intl/rsrc.rc +++ b/reactos/dll/cpl/intl/rsrc.rc @@ -21,6 +21,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/dll/cpl/joy/lang/he-IL.rc b/reactos/dll/cpl/joy/lang/he-IL.rc new file mode 100644 index 00000000000..b647bf742c1 --- /dev/null +++ b/reactos/dll/cpl/joy/lang/he-IL.rc @@ -0,0 +1,84 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "בקרי משחק" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "These settings help you configure the game controllers installed on your computer.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "בקרי משחק מותקנים", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "הוסף...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "הסר", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "מאפיינים", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "מתקדם...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "פתוח בעיות...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "אישור", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "הוסף בקר משחק" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Select a game controller from the list below, and then click OK. If your game controller does not appear in the list, click Custom.", -1, 35, 7, 210, 33 + LTEXT "בקר משחק:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "מותאם...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "אישור", IDOK, 155, 179, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "בקר משחק מותאם" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "תכונות מיוחדות", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Flight yoke or flight stick", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&Game pad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Race car controller", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "צירים", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Rudder/Pedals", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "ציר Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "כפתורים", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Includes a &point of view control", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "שם בקר:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "אישור", IDOK, 137, 150, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "הגדרות מתקדמות" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "אישור", IDOK, 106, 65, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 163, 65, 50, 14 + LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10 + LTEXT "התקן מועדף:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "בקרי משחק" + IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." + IDS_CONTROLLER "בקר" + IDS_STATUS "מצב" +END diff --git a/reactos/dll/cpl/joy/rsrc.rc b/reactos/dll/cpl/joy/rsrc.rc index 5fb55b8eaae..28496740e51 100644 --- a/reactos/dll/cpl/joy/rsrc.rc +++ b/reactos/dll/cpl/joy/rsrc.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/dll/cpl/liccpa/lang/he-IL.rc b/reactos/dll/cpl/liccpa/lang/he-IL.rc new file mode 100644 index 00000000000..fa731428945 --- /dev/null +++ b/reactos/dll/cpl/liccpa/lang/he-IL.rc @@ -0,0 +1,27 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGE1 DIALOGEX DISCARDABLE 20, 40, 315, 104 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "בחר מצב רישוי" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "מצב רישוי לקוחות", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "למכשיר או ללקוח", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "לפי שרת: מספר חיבורים בו זמנית אפשרי:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "מוצר:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "אישור", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "ביטול", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "עזרה", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Replication...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "הוסף רשיונות", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "הסר רשיונות", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "מנהל הרשיונות" + IDS_CPLDESCRIPTION_1 "מנהל הרשיונות" + IDS_REACTOS "ReactOS - FreeSoftware" +END diff --git a/reactos/dll/cpl/liccpa/rsrc.rc b/reactos/dll/cpl/liccpa/rsrc.rc index efa96e1e4f8..ecfd1952393 100644 --- a/reactos/dll/cpl/liccpa/rsrc.rc +++ b/reactos/dll/cpl/liccpa/rsrc.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/dll/cpl/main/lang/he-IL.rc b/reactos/dll/cpl/main/lang/he-IL.rc new file mode 100644 index 00000000000..0807c1313fe --- /dev/null +++ b/reactos/dll/cpl/main/lang/he-IL.rc @@ -0,0 +1,172 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מהירות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Character repeat", -1, 5, 5, 236, 135 + ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15 + LTEXT "Repeat &delay:", -1, 40, 18, 100, 10 + LTEXT "ארוך", -1, 40, 33, 20, 10 + LTEXT "קצר", -1, 200, 33, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17 + ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15 + LTEXT "&Repeat rate:", -1, 40, 70, 100, 10 + LTEXT "איטי", -1, 40, 85, 20, 10 + LTEXT "מהיר", -1, 200, 85, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 216, 10 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "קצב הבהוב סמן:", -1, 5, 145, 236, 50 + LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 + LTEXT "ללא", -1, 40, 165, 25, 10 + LTEXT "מהיר", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "חומרה" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78 +STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "קצר", -1, 50, 35, 27, 10 + LTEXT "ארוך", -1, 157, 35, 27, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17 + PUSHBUTTON "אישור", IDOK, 110, 59, 60, 14 + PUSHBUTTON "ביטול", IDCANCEL, 174, 59, 60, 14 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,37,5,200,27 + ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "כפתורים" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "הגדרת כפתורים", -1, 5, 5, 236, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the right mouse button the one used for primary functions such as selecting and dragging.", -1, 10, 36, 156, 30 + GROUPBOX "Double-click speed", -1, 5, 78, 236, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 90, 156, 28 + LTEXT "Spee&d: Slow", -1, 10, 123, 50, 10 + LTEXT "Fast", -1, 136, 123, 24, 10 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 236, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again.", -1, 10, 180, 224, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "מצביע" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ערכה", -1, 5, 5, 181, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 12, 15, 167, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "שמור בשם...", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14 + PUSHBUTTON "מחק", IDC_BUTTON_DELETE_SCHEME, 128, 31, 50, 14 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE + LTEXT "התאם", -1, 5, 57, 60, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY + CHECKBOX "&Enable pointer shadow", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 + PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 + PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 +END + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53 +STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU +CAPTION "שמור ערכה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 181, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "אישור", IDOK, 63, 35, 60, 14 + PUSHBUTTON "ביטול", IDCANCEL, 126, 35, 60, 14 +END + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "אפשרויות מצביע" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "תנועה", -1, 5, 5, 236, 60 + LTEXT "Sele&ct a pointer speed:", -1, 52, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 18, 20, 32, 32 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 52, 50, 140, 10 + GROUPBOX "Snap To", -1, 5, 70, 236, 40 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 52, 84, 183, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 18, 83, 15, 15 + GROUPBOX "Visibility", -1, 5, 115, 236, 95 + CHECKBOX "&Display pointer trails:", IDC_CHECK_POINTER_TRAIL, 52, 128, 125, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 54, 143, 25, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 157, 143, 30, 10 + ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 + ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "גלגלת" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 236, 80 + ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "עכבר" + IDS_CPLDESCRIPTION_1 "משנה את הגדרות העכבר." + IDS_CPLNAME_2 "מקלדת" + IDS_CPLDESCRIPTION_2 "משנה את הגדרות המקלדת" + IDS_ARROW "בחירה רגילה" + IDS_HELP "בחירת עזרה" + IDS_APPSTARTING "עובד ברקע" + IDS_WAIT "עסוק" + IDS_CROSSHAIR "בחירה מדויקת" + IDS_IBEAM "בחירת טקסט" + IDS_NWPEN "כתיבת יד" + IDS_NO "לא זמין" + IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "הזז" + IDS_UPARROW "בחירה חליפית" + IDS_HAND "בחירת קישור" + IDS_NONE "(ללא)" + IDS_SYSTEM_SCHEME "(ערכת מערכת)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "בחר" + IDS_REMOVE_TITLE "Confirm Cursor Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" + IDS_ANIMATE_CURSOR "סמן מונפש" +END diff --git a/reactos/dll/cpl/main/rsrc.rc b/reactos/dll/cpl/main/rsrc.rc index 646af47cb72..2ef419a84d3 100644 --- a/reactos/dll/cpl/main/rsrc.rc +++ b/reactos/dll/cpl/main/rsrc.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/cpl/mmsys/lang/he-IL.rc b/reactos/dll/cpl/mmsys/lang/he-IL.rc new file mode 100644 index 00000000000..f3081e064dc --- /dev/null +++ b/reactos/dll/cpl/mmsys/lang/he-IL.rc @@ -0,0 +1,270 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_VOLUME DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "עוצמה" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 + LTEXT "",IDC_DEVICE_NAME,40,10,194,20 + GROUPBOX "עוצמת התקן", -1, 7,30,230,100 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + LTEXT "נמוך",-1,62,66,30,9 + LTEXT "גבוה",-1,195,66,30,9 + CHECKBOX "השתק", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 + CHECKBOX "שים סמל עוצמה בשורת המשימות", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + PUSHBUTTON "מתקדם...", IDC_ADVANCED_BTN, 150,105,75,15 + GROUPBOX "הגדרות רמקולים", IDC_SPEAKER_SET_BTN, 7,140,230,80 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + LTEXT "Use the settings below to change individual speaker volume and other settings.",-1,70,155,150,36 + PUSHBUTTON "עוצמת רמקולים...", IDC_SPEAKER_VOL_BTN, 70,195,75,15 + PUSHBUTTON "מתקדם...", IDC_ADVANCED2_BTN, 150,195,75,15 +END + +IDD_SOUNDS DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צלילים" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,30 + LTEXT "ערכת צלילים:",-1,8,42,150,9 + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 134,70,50,15 + PUSHBUTTON "מחק", IDC_DELETE_BTN, 188,70,50,15 + LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,27 + LTEXT "אירועי תכניות:",-1,8,118,150,9 + CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + LTEXT "צלילים:",IDC_TEXT_SOUND,8,194,80,9, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED | BS_ICON + PUSHBUTTON "בחר...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED +END + +IDD_AUDIO DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "שמע" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "נגינת שמע", -1, 7,7,230,60 + ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 + LTEXT "התקן ברירת מחדל:",-1,50,20,80,9 + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "עוצמה...", IDC_VOLUME1_BTN, 85,47,70,15 + PUSHBUTTON "מתקדם...", IDC_ADV2_BTN, 160,47,70,15 + GROUPBOX "הקלטת שמע", -1, 7,75,230,60 + ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 + LTEXT "התקן ברירת מחדל:",-1,50,88,80,9 + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "עוצמה...", IDC_VOLUME2_BTN, 85,115,70,15 + PUSHBUTTON "מתקדם...", IDC_ADV1_BTN, 160,115,70,15 + GROUPBOX "נגינת מוזיקת MIDI", -1, 7,145,230,60 + ICON IDI_MIDICON, IDI_MIDICON, 15,158,32,32 + LTEXT "התקן ברירת מחדל:",-1,50,158,80,9 + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "עוצמה...", IDC_VOLUME3_BTN, 85,185,70,15 + PUSHBUTTON "אודות...", IDC_ADV3_BTN, 160,185,70,15 + CHECKBOX "השתמש רק בהתקני ברירת מחדל.", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 +END + +IDD_VOICE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "קול" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.",-1,8,7,230,40 + GROUPBOX "נגינת קול", -1, 7,37,230,60 + ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 + LTEXT "התקן ברירת מחדל:",-1,50,50,80,9 + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "עוצמה...", IDC_VOLUME4_BTN, 85,77,70,15 + PUSHBUTTON "מתקדם...", IDC_ADV4_BTN, 160,77,70,15 + GROUPBOX "הקלטת קול", -1, 7,105,230,60 + ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 + LTEXT "התקן ברירת מחדל:",-1,50,118,80,9 + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + PUSHBUTTON "עוצמה...", IDC_VOLUME5_BTN, 85,145,70,15 + PUSHBUTTON "מתקדם...", IDC_ADV5_BTN, 160,145,70,15 + PUSHBUTTON "בדוק חומרה...", IDC_TEST_HARDWARE, 160,175,70,15 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "חומרה" +FONT 8, "MS Shell Dlg" +BEGIN + +END + +IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Save Scheme As" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 + EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 93, 36, 60, 14 + PUSHBUTTON "ביטול", IDCANCEL, 157, 36, 60, 14 +END + +IDD_SPEAKERS DIALOG 0, 0, 257, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "רמקולים" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 4379, -1, 7, 8, 20, 20 + LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT + LTEXT "הגדרת רמקולים:", 8502, 53, 169, 55, 10 + COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ביצועים" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 + GROUPBOX "נגינת שמע", 8494, 7, 32, 243, 152 + ICON 4379, 8512, 8, 8, 20, 20 + LTEXT "האצת חומרה:", 8495, 13, 56, 111, 14 + CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 + LTEXT "קצב דגימה:", 8496, 13, 123, 103, 14 + CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 + PUSHBUTTON "שחזר ברירת מחדל", 5400, 7, 191, 110, 14 + LTEXT "ללא", 8497, 128, 56, 21, 10 + LTEXT "מלא", 8498, 214, 56, 21, 9 + LTEXT "טוב", 8499, 128, 123, 21, 10 + LTEXT "הכי טוב", 8500, 214, 123, 23, 9 + LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 + LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 +END + +IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ביצועים" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 + GROUPBOX "הקלטת שמע", 8494, 7, 29, 242, 122 + ICON 4380, 8512, 8, 7, 20, 20 + LTEXT "האצת חומרה:", 8495, 13, 46, 103, 9 + CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 + LTEXT "קצב דגימה:", 8496, 13, 103, 103, 9 + CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 + PUSHBUTTON "שחזר ברירות מחדל", 5400, 9, 158, 110, 14 + LTEXT "ללא", 8497, 125, 46, 24, 10 + LTEXT "מלא", 8498, 217, 46, 19, 9 + LTEXT "טוב", 8499, 125, 103, 24, 10 + LTEXT "הכי טוב", 8500, 217, 103, 19, 9 + LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 + LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 +END + +IDD_SETUP1 DIALOG 0, 0, 227, 206 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הגדרה" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "שמע ReactOS", 10243, 7, 5, 213, 192 + ICON 4393, 10241, 26, 26, 20, 20 + LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "אפשר שמע ReactOS", 10253, 60, 68, 150, 9 + LTEXT "הערות:", 10246, 58, 87, 150, 11 + LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 + LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 +END + +IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "רב ערוצי" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Description goes here.", 9506, 8, 4, 212, 24 //? what goes here? + LTEXT "נמוך", 9473, 65, 31, 14, 8 + LTEXT "", 9472, 5, 31, 55, 8 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + LTEXT "גבוה", 9474, 202, 31, 17, 8 + LTEXT "נמוך", 9477, 65, 50, 14, 8 + LTEXT "", 9476, 5, 50, 55, 8 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + LTEXT "גבוה", 9478, 202, 50, 17, 8 + LTEXT "נמוך", 9481, 65, 69, 14, 8 + LTEXT "", 9480, 5, 69, 55, 8 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + LTEXT "גבוה", 9482, 202, 69, 17, 8 + LTEXT "נמוך", 9485, 65, 88, 14, 8 + LTEXT "", 9484, 5, 88, 55, 8 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + LTEXT "גבוה", 9486, 202, 88, 17, 8 + LTEXT "נמוך", 9489, 65, 107, 14, 8 + LTEXT "", 9488, 5, 107, 55, 8 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + LTEXT "גבוה", 9490, 202, 107, 17, 8 + LTEXT "נמוך", 9493, 65, 126, 14, 8 + LTEXT "", 9492, 5, 126, 55, 8 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + LTEXT "גבוה", 9494, 202, 126, 17, 8 + LTEXT "נמוך", 9497, 65, 145, 14, 8 + LTEXT "", 9496, 5, 145, 55, 8 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + LTEXT "גבוה", 9498, 202, 145, 17, 8 + LTEXT "נמוך", 9501, 65, 164, 14, 8 + LTEXT "", 9500, 5, 164, 55, 8 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + LTEXT "גבוה", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "הזז את כל הסמנים באותו רגע", 9504, 5, 185, 216, 9 + PUSHBUTTON "שחזר ברירות מחדל", 9505, 110, 199, 110, 14 +END + +IDD_SETUP2 DIALOG 0, 0, 227, 206 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הגדרה" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ReactOS שמע", 10259, 7, 5, 213, 192 + ICON 4394, 10257, 25, 25, 20, 20 + LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 + LTEXT "כדי לאתחל את ReactOS, לחץ על אישור.", 10262, 60, 75, 150, 20 + LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "התקני קול ושמע" + IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." + IDS_NO_SOUND "(ללא)" + IDS_NO_DEVICES "אין התקנים" + + 5825 "שגיאת תכנית" + 5826 "סגירת תכנית" + 5827 "רמת סוללה קריטית" + 5828 "חיבור התקן" + 5829 "ניתוק התקן" + 5830 "התקן נכשל להתחבר" + 5831 "רוקן סל מחזור" + 5832 "רמת סוללה נמוכה" + 5833 "הגדל" + 5834 "פקודת תפריט" + 5835 "חלון קופץ" + 5836 "מזער" + 5837 "התראת דואר חדשה" + 5838 "התחל סיור" + 5839 "פתיחת תכנית" + 5840 "הדפסה הושלמה" + 5841 "שחזור מטה" + 5842 "שחזור מעלה" + 5843 "כוכבית" + 5844 "צליל ברירת מחדל" + 5845 "Exclamation" + 5846 "יציאה ReactOS" + 5847 "עצירה קריטית" + 5848 "התראת מערכת" + 5849 "שאלה" + 5850 "התחלת ReactOS" + 5851 "תפריט התחל" + 5852 "ReactOS ניתוק" + 5853 "ReactOS התחברות" + 5854 "ReactOS סייר" +END diff --git a/reactos/dll/cpl/mmsys/rsrc.rc b/reactos/dll/cpl/mmsys/rsrc.rc index 6757039547c..f711207d913 100644 --- a/reactos/dll/cpl/mmsys/rsrc.rc +++ b/reactos/dll/cpl/mmsys/rsrc.rc @@ -46,6 +46,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/powercfg/lang/he-IL.rc b/reactos/dll/cpl/powercfg/lang/he-IL.rc new file mode 100644 index 00000000000..b5c17b731a8 --- /dev/null +++ b/reactos/dll/cpl/powercfg/lang/he-IL.rc @@ -0,0 +1,164 @@ +// Hebrew (he-IL) resources by Baruch Rutman (peterooch at gmail dot com) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תכניות צריכת חשמל" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", + -1, 37, 6, 209, 36 + GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "מחק", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "מתי שהמחשב:",IDC_SAT, 12, 109, 60, 12 + LTEXT "מחובר",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "פועל על סוללות",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "כיבוי מסך:",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "כיבוי כוננים קשיחים:",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "מצב המתנה:",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "מצב שינה:",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "התראות" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "התראת סוללה נמוכה",-1, 6, 7, 239, 104 + CONTROL "הפעל התראת סוללה נמוכה מתי שכוח הסוללה מגיע ל:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "unknown",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "פעולת התראה...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "הודעה:",-1, 95, 71, 57, 10 + LTEXT "Unknown",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "פעולה",-1, 95, 83, 55, 10 + LTEXT "Unknown",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "הפעל תכנית:",-1, 95, 95, 55, 10 + LTEXT "Unknown",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "התראת סוללה קריטית",-1, 6, 120, 239, 106 + CONTROL "הפעל התראת סוללה קריטית מתי שכוח הסוללה מגיע ל:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "unknown",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "פעולת התראה:",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "הודעה:",-1, 95, 185, 50, 10 + LTEXT "Unknown",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "פעולה",-1, 95, 198, 45, 10 + LTEXT "Unknown",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "הפעל תכנית:",-1, 95, 211, 50, 10 + LTEXT "Unknown",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "בחר את אפשרויות צריכת החשמל שברצונך להשתמש:",-1, 37, 6, 207, 20 + GROUPBOX "אפשרויות",-1, 6, 30, 240, 65 + CONTROL "תמיר הראה סמל על שורת המשימות",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "בקש סיסמה מתי שחוזר מהמתנה",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "עמעם תצוגה בזמן פעולה על סוללות",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "לחצני הפעלה",-1, 6, 101, 240, 127 + LTEXT "כאשר אני סוגר את מכסה:", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "כאשר אני לוחץ על לחצן ההפעלה:", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "כאשר אני לוחץ על לחצן השינה:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "תרדמת" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", + -1, 37, 6, 210, 35 + GROUPBOX "תרדמת",-1, 6, 41, 240, 32 + CONTROL "אפשר תרדמת",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "שטח כונן לתרדמת",-1, 6, 80, 240, 76 + LTEXT "שטח כונן פנוי:",-1, 15, 95, 140, 10 + LTEXT "Unknown",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "שטח כונן הדרוש לתרדמת",-1, 15, 115, 140, 10 + LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "You must free some disk space before your computer can hibernate. ",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "אפשרויות צריכת חשמל" + IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." + IDS_PROCENT "%i%%" + IDS_SOUND "קול" + IDS_TEXT "טקסט" + IDS_CONFIG1 "Settings for %1 power scheme" + IDS_CONFIG2 "אפשרויות מתקדמות ל %1" + + IDS_SIZEBYTS "%i בית" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "אל תעשה דבר" + + IDS_PowerActionNone1 "שום פעולה" + IDS_PowerActionUnknown "לא ידוע" + IDS_PowerActionSleep "המתנה" + IDS_PowerActionHibernate "תרדמת" + IDS_PowerActionShutdown "כיבוי" + IDS_PowerActionRestart "הפעלה מחדש" + IDS_PowerActionShutdownOff "Shutdown and Turn the Power Off" + IDS_PowerActionWarmEject "שאל אותי מה לעשות" + IDS_PowerActionNone2 "כלום" + + IDS_TIMEOUT1 "אחרי דקה" + IDS_TIMEOUT2 "אחרי 2 דקות" + IDS_TIMEOUT3 "אחרי 3 דקות" + IDS_TIMEOUT4 "אחרי 5 דקות" + IDS_TIMEOUT5 "אחרי 10 דקות" + IDS_TIMEOUT6 "אחרי 15 דקות" + IDS_TIMEOUT7 "אחרי 20 דקות" + IDS_TIMEOUT8 "אחרי 25 דקות" + IDS_TIMEOUT9 "אחרי 30 דקות" + IDS_TIMEOUT10 "אחרי 45 דקות" + IDS_TIMEOUT11 "אחרי שעה" + IDS_TIMEOUT12 "אחרי שעתיים" + IDS_TIMEOUT13 "אחרי 3 שעות" + IDS_TIMEOUT14 "אחרי 4 שעות" + IDS_TIMEOUT15 "אחרי 5 דקות" + IDS_TIMEOUT16 "אף פעם" + + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME_TITLE "מחק ערכה" +END diff --git a/reactos/dll/cpl/powercfg/rsrc.rc b/reactos/dll/cpl/powercfg/rsrc.rc index 6e3300149ba..0bcf5e7fb7b 100644 --- a/reactos/dll/cpl/powercfg/rsrc.rc +++ b/reactos/dll/cpl/powercfg/rsrc.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/dll/cpl/sysdm/lang/he-IL.rc b/reactos/dll/cpl/sysdm/lang/he-IL.rc new file mode 100644 index 00000000000..0aaa259fd87 --- /dev/null +++ b/reactos/dll/cpl/sysdm/lang/he-IL.rc @@ -0,0 +1,310 @@ +// Translated by Baruch Rutman +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "מערכת:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "גרסה ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT "מכונה:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "בקר את דף הבית של ReactOS", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 + PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "חומרה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "מנהל ההתקנים", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "מנהל ההתקנים מציג אל כל התקני החומרה המותקנים במחשב שלך. השתמש במנהל ההתקנים כדי לשנות את המאפיינים של כל התקן.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "מנהל ההתקנים...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "אשף הוספת חומרה", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "אשף הוספת חומרה...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "פרופילי חומרה", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Hardware profiles provide a way for you to set up and store different hardware configurations.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "פרופילי חומרה...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "עליך להיכנס למערכת כמנהל (Administrator) כדי לבצע את מרבית השינויים שלהלן.", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "ביצועים", IDC_STATIC, 6, 18, 244, 50 + LTEXT "אפקטים חזותיים, תזמון מעבדים, שימוש בזיכרון וזיכרון וירטואלי", IDC_STATIC, 16, 29, 228, 17 + PUSHBUTTON "הגדרות", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "פרופילי משתמש", IDC_STATIC, 6,75,244,48 + LTEXT "הגדרות שולחן עבודה הקשורות לכניסה", IDC_STATIC, 16, 88, 228, 20 + PUSHBUTTON "הגדרות", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "הפעלה ושחזור", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.", IDC_STATIC, 16, 144, 228, 19 + PUSHBUTTON "הגדרות", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "הגדרות מערכת", IDC_SYSSETTINGS, 2, 192, 80, 15 + PUSHBUTTON "משתני סביבה", IDC_ENVVAR, 85, 192, 80, 15 + PUSHBUTTON "דווח שגיאות", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "הגדרות מערכת" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "מידע גרסה",IDC_STATIC,6,3,210,73 + CONTROL "דווח כתחנת עבודה",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "אישור",IDOK,166,83,50,14 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "פרופילי חומרה" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "פרופילי חומרה זמינים:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "מאפיינים", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "העתק", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "הדבק", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "מחק", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED + + GROUPBOX "בחירת פרופילי חומרה", IDC_STATIC, 7, 130, 240, 75 + LTEXT "מתי ש ReactOS מופעל:", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP + AUTORADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 + LTEXT "שניות", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "אישור", IDOK, 143, 213, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "העתקת פרופיל" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "מ:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "ל:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "אישור", IDOK, 199, 9, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 199, 30, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "שינוי שם הפרופיל" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "מ:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "ל:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "אישור", IDOK, 199, 9, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 199, 30, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "פרופילי משתמש" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "User profiles contain desktop settings and other information related to your login. A different profile can be created on each computer you use, or you can select a roaming profile that is the same on every computer you use.", + IDC_STATIC, 40, 11, 211, 35 + LTEXT "פרופילי משתמש השמורים במערכת:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "שנה סוג", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "מחק", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "העתק ל...", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "To create new user accounts, open User Accounts in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 + + DEFPUSHBUTTON "אישור", IDOK, 134, 200, 54, 13 + PUSHBUTTON "ביטול", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "הפעלה ושחזור" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "אתחול המערכת", IDC_STATIC, 7, 12, 238, 95 + LTEXT "מערכת ההפעלה המהווה ברירת מחדל:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + AUTOCHECKBOX "זמן להצגת רשימת מערכות הפעלה:", IDC_STRECLIST, 14, 56, 160, 8 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "שניות", IDC_STATIC, 223, 56, 18, 8 + AUTOCHECKBOX "זמן להצגת אפשרויות שחזור בעת הצורך:", IDC_STRRECREC, 14, 70, 170, 8 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "שניות", IDC_STATIC, 223, 70, 18, 8 + LTEXT "כדי לשנות את קובץ אפשרויות האתחול, לחץ על עריכה.", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "עריכה", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "כשל במערכת", IDC_STATIC, 7, 111, 238, 140 + AUTOCHECKBOX "כתוב אירוע ביומן הרישום של המערכת", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 + AUTOCHECKBOX "שלח התראה מנהלית", IDC_STRRECSENDALERT, 14, 138, 148, 10 + AUTOCHECKBOX "הפעל מחדש באופן אוטומטי", IDC_STRRECRESTART, 14, 152, 145, 10 + + GROUPBOX "כתיבת מידע לניפוי שגיאות", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "קובץ DUMP:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + AUTOCHECKBOX "שכתב קובץ קיים", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + + DEFPUSHBUTTON "אישור", IDOK, 141, 259, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "זיכרון וירטואלי" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "כונן [תווית אמצעי אחסון]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "גודל קובץ החלפה (MB)", IDC_STATIC, 115, 5, 96, 9 + LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS + GROUPBOX "גודל קובץ ההחלפה עבור הכנן הנבחר", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "כונן:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "שטח פנוי:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "גודל התחלתי (MB):", -1, 22, 118, 75, 9 + LTEXT "גודל מרבי (MB):", -1, 22, 131, 75, 9 + AUTORADIOBUTTON "גודל מותאם אישית:", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "גודל מנוהל על-ידי המערכת", IDC_SYSMANSIZE, 20, 145, 88, 9 + AUTORADIOBUTTON "ללא קובץ החלפה", IDC_NOPAGEFILE, 20, 158, 78, 9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "קבע", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "סה""כ גודל קובץ החלפה עבור כל הכוננים", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "גודל מינימלי מותר:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "מומלץ:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9 + LTEXT "הקצאה נוכחית:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 210, 100, 9 + + DEFPUSHBUTTON "אישור", IDOK, 114, 232, 48, 13 + PUSHBUTTON "ביטול", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "משתני סביבה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "משתני משתמש", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "חדש...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "עריכה...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "מחק", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "משתני מערכת", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "חדש...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "ערוך...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "מחק", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "אישור", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "ביטול", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "עריכת משתנה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "שם המשתנה:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "שם הערך:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 116, 50, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "רשיון" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "אישור", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "מערכת" + IDS_CPLSYSTEMDESCRIPTION "See information about your computer and change various system and hardware settings." + IDS_MEGABYTE "MB זיכרון פיזי" + IDS_GIGABYTE "GB זיכרון פיזי" + IDS_TERABYTE "TB זיכרון פיזי" + IDS_PETABYTE "PB זיכרון פיזי" + IDS_VARIABLE "משתנה" + IDS_VALUE "ערך" + IDS_NO_DUMP "(ללא)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + IDS_USERPROFILE_NAME "שם" + IDS_USERPROFILE_SIZE "גודל" + IDS_USERPROFILE_TYPE "סוג" + IDS_USERPROFILE_STATUS "מצב" + IDS_USERPROFILE_MODIFIED "שונה" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." + IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." + IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" +END diff --git a/reactos/dll/cpl/sysdm/rsrc.rc b/reactos/dll/cpl/sysdm/rsrc.rc index 14a20b1239b..d9eb2a2c1e4 100644 --- a/reactos/dll/cpl/sysdm/rsrc.rc +++ b/reactos/dll/cpl/sysdm/rsrc.rc @@ -26,6 +26,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/cpl/telephon/lang/he-IL.rc b/reactos/dll/cpl/telephon/lang/he-IL.rc new file mode 100644 index 00000000000..c071ad68c2f --- /dev/null +++ b/reactos/dll/cpl/telephon/lang/he-IL.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "אפשרויות טלפון ומודם" + IDS_CPLSYSTEMDESCRIPTION "הגדר את חוקי החיוג שלך והגדרות המודם" +END diff --git a/reactos/dll/cpl/telephon/rsrc.rc b/reactos/dll/cpl/telephon/rsrc.rc index 4414d0a74b1..3f3be262665 100644 --- a/reactos/dll/cpl/telephon/rsrc.rc +++ b/reactos/dll/cpl/telephon/rsrc.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/dll/cpl/timedate/lang/he-IL.rc b/reactos/dll/cpl/timedate/lang/he-IL.rc new file mode 100644 index 00000000000..31af425b0d6 --- /dev/null +++ b/reactos/dll/cpl/timedate/lang/he-IL.rc @@ -0,0 +1,68 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תאריך ושעה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "תאריך", -1, 4, 2, 122, 125 + COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY + CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 120, 17, 50, 12 + + CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80, WS_EX_CLIENTEDGE + GROUPBOX "שעה", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 105, 90, 12 + LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "אזור זמן" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE + AUTOCHECKBOX "כוון את השעון אוטומטית לשעון קיץ", + IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "שעון אינטרנט" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "בצע סנכרון עם שרת שעון באינטרנט", IDC_AUTOSYNC, + 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "שרת:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "עדכן כעת", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "סנכרון יכול להתבצע רק מתי שהמחשב מחובר לאינטרנט", -1, 12, 114, 225, 25 +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "שעה/תאריך" + IDS_CPLDESCRIPTION "קבע את התאריך, השעה ואזור הזמן עבור המחשב." + IDS_TIMEZONETEXT "אזור זמן נוכחי: %s" + IDS_TIMEZONEINVALID "לא תקף" + IDS_TIMEZONEUNKNOWN "לא ידוע" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" + IDS_INETTIMENEXTSYNC "הסנכרון הבא: %s ב %s" + IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" + IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" +END diff --git a/reactos/dll/cpl/timedate/rsrc.rc b/reactos/dll/cpl/timedate/rsrc.rc index 022aa8506e0..8ef413ca5e9 100644 --- a/reactos/dll/cpl/timedate/rsrc.rc +++ b/reactos/dll/cpl/timedate/rsrc.rc @@ -61,6 +61,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/usrmgr/lang/he-IL.rc b/reactos/dll/cpl/usrmgr/lang/he-IL.rc new file mode 100644 index 00000000000..6a8c07c5ba8 --- /dev/null +++ b/reactos/dll/cpl/usrmgr/lang/he-IL.rc @@ -0,0 +1,223 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* + * Attention Translators: + * DO NOT TRANSLATE THESE RESOURCES YET! + */ +// To be added if above no longer valid +/* Dialogs */ + +IDD_USERS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Users" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_GROUPS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Groups" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_EXTRA DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extra" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank", IDC_STATIC, 66, 90, 112, 8 +END + + +IDD_USER_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Full name:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME,77,43,168,13,ES_AUTOHSCROLL + LTEXT "Description:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION,77,61,168,13,ES_AUTOHSCROLL + AUTOCHECKBOX "User must change the password upon first logon",IDC_USER_GENERAL_FORCE_CHANGE,7,82,210,10 + AUTOCHECKBOX "User cannot change the password",IDC_USER_GENERAL_CANNOT_CHANGE,7,95,210,10 + AUTOCHECKBOX "Password never expires",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 + AUTOCHECKBOX "Account is disabled",IDC_USER_GENERAL_DISABLED,7,121,210,10 + AUTOCHECKBOX "Account is locked",IDC_USER_GENERAL_LOCKED,7,134,210,10 +END + + +IDD_USER_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Membership" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Member of:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "Add...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "Remove", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_USER_PROFILE DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profile" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "User profile", -1, 7, 7, 238, 54 + LTEXT "Profile path:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "Logon script:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + + GROUPBOX "Home directory", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "Local path:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "Connect:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "to:", -1, 112, 101, 12, 8 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL +END + + +IDD_GROUP_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Description:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION,65,42,180,13,ES_AUTOHSCROLL + LTEXT "Members:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "Add...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "Remove", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_CHANGE_PASSWORD DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Change Password" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1,107,7,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "New Password:", -1,7,10,96,8 + EDITTEXT IDC_EDIT_PASSWORD2,107,25,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Repeat Password:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14 + PUSHBUTTON "Cancel",IDCANCEL,210,53,50,14 +END + + +IDD_USER_NEW DIALOGEX DISCARDABLE 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "New User" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_USER_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "User name:", -1,7,10,96,8 + EDITTEXT IDC_USER_NEW_FULL_NAME,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Full user name:", -1,7,28,96,8 + EDITTEXT IDC_USER_NEW_DESCRIPTION,107,43,153,14,ES_AUTOHSCROLL + RTEXT "Description:", -1,7,46,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD1,107,67,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Password:", -1,7,70,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD2,107,85,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Repeat Password:", -1,7,88,96,8 + AUTOCHECKBOX "User must change the password upon first logon",IDC_USER_NEW_FORCE_CHANGE,7,109,200,10 + AUTOCHECKBOX "User cannot change the password",IDC_USER_NEW_CANNOT_CHANGE,7,123,200,10,WS_DISABLED + AUTOCHECKBOX "Password never expires",IDC_USER_NEW_NEVER_EXPIRES,7,137,200,10,WS_DISABLED + AUTOCHECKBOX "Account is disabled",IDC_USER_NEW_DISABLED,7,151,200,10 + DEFPUSHBUTTON "OK",IDOK,156,179,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,210,179,50,14 +END + + +IDD_GROUP_NEW DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "New Group" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "Group name:", -1,7,10,96,8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Description:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,210,53,50,14 +END + + +IDD_USER_ADD_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Group Membership" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Member of:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "OK",IDOK,141,197,50,14 + PUSHBUTTON "Cancel",IDCANCEL,195,197,50,14 +END + + +/* Menus */ + +IDM_POPUP_GROUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "New Group...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "Add Member", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "Delete", IDM_GROUP_DELETE + MENUITEM "Rename", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "Properties", IDM_GROUP_PROPERTIES + END +END + + +IDM_POPUP_USER MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "New User...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "Change Password", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "Delete", IDM_USER_DELETE + MENUITEM "Rename", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "Properties", IDM_USER_PROPERTIES + END +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "User Accounts" + IDS_CPLDESCRIPTION "Manages Users and Groups." +END + +STRINGTABLE +BEGIN + IDS_NAME "Name" + IDS_FULLNAME "Full Name" + IDS_DESCRIPTION "Description" +END diff --git a/reactos/dll/cpl/usrmgr/rsrc.rc b/reactos/dll/cpl/usrmgr/rsrc.rc index c1a80350183..d051048368c 100644 --- a/reactos/dll/cpl/usrmgr/rsrc.rc +++ b/reactos/dll/cpl/usrmgr/rsrc.rc @@ -16,6 +16,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc b/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc new file mode 100644 index 00000000000..55a88266607 --- /dev/null +++ b/reactos/dll/cpl/wined3dcfg/lang/he-IL.rc @@ -0,0 +1,27 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 + GROUPBOX "Shaders", -1, 5, 35, 230, 65 + AUTOCHECKBOX "Enable &GLSL", IDC_GLSL, 15, 50, 150, 10 + AUTOCHECKBOX "Enable &pixel shaders", IDC_PIXELSHADERS, 15, 65, 150, 10 + AUTOCHECKBOX "Enable &Vertex shaders", IDC_VERTEXSHADERS, 15, 80, 150, 10 + GROUPBOX "Rendering", -1, 5, 110, 230, 85 + AUTOCHECKBOX "Force &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 + AUTOCHECKBOX "Force &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Render target locking:", -1, 15, 175, 72, 10, SS_LEFT + COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "WineD3D" + IDS_CPLDESCRIPTION "Configures WineD3D runtime settings." +END diff --git a/reactos/dll/cpl/wined3dcfg/rsrc.rc b/reactos/dll/cpl/wined3dcfg/rsrc.rc index d848984e6af..4b802fc226b 100644 --- a/reactos/dll/cpl/wined3dcfg/rsrc.rc +++ b/reactos/dll/cpl/wined3dcfg/rsrc.rc @@ -3,9 +3,13 @@ // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/shellext/deskadp/lang/he-IL.rc b/reactos/dll/shellext/deskadp/lang/he-IL.rc new file mode 100644 index 00000000000..6844d9c91b3 --- /dev/null +++ b/reactos/dll/shellext/deskadp/lang/he-IL.rc @@ -0,0 +1,48 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מתאם" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "סוג מתאם", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "מאפיינים", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "פרטי המתאם", -1, 7, 56, 237, 75 + LTEXT "סוג שבב:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "סוג DAC:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "גודל זיכרון:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "מחרוזת מתאם:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "מידע BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "פרט את כל המצבים...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "פירוט כל המצבים" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "אישור", IDOK, 112, 115, 50, 15 + PUSHBUTTON "ביטול", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "רשימת מצבים חוקיים", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Default Refresh" + IDES_REFRESHRATEFMT "%d הרץ" + IDS_4BPP "16 צבעים" + IDS_8BPP "256 צבעים" + IDS_15BPP "צבעים גבוהים (15 סיביות)" + IDS_16BPP "צבעים גבוהים (16 סיביות)" + IDS_24BPP "צבעים מלאים (24 סיביות)" + IDS_32BPP "צבעים מלאים (32 סיביות)" +END + diff --git a/reactos/dll/shellext/deskadp/rsrc.rc b/reactos/dll/shellext/deskadp/rsrc.rc index 012e9fabd20..d02933821f9 100644 --- a/reactos/dll/shellext/deskadp/rsrc.rc +++ b/reactos/dll/shellext/deskadp/rsrc.rc @@ -37,6 +37,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/shellext/deskmon/lang/he-IL.rc b/reactos/dll/shellext/deskmon/lang/he-IL.rc new file mode 100644 index 00000000000..3cc64fc23e8 --- /dev/null +++ b/reactos/dll/shellext/deskmon/lang/he-IL.rc @@ -0,0 +1,22 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צג" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "סוג צג", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "מאפיינים", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "הגדרות צג", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "קצב רענון המסך:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "הסתר מצבים שאין אפשרות להציג בצג זה", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "השתמש בהגדרת ברירת מחדל של החומרה" + IDS_FREQFMT "%u הרץ" +END diff --git a/reactos/dll/shellext/deskmon/rsrc.rc b/reactos/dll/shellext/deskmon/rsrc.rc index 012e9fabd20..d02933821f9 100644 --- a/reactos/dll/shellext/deskmon/rsrc.rc +++ b/reactos/dll/shellext/deskmon/rsrc.rc @@ -37,6 +37,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/shellext/slayer/lang/he-IL.rc b/reactos/dll/shellext/slayer/lang/he-IL.rc new file mode 100644 index 00000000000..29a1e536612 --- /dev/null +++ b/reactos/dll/shellext/slayer/lang/he-IL.rc @@ -0,0 +1,38 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תאימות" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.", -1, 7,7,210,31 + GROUPBOX "מצב תאימות", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "הפעל תוכנית זו במצב תאימות עבור:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "הגדרות תצוגה", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "הפעל במצב של 256 צבעים", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "הפעל ברזולוציית מסך 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "בטל ערכות נושא חזותיות", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "ערוך מצבי תאימות...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "למד עוד על תאימות תכניות.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "עריכת מצבי תאימות" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "הוסף...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "ערוך...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "מחק", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "אישור", IDOK, 95,116,60,14 + PUSHBUTTON "ביטול", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END + diff --git a/reactos/dll/shellext/slayer/rsrc.rc b/reactos/dll/shellext/slayer/rsrc.rc index f2e59430aab..08bfe5297c3 100644 --- a/reactos/dll/shellext/slayer/rsrc.rc +++ b/reactos/dll/shellext/slayer/rsrc.rc @@ -46,6 +46,9 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/win32/aclui/lang/he-IL.rc b/reactos/dll/win32/aclui/lang/he-IL.rc new file mode 100644 index 00000000000..9d58e0e92d2 --- /dev/null +++ b/reactos/dll/win32/aclui/lang/he-IL.rc @@ -0,0 +1,32 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "אבטחה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "שמות משתמשים או קבוצות:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "בעלים:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + PUSHBUTTON "הוסף...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "הסר", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "אפשר", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "מנע", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "For special permissions or for advanced settings, click Advanced.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "מתקדם", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "הרשאות ל %1" + IDS_UNKNOWN "לא ידוע" + IDS_SPECIAL_PERMISSIONS "הרשאות מיוחדות" + IDS_PERMISSIONS_FOR "הרשאות עבור %1" + IDS_PERMISSIONS "הרשאות" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} + diff --git a/reactos/dll/win32/aclui/rsrc.rc b/reactos/dll/win32/aclui/rsrc.rc index 43029f50756..06aa0828c32 100644 --- a/reactos/dll/win32/aclui/rsrc.rc +++ b/reactos/dll/win32/aclui/rsrc.rc @@ -21,6 +21,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/win32/avifil32/avifile_He.rc b/reactos/dll/win32/avifil32/avifile_He.rc new file mode 100644 index 00000000000..2351ae4d800 --- /dev/null +++ b/reactos/dll/win32/avifil32/avifile_He.rc @@ -0,0 +1,55 @@ +/* + * Top level resource file for avifil32.dll + * + * Copyright 2002 Michael Günnewig + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "avifile_private.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_WAVESTREAMFORMAT "Waveform: %s" + IDS_WAVEFILETYPE "Waveform" + IDS_ALLMULTIMEDIA "כל קבצי המולטימדיה" + IDS_ALLFILES "כל הקבצים (*.*)" + IDS_VIDEO "וידאו" + IDS_AUDIO "שמע" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "לא דחוס" +} + +IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "אפשרויות דחיסה" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Choose a stream:",-1,5,5,154,10 + COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "אפשרויות...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "שקופיות:",-1,129,43,36,9 + LTEXT "פורמט נוכחי:",-1,5,56,73,9 + LTEXT "",IDC_FORMATTEXT,80,56,88,26 + DEFPUSHBUTTON "אישור",IDOK,170,42,50,14 + PUSHBUTTON "ביטול",IDCANCEL,170,61,50,14 +END diff --git a/reactos/dll/win32/avifil32/rsrc.rc b/reactos/dll/win32/avifil32/rsrc.rc index 7b1afea0ccb..cff6d56cfc3 100644 --- a/reactos/dll/win32/avifil32/rsrc.rc +++ b/reactos/dll/win32/avifil32/rsrc.rc @@ -50,6 +50,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ES_ES #include "avifile_Es.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "avifile_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "avifile_Hu.rc" #endif diff --git a/reactos/dll/win32/browseui/browseui.rc b/reactos/dll/win32/browseui/browseui.rc index efdac3d639e..84ce6a4d914 100644 --- a/reactos/dll/win32/browseui/browseui.rc +++ b/reactos/dll/win32/browseui/browseui.rc @@ -3,6 +3,8 @@ * * Copyright 2009 Andrew Hill * + * Translated by Baruch Rutman + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -55,6 +57,7 @@ IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" //#include "lang/en-GB.rc" //#include "lang/fi-FI.rc" //#include "lang/fr-FR.rc" +//#include "lang/he-IL.rc" //#include "lang/hu-HU.rc" //#include "lang/it-IT.rc" //#include "lang/ja-JP.rc" @@ -80,6 +83,9 @@ IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/reactos/dll/win32/browseui/lang/he-IL.rc b/reactos/dll/win32/browseui/lang/he-IL.rc new file mode 100644 index 00000000000..0b8e4eeca7f --- /dev/null +++ b/reactos/dll/win32/browseui/lang/he-IL.rc @@ -0,0 +1,275 @@ +/* + * Copyright 2009 Andrew Hill + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Menus +// + +IDM_CABINET_CONTEXTMENU MENUEX +BEGIN + POPUP "", 264,MFT_STRING,MFS_ENABLED + BEGIN + MENUITEM "כפתורים רגילים", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED + MENUITEM "שורת הכתובת", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED + MENUITEM "קישורים", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "נעל את סרגלי הכלים", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED + MENUITEM "התאם אישית...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED + MENUITEM "תווית טקסט", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED + MENUITEM "כפתור עבור", IDM_TOOLBARS_GOBUTTON,MFT_STRING,MFS_ENABLED + END +END + +IDM_CABINET_MAINMENU MENUEX +BEGIN + POPUP "&קובץ", FCIDM_MENU_FILE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&סגור", IDM_FILE_CLOSE + END + POPUP "&עריכה", FCIDM_MENU_EDIT + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + POPUP "&תצוגה", FCIDM_MENU_VIEW + BEGIN + POPUP "סרגלי כלים", IDM_VIEW_TOOLBARS + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "שורת מצב", IDM_VIEW_STATUSBAR + POPUP "&Explorer Bar", IDM_VIEW_EXPLORERBAR + BEGIN + MENUITEM "חפש\tCtrl+E", IDM_EXPLORERBAR_SEARCH + MENUITEM "מועדפים\tCtrl+I", IDM_EXPLORERBAR_FAVORITES + MENUITEM "מדיה", IDM_EXPLORERBAR_MEDIA + MENUITEM "היסטוריה\tCtrl+H", IDM_EXPLORERBAR_HISTORY + MENUITEM "תיקיות", IDM_EXPLORERBAR_FOLDERS + MENUITEM "", IDM_EXPLORERBAR_SEPARATOR + END + MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR + POPUP "עבור אל", FCIDM_MENU_EXPLORE + BEGIN + MENUITEM "חזור\tAlt+Left Arrow", IDM_GOTO_BACK + MENUITEM "קדימה\tAlt+Right Arrow", IDM_GOTO_FORWARD + MENUITEM "עלה תיקייה מעלה", IDM_GOTO_UPONELEVEL + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "דף הבית\tAlt+Home", IDM_GOTO_HOMEPAGE + END + MENUITEM "רענון", IDM_VIEW_REFRESH + END + POPUP "מועדפים", FCIDM_MENU_FAVORITES + BEGIN + MENUITEM "הוסף למועדפים...", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "ארגן מועדפים...", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "(ריק)", IDM_FAVORITES_EMPTY + END + POPUP "&כלים", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "מפה כונן רשת...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "נתק כונן רשת...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "סנכרן...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "Folder &Options...", IDM_TOOLS_FOLDEROPTIONS + END + POPUP "עזרה", FCIDM_MENU_HELP + BEGIN + MENUITEM "האם עותק זה של ReactOS חוקי?", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "אודות ReactOS", IDM_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialogs +// + +IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 +STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "אפשרויות טקסט:",-1,4,2,48,15 + COMBOBOX IDC_TEXTOPTIONS,52,0,123,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "אפשרויות סמלים:",-1,4,20,48,15 + COMBOBOX IDC_ICONOPTIONS,52,18,123,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ACCELERATORS ACCELERATORS +BEGIN + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT + "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT + "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT + VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT + VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT + "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT + "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT + "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Strings +// + +STRINGTABLE +BEGIN + 800 "Contains commands for manipulating the selected items." +END + +STRINGTABLE +BEGIN + 864 "Contains edit commands." +END + +STRINGTABLE +BEGIN + 928 "Contains commands for manipulating the view." +END + +STRINGTABLE +BEGIN + 992 "Contains tools commands." +END + +STRINGTABLE +BEGIN + 1056 "Contains commands for displaying Help." +END + +STRINGTABLE +BEGIN + 9025 "Closes the window." + 9026 "Goes up one level." +END + +STRINGTABLE +BEGIN + 9121 "Connects to a network drive." + 9122 "Disconnects from a network drive." +END + +STRINGTABLE +BEGIN + 9250 "Displays program information, version number, and copyright." + 9252 "Displays information for debugging." +END + +STRINGTABLE +BEGIN + 9281 "Goes to the previous page." + 9282 "Goes to the next page." + 9283 "Enables you to change settings." + 9285 "Goes to your home page." +END + +STRINGTABLE +BEGIN + 9362 "Opens the Favorites folder." + 9363 "Adds the current page to your Favorites list." +END + +STRINGTABLE +BEGIN + 9505 "Shows or hides toolbars." + 9506 "Shows or hides the status bar." + 9508 "Displays the Standard Buttons toolbar." + 9509 "Displays the Address bar." + 9510 "Displays the Quick Links bar." + 9516 "Locks the sizes and positions of the toolbars." +END + +STRINGTABLE +BEGIN + 9533 "Customizes the toolbar." +END + +STRINGTABLE +BEGIN + 9552 "Shows or hides an Explorer bar." + 9553 "Shows the Search bar." + 9554 "Shows the Favorites bar." + 9555 "Shows the History bar." + 9557 "Shows the Folders bar." + 9559 "Shows the Media Bar." +END + +STRINGTABLE +BEGIN + IDS_SMALLICONS "Small icons" + IDS_LARGEICONS "Large icons" + IDS_SHOWTEXTLABELS "Show text labels" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "No text labels" + IDS_SELECTIVETEXTONRIGHT "Selective text on right" +END + +STRINGTABLE +BEGIN + IDS_GOBUTTONLABEL "|Go||" + IDS_GOBUTTONTIPTEMPLATE "Go to ""%s""" +END + +STRINGTABLE +BEGIN + IDS_SEARCHLABEL "Search" + IDS_ADDRESSBANDLABEL "A&ddress" +END + +STRINGTABLE +BEGIN + IDS_FOLDERSLABEL "Folders" +END + +STRINGTABLE +BEGIN + IDS_HISTORYTEXT "&History\tCtrl+H" +END + +STRINGTABLE +BEGIN + IDS_UP "Up" +END + +STRINGTABLE +BEGIN + IDS_BACK "Back" + IDS_FORWARD "Forward" +END + + diff --git a/reactos/dll/win32/comctl32/comctl_He.rc b/reactos/dll/win32/comctl32/comctl_He.rc index 0f2d93bff30..13852c113f5 100644 --- a/reactos/dll/win32/comctl32/comctl_He.rc +++ b/reactos/dll/win32/comctl32/comctl_He.rc @@ -4,6 +4,8 @@ * Copyright 1999 Bertho Stultiens * Copyright 1999 Eric Kohl * + * Translated by Baruch Rutman + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -25,13 +27,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE { - IDS_CLOSE "סגירה" + IDS_CLOSE "סגור" } STRINGTABLE { IDM_TODAY "היום:" - IDM_GOTODAY "מעבר ליום הנוכחי" + IDM_GOTODAY "עבור להיום" } STRINGTABLE @@ -41,17 +43,17 @@ STRINGTABLE STRINGTABLE { - HKY_NONE "ללא" + HKY_NONE "אין" } IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "מאפיינים עבור %s" +CAPTION "מאפיינים של %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "אישור", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "ביטול", IDCANCEL,58,122,50,14 - PUSHBUTTON "ה&חלה", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "החל", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "עזרה", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END @@ -59,11 +61,11 @@ END IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" +CAPTION "אשף" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< ה&קודם", IDC_BACK_BUTTON,56,138,55,14 - DEFPUSHBUTTON "ה&בא >", IDC_NEXT_BUTTON,111,138,55,14 + PUSHBUTTON "< הקודם", IDC_BACK_BUTTON,56,138,55,14 + DEFPUSHBUTTON "הבא >", IDC_NEXT_BUTTON,111,138,55,14 DEFPUSHBUTTON "סיום", IDC_FINISH_BUTTON,111,138,55,14 PUSHBUTTON "ביטול", IDCANCEL,173,138,55,14 PUSHBUTTON "עזרה", IDHELP,235,138,55,14,WS_GROUP @@ -78,15 +80,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "התאמת סרגל כלים" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&סגירה", IDCANCEL,320,6,70,14 - PUSHBUTTON "&איפוס", IDC_RESET_BTN,320,23,70,14 - PUSHBUTTON "ע&זרה", IDC_HELP_BTN,320,40,70,14 - PUSHBUTTON "הזזה למ&עלה", IDC_MOVEUP_BTN,320,74,70,14 - PUSHBUTTON "הזזה למ&טה", IDC_MOVEDN_BTN,320,91,70,14 - LTEXT "לחצנים &זמינים:", -1,4,5,120,10 + DEFPUSHBUTTON "סגור", IDCANCEL,320,6,70,14 + PUSHBUTTON "אפס", IDC_RESET_BTN,320,23,70,14 + PUSHBUTTON "עזרה", IDC_HELP_BTN,320,40,70,14 + PUSHBUTTON "הזז למעלה", IDC_MOVEUP_BTN,320,74,70,14 + PUSHBUTTON "הזז למטה", IDC_MOVEDN_BTN,320,91,70,14 + LTEXT "לחצנים זמינים:", -1,4,5,120,10 LISTBOX IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "הוס&פה ->", IDOK, 132, 42, 55, 14 - PUSHBUTTON "<- ה&סרה", IDC_REMOVE_BTN,132,62,55,14 - LTEXT "&לחצני סרגל הכלים:", -1,194,5,120,10 + PUSHBUTTON "הוסף >-", IDOK, 132, 42, 55, 14 + PUSHBUTTON "<- הסר", IDC_REMOVE_BTN,132,62,55,14 + LTEXT "כפתורי סרגלי הכלים:", -1,194,5,120,10 LISTBOX IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END diff --git a/reactos/dll/win32/credui/credui.rc b/reactos/dll/win32/credui/credui.rc index 407dacde8de..7f82498d694 100644 --- a/reactos/dll/win32/credui/credui.rc +++ b/reactos/dll/win32/credui/credui.rc @@ -59,6 +59,9 @@ IDB_BANNER BITMAP banner.bmp #ifdef LANGUAGE_FR_FR #include "credui_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "credui_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "credui_Hu.rc" #endif diff --git a/reactos/dll/win32/credui/credui_He.rc b/reactos/dll/win32/credui/credui_He.rc new file mode 100644 index 00000000000..be24f51a3e1 --- /dev/null +++ b/reactos/dll/win32/credui/credui_He.rc @@ -0,0 +1,54 @@ +/* + * Hebrew language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "credui_resources.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "שם משתמש:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "סיסמה:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "זכור את הסיסמה שלי",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "אישור",IDOK,97,128,50,14 + PUSHBUTTON "ביטול",IDCANCEL,156,128,50,14 +END + +STRINGTABLE +{ + IDS_TITLEFORMAT "התחבר אל %s" + IDS_MESSAGEFORMAT "מתחבר אל %s" + IDS_INCORRECTPASSWORDTITLE "הכניסה לא הצליחה" + IDS_INCORRECTPASSWORD "נא לוודא ששם המשתמש/סיסמה נכונים" + IDS_CAPSLOCKONTITLE "Caps Lock פעיל" + IDS_CAPSLOCKON "Having Caps Lock on may cause you to enter your password incorrectly.\n\nPress the Caps Lock key on your keyboard to turn off Caps Lock before\nentering your password." +} diff --git a/reactos/dll/win32/crypt32/crypt32.rc b/reactos/dll/win32/crypt32/crypt32.rc index 5cd7414301e..3d11d93be0e 100644 --- a/reactos/dll/win32/crypt32/crypt32.rc +++ b/reactos/dll/win32/crypt32/crypt32.rc @@ -41,6 +41,9 @@ #ifdef LANGUAGE_FR_FR #include "crypt32_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "crypt32_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "crypt32_Hu.rc" #endif diff --git a/reactos/dll/win32/crypt32/crypt32_He.rc b/reactos/dll/win32/crypt32/crypt32_He.rc new file mode 100644 index 00000000000..7508d394000 --- /dev/null +++ b/reactos/dll/win32/crypt32/crypt32_He.rc @@ -0,0 +1,243 @@ +/* + * crypt32 dll resources + * + * Copyright (C) 2006 Juan Lang + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_AUTHORITY_KEY_ID "Authority Key Identifier" + IDS_KEY_ATTRIBUTES "Key Attributes" + IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction" + IDS_SUBJECT_ALT_NAME "Subject Alternative Name" + IDS_ISSUER_ALT_NAME "Issuer Alternative Name" + IDS_BASIC_CONSTRAINTS "Basic Constraints" + IDS_KEY_USAGE "Key Usage" + IDS_CERT_POLICIES "Certificate Policies" + IDS_SUBJECT_KEY_IDENTIFIER "Subject Key Identifier" + IDS_CRL_REASON_CODE "CRL Reason Code" + IDS_CRL_DIST_POINTS "CRL Distribution Points" + IDS_ENHANCED_KEY_USAGE "Enhanced Key Usage" + IDS_AUTHORITY_INFO_ACCESS "Authority Information Access" + IDS_CERT_EXTENSIONS "Certificate Extensions" + IDS_NEXT_UPDATE_LOCATION "Next Update Location" + IDS_YES_OR_NO_TRUST "Yes or No Trust" + IDS_EMAIL_ADDRESS "Email Address" + IDS_UNSTRUCTURED_NAME "Unstructured Name" + IDS_CONTENT_TYPE "Content Type" + IDS_MESSAGE_DIGEST "Message Digest" + IDS_SIGNING_TIME "Signing Time" + IDS_COUNTER_SIGN "Counter Sign" + IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" + IDS_SMIME_CAPABILITIES "SMIME Capabilities" + IDS_PREFER_SIGNED_DATA "Prefer Signed Data" + IDS_CPS "CPS" + IDS_USER_NOTICE "User Notice" + IDS_OCSP "On-line Certificate Status Protocol" + IDS_CA_ISSUER "Certification Authority Issuer" + IDS_CERT_TEMPLATE_NAME "Certification Template Name" + IDS_CERT_TYPE "Certificate Type" + IDS_CERT_MANIFOLD "Certificate Manifold" + IDS_NETSCAPE_CERT_TYPE "Netscape Cert Type" + IDS_NETSCAPE_BASE_URL "Netscape Base URL" + IDS_NETSCAPE_REVOCATION_URL "Netscape Revocation URL" + IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Revocation URL" + IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Cert Renewal URL" + IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" + IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" + IDS_NETSCAPE_COMMENT "Netscape Comment" + IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" + IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" + IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_COUNTRY "Country/Region" + IDS_ORGANIZATION "Organization" + IDS_ORGANIZATIONAL_UNIT "Organizational Unit" + IDS_COMMON_NAME "Common Name" + IDS_LOCALITY "Locality" + IDS_STATE_OR_PROVINCE "מדינה או מחוז" + IDS_TITLE "כותרת" + IDS_GIVEN_NAME "Given Name" + IDS_INITIALS "Initials" + IDS_SUR_NAME "שם משפחה" + IDS_DOMAIN_COMPONENT "Domain Component" + IDS_STREET_ADDRESS "Street Address" + IDS_SERIAL_NUMBER "Serial Number" + IDS_CA_VERSION "CA Version" + IDS_CROSS_CA_VERSION "Cross CA Version" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialized Signature Serial Number" + IDS_PRINCIPAL_NAME "Principal Name" + IDS_WINDOWS_PRODUCT_UPDATE "Windows Product Update" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair" + IDS_OS_VERSION "OS Version" + IDS_ENROLLMENT_CSP "Enrollment CSP" + IDS_CRL_NUMBER "CRL Number" + IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator" + IDS_ISSUING_DIST_POINT "Issuing Distribution Point" + IDS_FRESHEST_CRL "Freshest CRL" + IDS_NAME_CONSTRAINTS "Name Constraints" + IDS_POLICY_MAPPINGS "Policy Mappings" + IDS_POLICY_CONSTRAINTS "Policy Constraints" + IDS_CROSS_CERT_DIST_POINTS "Cross-Certificate Distribution Points" + IDS_APPLICATION_POLICIES "Application Policies" + IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings" + IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints" + IDS_CMC_DATA "CMC Data" + IDS_CMC_RESPONSE "CMC Response" + IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request" + IDS_CMC_STATUS_INFO "CMC Status Info" + IDS_CMC_EXTENSIONS "CMC Extensions" + IDS_CMC_ATTRIBUTES "CMC Attributes" + IDS_PKCS_7_DATA "PKCS 7 Data" + IDS_PKCS_7_SIGNED "PKCS 7 Signed" + IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped" + IDS_PKCS_7_DIGESTED "PKCS 7 Digested" + IDS_PKCS_7_ENCRYPTED "PKCS 7 Encrypted" + IDS_PREVIOUS_CA_CERT_HASH "Previous CA Certificate Hash" + IDS_CRL_VIRTUAL_BASE "Virtual Base CRL Number" + IDS_CRL_NEXT_PUBLISH "Next CRL Publish" + IDS_CA_EXCHANGE "CA Encryption Certificate" + IDS_KEY_RECOVERY_AGENT "Key Recovery Agent" + IDS_CERTIFICATE_TEMPLATE "Certificate Template Information" + IDS_ENTERPRISE_ROOT_OID "Enterprise Root OID" + IDS_RDN_DUMMY_SIGNER "Dummy Signer" + IDS_ARCHIVED_KEY_ATTR "Encrypted Private Key" + IDS_CRL_SELF_CDP "Published CRL Locations" + IDS_REQUIRE_CERT_CHAIN_POLICY "Enforce Certificate Chain Policy" + IDS_TRANSACTION_ID "Transaction Id" + IDS_SENDER_NONCE "Sender Nonce" + IDS_RECIPIENT_NONCE "Recipient Nonce" + IDS_REG_INFO "Reg Info" + IDS_GET_CERTIFICATE "Get Certificate" + IDS_GET_CRL "Get CRL" + IDS_REVOKE_REQUEST "Revoke Request" + IDS_QUERY_PENDING "Query Pending" + IDS_SORTED_CTL "Certificate Trust List" + IDS_ARCHIVED_KEY_CERT_HASH "Archived Key Certificate Hash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Private Key Usage Period" + IDS_CLIENT_INFORMATION "Client Information" + IDS_SERVER_AUTHENTICATION "Server Authentication" + IDS_CLIENT_AUTHENTICATION "Client Authentication" + IDS_CODE_SIGNING "חתימת קוד" + IDS_SECURE_EMAIL "דוא""ל מאובטח" + IDS_TIME_STAMPING "Time Stamping" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Trust List Signing" + IDS_MICROSOFT_TIME_STAMPING "Microsoft Time Stamping" + IDS_IPSEC_END_SYSTEM "IP security end system" + IDS_IPSEC_TUNNEL "IP security tunnel termination" + IDS_IPSEC_USER "IP security user" + IDS_EFS "Encrypting File System" + IDS_WHQL_CRYPTO "Windows Hardware Driver Verification" + IDS_NT5_CRYPTO "Windows System Component Verification" + IDS_OEM_WHQL_CRYPTO "OEM Windows System Component Verification" + IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Component Verification" + IDS_KEY_PACK_LICENSES "Key Pack Licenses" + IDS_LICENSE_SERVER "License Server Verification" + IDS_SMART_CARD_LOGON "Smart Card Logon" + IDS_DIGITAL_RIGHTS "זכויות דיגיטליות" + IDS_QUALIFIED_SUBORDINATION "Qualified Subordination" + IDS_KEY_RECOVERY "שחזור מפתח" + IDS_DOCUMENT_SIGNING "חתימת מסמך" + IDS_IPSEC_IKE_INTERMEDIATE "IP security IKE intermediate" + IDS_FILE_RECOVERY "שחזור קובץ" + IDS_ROOT_LIST_SIGNER "Root List Signer" + IDS_ANY_APPLICATION_POLICIES "All application policies" + IDS_DS_EMAIL_REPLICATION "Directory Service Email Replication" + IDS_ENROLLMENT_AGENT "Certificate Request Agent" + IDS_LIFETIME_SIGNING "חתימה לכל החיים" + IDS_ANY_CERT_POLICY "All issuance policies" +} + +STRINGTABLE +{ + IDS_LOCALIZEDNAME_ROOT "Trusted Root Certification Authorities" + IDS_LOCALIZEDNAME_MY "Personal" + IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Trusted Publishers" + IDS_LOCALIZEDNAME_DISALLOWED "Untrusted Certificates" +} + +STRINGTABLE +{ + IDS_KEY_ID "KeyID=" + IDS_CERT_ISSUER "Certificate Issuer" + IDS_CERT_SERIAL_NUMBER "Certificate Serial Number=" + IDS_ALT_NAME_OTHER_NAME "Other Name=" + IDS_ALT_NAME_RFC822_NAME "כתובת דוא""ל=" + IDS_ALT_NAME_DNS_NAME "DNS Name=" + IDS_ALT_NAME_DIRECTORY_NAME "Directory Address" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "כתובת IP=" + IDS_ALT_NAME_MASK "מסכה=" + IDS_ALT_NAME_REGISTERED_ID "Registered ID=" + IDS_USAGE_UNKNOWN "Unknown Key Usage" + IDS_SUBJECT_TYPE "Subject Type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "End Entity" + IDS_PATH_LENGTH "Path Length Constraint=" + IDS_PATH_LENGTH_NONE "אין" + IDS_INFO_NOT_AVAILABLE "Information Not Available" + IDS_AIA "Authority Info Access" + IDS_ACCESS_METHOD "Access Method=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA Issuers" + IDS_ACCESS_METHOD_UNKNOWN "Unknown Access Method" + IDS_ACCESS_LOCATION "Alternative Name" + IDS_CRL_DIST_POINT "CRL Distribution Point" + IDS_CRL_DIST_POINT_NAME "Distribution Point Name" + IDS_CRL_DIST_POINT_FULL_NAME "שם מלא" + IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" + IDS_CRL_DIST_POINT_REASON "CRL Reason=" + IDS_CRL_DIST_POINT_ISSUER "CRL Issuer" + IDS_REASON_KEY_COMPROMISE "Key Compromise" + IDS_REASON_CA_COMPROMISE "CA Compromise" + IDS_REASON_AFFILIATION_CHANGED "Affiliation Changed" + IDS_REASON_SUPERSEDED "Superseded" + IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased" + IDS_REASON_CERTIFICATE_HOLD "Certificate Hold" + IDS_FINANCIAL_CRITERIA "Financial Information=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "זמין" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "לא זמין" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" + IDS_YES "כן" + IDS_NO "לא" + IDS_DIGITAL_SIGNATURE "חתימה דיגיטלית" + IDS_NON_REPUDIATION "Non-Repudiation" + IDS_KEY_ENCIPHERMENT "Key Encipherment" + IDS_DATA_ENCIPHERMENT "Data Encipherment" + IDS_KEY_AGREEMENT "הסכם מפתח" + IDS_CERT_SIGN "Certificate Signing" + IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing" + IDS_CRL_SIGN "חתימת CRL" + IDS_ENCIPHER_ONLY "Encipher Only" + IDS_DECIPHER_ONLY "Decipher Only" + IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication" + IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "חתימה" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Signature CA" +} diff --git a/reactos/dll/win32/cryptdlg/cryptdlg.rc b/reactos/dll/win32/cryptdlg/cryptdlg.rc index 783d360b3fb..1c3b222a758 100644 --- a/reactos/dll/win32/cryptdlg/cryptdlg.rc +++ b/reactos/dll/win32/cryptdlg/cryptdlg.rc @@ -45,6 +45,9 @@ #ifdef LANGUAGE_FR_FR #include "cryptdlg_Fr.rc" #endif +#ifdef LANGAUE_HE_IL + #include "cryptdlg_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "cryptdlg_Hu.rc" #endif diff --git a/reactos/dll/win32/cryptdlg/cryptdlg_He.rc b/reactos/dll/win32/cryptdlg/cryptdlg_He.rc new file mode 100644 index 00000000000..68f2d9af05b --- /dev/null +++ b/reactos/dll/win32/cryptdlg/cryptdlg_He.rc @@ -0,0 +1,40 @@ +/* + * cryptdlg dll resources + * + * Copyright 2008 Juan Lang + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CERT_POLICY "Certificate Policy" + IDS_POLICY_ID "Policy Identifier: " + IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" + IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "User Notice" + IDS_QUALIFIER "Qualifier" + IDS_NOTICE_REF "Notice Reference" + IDS_ORGANIZATION "ארגון=" + IDS_NOTICE_NUM "Notice Number=" + IDS_NOTICE_TEXT "Notice Text=" +} diff --git a/reactos/dll/win32/cryptui/cryptui.rc b/reactos/dll/win32/cryptui/cryptui.rc index 60f6a19d6b3..6e8de9029c4 100644 --- a/reactos/dll/win32/cryptui/cryptui.rc +++ b/reactos/dll/win32/cryptui/cryptui.rc @@ -64,6 +64,9 @@ IDB_CERT_HEADER BITMAP certheader.bmp #ifdef LANGUAGE_FR_FR #include "cryptui_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "cryptui_He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "cryptui_It.rc" #endif diff --git a/reactos/dll/win32/cryptui/cryptui_He.rc b/reactos/dll/win32/cryptui/cryptui_He.rc new file mode 100644 index 00000000000..55c10b9216b --- /dev/null +++ b/reactos/dll/win32/cryptui/cryptui_He.rc @@ -0,0 +1,460 @@ +/* + * cryptui dll resources + * + * Copyright 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptuires.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CERTIFICATE "Certificate" + IDS_CERTIFICATEINFORMATION "Certificate Information" + IDS_CERT_INFO_BAD_SIG "This certificate has an invalid signature. The certificate may have been altered or corrupted." + IDS_CERT_INFO_UNTRUSTED_CA "This root certificate is not trusted. To trust it, add it to your system's trusted root certificate store." + IDS_CERT_INFO_UNTRUSTED_ROOT "This certificate could not be validated to a trusted root certificate." + IDS_CERT_INFO_PARTIAL_CHAIN "This certificate's issuer could not be found." + IDS_CERT_INFO_BAD_PURPOSES "All the intended purposes of this certificate could not be verified." + IDS_CERT_INFO_PURPOSES "This certificate is intended for the following purposes:" + IDS_SUBJECT_HEADING "Issued to: " + IDS_ISSUER_HEADING "Issued by: " + IDS_VALID_FROM "Valid from " + IDS_VALID_TO " to " + IDS_CERTIFICATE_BAD_SIGNATURE "This certificate has an invalid signature." + IDS_CERTIFICATE_BAD_TIME "This certificate has expired or is not yet valid." + IDS_CERTIFICATE_BAD_TIMENEST "This certificate's validity period exceeds that of its issuer." + IDS_CERTIFICATE_REVOKED "This certificate was revoked by its issuer." + IDS_CERTIFICATE_VALID "This certificate is OK." + IDS_FIELD "Field" + IDS_VALUE "Value" + IDS_FIELDS_ALL "" + IDS_FIELDS_V1 "Version 1 Fields Only" + IDS_FIELDS_EXTENSIONS "Extensions Only" + IDS_FIELDS_CRITICAL_EXTENSIONS "Critical Extensions Only" + IDS_FIELDS_PROPERTIES "Properties Only" + IDS_FIELD_VERSION "Version" + IDS_FIELD_SERIAL_NUMBER "Serial number" + IDS_FIELD_ISSUER "Issuer" + IDS_FIELD_VALID_FROM "Valid from" + IDS_FIELD_VALID_TO "Valid to" + IDS_FIELD_SUBJECT "Subject" + IDS_FIELD_PUBLIC_KEY "Public key" + IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bits)" + IDS_PROP_HASH "SHA1 hash" + IDS_PROP_ENHKEY_USAGE "Enhanced key usage (property)" + IDS_PROP_FRIENDLY_NAME "Friendly name" + IDS_PROP_DESCRIPTION "Description" + IDS_CERTIFICATE_PROPERTIES "Certificate Properties" + IDS_CERTIFICATE_PURPOSE_ERROR "Please enter an OID in the form 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "The OID you entered already exists." + IDS_SELECT_STORE_TITLE "Select Certificate Store" + IDS_SELECT_STORE "Please select a certificate store." + IDS_IMPORT_WIZARD "Certificate Import Wizard" + IDS_IMPORT_TYPE_MISMATCH "The file contains objects that do not match the given criteria. Please select another file." + IDS_IMPORT_FILE_TITLE "File to Import" + IDS_IMPORT_FILE_SUBTITLE "Specify the file you want to import." + IDS_IMPORT_STORE_TITLE "Certificate Store" + IDS_IMPORT_STORE_SUBTITLE "Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists." + IDS_IMPORT_FILTER_CERT "X.509 Certificate (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Personal Information Exchange (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Certificate Revocation List (*.crl)" + IDS_IMPORT_FILTER_CTL "Certificate Trust List (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft Serialized Certificate Store (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "All files (*.*)" + IDS_IMPORT_EMPTY_FILE "Please select a file." + IDS_IMPORT_BAD_FORMAT "The file format is not recognized. Please select another file." + IDS_IMPORT_OPEN_FAILED "Could not open " + IDS_IMPORT_DEST_DETERMINED "Determined by the program" + IDS_IMPORT_SELECT_STORE "Please select a store" + IDS_IMPORT_STORE_SELECTION "Certificate Store Selected" + IDS_IMPORT_DEST_AUTOMATIC "Automatically determined by the program" + IDS_IMPORT_FILE "File" + IDS_IMPORT_CONTENT "Content" + IDS_IMPORT_CONTENT_CERT "Certificate" + IDS_IMPORT_CONTENT_CRL "Certificate Revocation List" + IDS_IMPORT_CONTENT_CTL "Certificate Trust List" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Message" + IDS_IMPORT_CONTENT_PFX "Personal Information Exchange" + IDS_IMPORT_CONTENT_STORE "Certificate Store" + IDS_IMPORT_SUCCEEDED "The import was successful." + IDS_IMPORT_FAILED "The import failed." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "" + IDS_PURPOSE_ADVANCED "" + IDS_SUBJECT_COLUMN "Issued To" + IDS_ISSUER_COLUMN "Issued By" + IDS_EXPIRATION_COLUMN "Expiration Date" + IDS_FRIENDLY_NAME_COLUMN "Friendly Name" + IDS_ALLOWED_PURPOSE_ALL "" + IDS_ALLOWED_PURPOSE_NONE "" + IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\n\ +Are you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\n\ +Are you sure you want to remove these certificates?" + IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\n\ +Are you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\n\ +Are you sure you want to remove these certificates?" + IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\n\ +Are you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\n\ +Are you sure you want to remove these certificates?" + IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\n\ +Are you sure you want to remove this trusted root certificate?" + IDS_WARN_REMOVE_PLURAL_ROOT "Certificates issued by these root certification authorities, or any certification authorities they issued, will no longer be trusted.\n\ +Are you sure you want to remove these trusted root certificates?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software signed by this publisher will no longer be trusted.\n\ +Are you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software signed by these publishers will no longer be trusted.\n\ +Are you sure you want to remove these certificates?" + IDS_WARN_REMOVE_DEFAULT "Are you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" + IDS_CERT_MGR "Certificates" + IDS_FRIENDLY_NAME_NONE "" + IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer" + IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" + IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\n\ +Protects software from alteration after publication" + IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages" + IDS_PURPOSE_IPSEC "Allows secure communication over the Internet" + IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time" + IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list" + IDS_PURPOSE_EFS "Allows data on disk to be encrypted" + IDS_PURPOSE_EFS_RECOVERY "File Recovery" + IDS_PURPOSE_WHQL "Windows Hardware Driver Verification" + IDS_PURPOSE_NT5 "Windows System Component Verification" + IDS_PURPOSE_OEM_WHQL "OEM Windows System Component Verification" + IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Component Verification" + IDS_PURPOSE_ROOT_LIST_SIGNER "Root List Signer" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualified Subordination" + IDS_PURPOSE_KEY_RECOVERY "Key Recovery" + IDS_PURPOSE_DOCUMENT_SIGNING "Document Signing" + IDS_PURPOSE_LIFETIME_SIGNING "Lifetime Signing" + IDS_PURPOSE_DRM "Digital Rights" + IDS_PURPOSE_LICENSES "Key Pack Licenses" + IDS_PURPOSE_LICENSE_SERVER "License Server Verification" + IDS_PURPOSE_ENROLLMENT_AGENT "Certificate Request Agent" + IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon" + IDS_PURPOSE_CA_EXCHANGE "Private Key Archival" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication" + IDS_EXPORT_WIZARD "Certificate Export Wizard" + IDS_EXPORT_FORMAT_TITLE "Export Format" + IDS_EXPORT_FORMAT_SUBTITLE "Choose the format in which the content will be saved." + IDS_EXPORT_FILE_TITLE "Export Filename" + IDS_EXPORT_FILE_SUBTITLE "Specify the name of the file in which the content will be saved." + IDS_EXPORT_FILE_EXISTS "The specified file already exists. Do you want to replace it?" + IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Certificate Revocation List (*.crl)" + IDS_EXPORT_FILTER_CTL "Certificate Trust List (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.p7b)" + IDS_EXPORT_FILTER_PFX "Personal Information Exchange (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Serialized Certificate Store (*.sst)" + IDS_EXPORT_FORMAT "File Format" + IDS_EXPORT_INCLUDE_CHAIN "Include all certificates in certificate path" + IDS_EXPORT_KEYS "Export keys" + IDS_YES "Yes" + IDS_NO "No" + IDS_EXPORT_SUCCEEDED "The export was successful." + IDS_EXPORT_FAILED "The export failed." + IDS_EXPORT_PRIVATE_KEY_TITLE "Export Private Key" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "The certificate contains a private key which may be exported along with the certificate." + IDS_EXPORT_PASSWORD_TITLE "Enter Password" + IDS_EXPORT_PASSWORD_SUBTITLE "You may password-protect a private key." + IDS_EXPORT_PASSWORD_MISMATCH "The passwords do not match." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Note: The private key for this certificate could not be opened." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: The private key for this certificate is not exportable." +} + +IDD_GENERAL DIALOG 0, 0, 255, 236 +CAPTION "General" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,53,216,95,14 + PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,152,216,95,14 +END + +IDD_DETAIL DIALOG 0, 0, 255, 236 +CAPTION "Details" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Show:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&Edit Properties...", IDC_EDITPROPERTIES,53,216,95,14 + PUSHBUTTON "&Copy to File...", IDC_EXPORT,152,216,95,14 +END + +IDD_HIERARCHY DIALOG 0, 0, 255, 236 +CAPTION "Certification Path" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certification path", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&View Certificate", IDC_VIEWCERTIFICATE,155,156,90,14 + LTEXT "Certificate &status:", IDC_CERTIFICATESTATUS,6,183,200,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG 0, 0, 255, 256 +CAPTION "Disclaimer" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "Close", IDOK,73,216,85,14 + PUSHBUTTON "More &Info", IDC_CPS,162,216,85,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236 +CAPTION "General" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Friendly name:", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Description:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Certificate purposes", -1,6,48,245,185, BS_GROUPBOX + AUTORADIOBUTTON "&Enable all purposes for this certificate", + IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "D&isable all purposes for this certificate", + IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Enable &only the following purposes for this certificate:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,106 + PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,174,212,70,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68 +CAPTION "Add Purpose" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Add the object identifier (OID) for the certificate purpose you wish to add:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "OK", IDOK, 33,48,60,14 + PUSHBUTTON "Cancel", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG 0,0,200,136 +CAPTION "Select Certificate Store" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the certificate store you want to use:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Show physical stores", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,7,195,30 + LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\ +\n\ +A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\ +\n\ +To continue, click Next.", + -1, 115,40,195,120 +END + +IDD_IMPORT_FILE DIALOG 0,0,317,178 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File name:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Note: The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:", + -1, 21,30,265,16 + LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)", + -1, 31,53,265,10 + LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)", + -1, 31,68,265,10 + LTEXT "Microsoft Serialized Certificate Store (.sst)", + -1, 31,83,265,10 +END + +IDD_IMPORT_STORE DIALOG 0,0,317,143 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine can automatically select the certificate store, or you can specify a location for the certificates.", + -1, 21,1,220,25 + AUTORADIOBUTTON "&Automatically select certificate store", + IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Place all certificates in the following store:", + IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY + PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14 +END + +IDD_IMPORT_FINISH DIALOG 0,0,317,178 +CAPTION "Certificate Import Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "You have successfully completed the Certificate Import Wizard.", + -1, 115,33,195,24 + LTEXT "You have specified the following settings:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG 0,0,335,270 +CAPTION "Certificates" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "I&ntended purpose:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,65,14 + PUSHBUTTON "&Export...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED + PUSHBUTTON "&Remove", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED + PUSHBUTTON "&Advanced...", IDC_MGR_ADVANCED, 263,172,65,14 + GROUPBOX "Certificate intended purposes", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32 + PUSHBUTTON "&View", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Close", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176 +CAPTION "Advanced Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certificate purpose", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "Select one or more purposes to be listed when Advanced Purposes is selected.", + -1, 14,18,220,16 + LTEXT "&Certificate purposes:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30 + LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\ +\n\ +A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\ +\n\ +To continue, click Next.", + -1, 115,40,195,120 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,25 + LTEXT "Do you wish to export the private key?", -1, 21,27,195,10 + AUTORADIOBUTTON "&Yes, export the private key", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "N&o, do not export the private key", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Password:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Confirm password:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the format you want to use:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON + CHECKBOX "&Include all certificates in the certification path if possible", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "Incl&ude all certificates in the certification path if possible", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Enable strong encryption", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "Delete the private &key if the export is successful", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG 0,0,317,143 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&File name:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "B&rowse...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG 0,0,317,178 +CAPTION "Certificate Export Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Certificate Export Wizard", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "You have successfully completed the Certificate Export Wizard.", + -1, 115,33,195,24 + LTEXT "You have specified the following settings:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END diff --git a/reactos/dll/win32/devmgr/devmgr.rc b/reactos/dll/win32/devmgr/devmgr.rc index af52bc394dd..854848621b8 100644 --- a/reactos/dll/win32/devmgr/devmgr.rc +++ b/reactos/dll/win32/devmgr/devmgr.rc @@ -31,6 +31,9 @@ IDI_DEVMGR ICON "resources/devmgr.ico" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif diff --git a/reactos/dll/win32/devmgr/lang/he-IL.rc b/reactos/dll/win32/devmgr/lang/he-IL.rc new file mode 100644 index 00000000000..eeaa455e662 --- /dev/null +++ b/reactos/dll/win32/devmgr/lang/he-IL.rc @@ -0,0 +1,230 @@ +// Hebrew language resource file by Baruch Rutman + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "שם" + IDS_TYPE "סוג" + IDS_MANUFACTURER "יצרן: %1" + IDS_LOCATION "מיקום: %1" + IDS_STATUS "מצב ההתקן: %1" + IDS_UNKNOWN "לא ידוע" + IDS_LOCATIONSTR "מיקום %1!u! (%2)" + IDS_DEVCODE " (קוד %1!u!)" + IDS_DEVCODE2 " (קוד %2!u!)" + IDS_ENABLEDEVICE "התשמש בהתקן זה (אפשר)" + IDS_DISABLEDEVICE "אל תשתמש בהתקן זה (הפסק)" + IDS_UNKNOWNDEVICE "התקן לא ידוע" + IDS_NODRIVERLOADED "אין מנהלי התקנים מותקנים עבור התקן זה" + IDS_DEVONPARENT "על %1" + IDS_TROUBLESHOOTDEV "פתור בעיות..." + IDS_ENABLEDEV "אפשר התקן" + IDS_REINSTALLDRV "התקן מחדש את מנהל ההתקן" + IDS_PROPERTIES "מאפיינים" + IDS_UPDATEDRV "עדכן מנהל התקן..." + IDS_REBOOT "הפעל מחדש את המחשב..." + IDS_NOTAVAILABLE "לא זמין" + IDS_NOTDIGITALLYSIGNED "לא חתום דיגיטלית" + IDS_NODRIVERS "קבצי מנהל ההתקן עבור התקן זה אינם דרושים ולא נטענו." +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "התקן זה פועל כראוי" + IDS_DEV_NOT_CONFIGURED "This device is not configured correctly." + IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two %1 bus types." + IDS_DEV_DEVLOADER_FAILED2 "The %1 device loader(s) for this device could not load the device driver." + IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." + IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." + IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." + IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file %1 that loads the drivers for the device." + IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file %1 that loads the drivers for this device is bad." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." + IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." + IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " + IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." + IDS_DEV_NORMAL_CONFLICT "This device cannot find any free %1 resources to use." + IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_NEED_RESTART "This device cannot work properly until you restart your computer." + IDS_DEV_REENUMERATION "This device is causing a resource conflict." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." + IDS_DEV_UNKNOWN_RESOURCE "The driver information file %1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_REINSTALL "The drivers for this device need to be reinstalled." + IDS_DEV_REGISTRY "Your registry may be bad." + IDS_DEV_WILL_BE_REMOVED "ReactOS is removing this device." + IDS_DEV_DISABLED "This device is not started." + IDS_DEV_DISABLED2 "This device is disabled." + IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." + IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_MOVED "ReactOS is in the process of setting up this device." + IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." + IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." + IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." + IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." + IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." + IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." + IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." + IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." + IDS_DEV_FAILED_POST_START "ReactOS has stopped this device because it has reported problems." + IDS_DEV_HALTED "An application or service has shut down this hardware device." + IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." +END + +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device Instance ID" + IDS_PROP_HARDWAREIDS "Hardware IDs" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_CAPABILITIES "Capabilities" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTIONRELATIONS "Ejection Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Device Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Device Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Class Upper Filters" + IDS_PROP_CLASSLOWERFILTERS "Class Lower Filters" + IDS_PROP_CLASSINSTALLER "Class Installers" + IDS_PROP_CLASSCOINSTALLER "Class Coinstallers" + IDS_PROP_DEVICECOINSTALLER "Device Coinstallers" + IDS_PROP_FIRMWAREREVISION "Firmware Revision" + IDS_PROP_CURRENTPOWERSTATE "Current Power State" + IDS_PROP_POWERCAPABILITIES "Power Capabilities" + IDS_PROP_POWERSTATEMAPPINGS "Power State Mappings" +END + + +IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 +STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "התקנים:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "מאפייני התקן",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "פתירת בעיות...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "מאפיינים",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "סוג התקן:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "יצרן:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "מיקום:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "מצב ההתקן", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "פתירת בעיות...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "שימוש של ההתקן:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "מנהל התקן" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ספק מנהל התקן:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "תאריך מנהל התקן:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "גירסת מנהל התקן:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "יוצר חתימה דיגיטלית:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "פרטי מנהל ההתקן...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "לשם הצגת פרטים אודות קבצי מנהל ההתקן.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "פרטי קובץ מנהל התקן" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "קבצי מנהל התקן:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "ספק:", -1, 14, 134, 50, 8 + EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "גרסת קובץ:", -1, 14, 150, 50, 8 + EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "זכויות יוצרים:", -1, 14, 166, 50, 8 + EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "יוצר חתימה דיגיטלית:", -1, 14, 182, 50, 8 + EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "אישור", IDOK, 167, 208, 50, 14 +END + +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "פרטים" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "משאבים" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "צריכת חשמל" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END diff --git a/reactos/dll/win32/hhctrl.ocx/He.rc b/reactos/dll/win32/hhctrl.ocx/He.rc new file mode 100644 index 00000000000..d86afe430c8 --- /dev/null +++ b/reactos/dll/win32/hhctrl.ocx/He.rc @@ -0,0 +1,72 @@ +/* + * HTML Help resources + * Hebrew Language Support + * + * Copyright 2005 James Hawkins + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "תוכ&ן" + IDS_INDEX "&אינקס" + IDS_SEARCH "&חפש" + IDS_FAVORITES "מועדפים" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "הראה" + IDTB_CONTRACT "החבא" + IDTB_STOP "עצור" + IDTB_REFRESH "רענן" + IDTB_BACK "אחורה" + IDTB_HOME "בית" + IDTB_SYNC "סנכרון" + IDTB_PRINT "הדפס" + IDTB_OPTIONS "אפשרויות" + IDTB_FORWARD "קדימה" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Customize" + IDTB_ZOOM "הגדל" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +LANGUAGE LANG_HEBREW, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "תוכ&ן" + IDS_INDEX "&אינדקס" + IDS_SEARCH "&חפש" + IDS_FAVORITES "מועדפים" +END diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc index 40bfe6472e9..1522ec8e1b1 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc @@ -76,6 +76,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "It.rc" #endif diff --git a/reactos/dll/win32/iccvid/iccvid_He.rc b/reactos/dll/win32/iccvid/iccvid_He.rc new file mode 100644 index 00000000000..4088c4a02f6 --- /dev/null +++ b/reactos/dll/win32/iccvid/iccvid_He.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NAME "מקודד וידאו Cinepak" + IDS_DESCRIPTION "מקודד וידאו Cinepak" +} diff --git a/reactos/dll/win32/iccvid/rsrc.rc b/reactos/dll/win32/iccvid/rsrc.rc index 972fea2f7d6..1d023bef1ea 100644 --- a/reactos/dll/win32/iccvid/rsrc.rc +++ b/reactos/dll/win32/iccvid/rsrc.rc @@ -60,6 +60,9 @@ #ifdef LANGUAGE_FR_FR #include "iccvid_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "iccvid_He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "iccvid_It.rc" #endif diff --git a/reactos/dll/win32/jscript/jscript_He.rc b/reactos/dll/win32/jscript/jscript_He.rc new file mode 100644 index 00000000000..75aae4a3848 --- /dev/null +++ b/reactos/dll/win32/jscript/jscript_He.rc @@ -0,0 +1,49 @@ +/* + * Copyright 2009 Piotr Caban + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_TO_PRIMITIVE "Error converting object to primitive type" + IDS_INVALID_CALL_ARG "Invalid procedure call or argument" + IDS_CREATE_OBJ_ERROR "Automation server can't create object" + IDS_NO_PROPERTY "Object doesn't support this property or method" + IDS_ARG_NOT_OPT "Argument not optional" + IDS_SYNTAX_ERROR "שגיאת תחביר" + IDS_SEMICOLON "צפוי ';'" + IDS_LBRACKET "צפוי '('" + IDS_RBRACKET "צפוי ')'" + IDS_UNTERMINATED_STR "Unterminated string constant" + IDS_NOT_FUNC "פונקציה הייתה צפוייה" + IDS_NOT_DATE "'[object]' is not a date object" + IDS_NOT_NUM "מספר היה צפוי" + IDS_OBJECT_EXPECTED "אובייקט היה צפוי" + IDS_ILLEGAL_ASSIGN "השמה בלתי חוקית" + IDS_UNDEFINED "'|' לא מוגדר" + IDS_NOT_BOOL "אובייקט בוליאני היה צפוי" + IDS_JSCRIPT_EXPECTED "אובייקט JScript היה צפוי" + IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" + IDS_URI_INVALID_CHAR "URI to be encoded contains invalid characters" + IDS_INVALID_LENGTH "Array length must be a finite positive integer" + IDS_ARRAY_EXPECTED "אובייקט מערך היה צפוי" +} diff --git a/reactos/dll/win32/jscript/rsrc.rc b/reactos/dll/win32/jscript/rsrc.rc index 95499bcd734..502cd94fc6b 100644 --- a/reactos/dll/win32/jscript/rsrc.rc +++ b/reactos/dll/win32/jscript/rsrc.rc @@ -42,6 +42,9 @@ REGINST REGINST jscript.inf #ifdef LANGUAGE_FR_FR #include "jscript_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "jscript_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "jscript_Hu.rc" #endif diff --git a/reactos/dll/win32/localspl/localspl.rc b/reactos/dll/win32/localspl/localspl.rc index bf9a17dfe89..76dee7f1d2f 100644 --- a/reactos/dll/win32/localspl/localspl.rc +++ b/reactos/dll/win32/localspl/localspl.rc @@ -71,6 +71,9 @@ #ifdef LANGUAGE_ES_ES #include "spl_Es.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "spl_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "spl_Hu.rc" #endif diff --git a/reactos/dll/win32/localspl/spl_He.rc b/reactos/dll/win32/localspl/spl_He.rc new file mode 100644 index 00000000000..f119fbe3289 --- /dev/null +++ b/reactos/dll/win32/localspl/spl_He.rc @@ -0,0 +1,32 @@ +/* + * Hebrew resources for localspl + * + * Copyright 2005 Huw Davies + * Copyright 2006 Detlef Riekenberg + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "localspl_private.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "יציאה מקומית" + IDS_LOCALMONITOR "ניטור מקומי" +} diff --git a/reactos/dll/win32/localui/localui.rc b/reactos/dll/win32/localui/localui.rc index 25b75a977ff..19bd9007924 100644 --- a/reactos/dll/win32/localui/localui.rc +++ b/reactos/dll/win32/localui/localui.rc @@ -72,6 +72,9 @@ #ifdef LANGUAGE_FR_FR #include "ui_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "ui_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "ui_Hu.rc" #endif diff --git a/reactos/dll/win32/localui/ui_He.rc b/reactos/dll/win32/localui/ui_He.rc new file mode 100644 index 00000000000..2c0e5a7d432 --- /dev/null +++ b/reactos/dll/win32/localui/ui_He.rc @@ -0,0 +1,58 @@ +/* + * Hebrew resources for localui + * + * Copyright 2007 Detlef Riekenberg + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "localui.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הוסף יציאה מקומית" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "הזן את שם היציאה כדי להוסיפה:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "הגדרת יציאת LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "פסק זמן (שניות)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "ניסיון שידור חוזר:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "אישור", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE +{ + IDS_LOCALPORT "יציאה מקומית" + IDS_INVALIDNAME "'%s' אינו שם יציאה חוקי" + IDS_PORTEXISTS "יציאה %s כבר קיימת" + IDS_NOTHINGTOCONFIG "ליציאה הזו אין אפשרויות להגדיר" +} diff --git a/reactos/dll/win32/mapi32/He.rc b/reactos/dll/win32/mapi32/He.rc new file mode 100644 index 00000000000..5fcabcded0b --- /dev/null +++ b/reactos/dll/win32/mapi32/He.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Hebrew resources +* +* Copyright 2009 Owen Rudge for CodeWeavers +* +* Translated by Baruch Rutman +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "שליחת הדואר נכשלה מכיוון שאין לכם לקוח MAPI מותקן." + IDS_SEND_MAIL, "שליחת דואר" +} diff --git a/reactos/dll/win32/mapi32/version.rc b/reactos/dll/win32/mapi32/version.rc index 4a88688171b..9b7a825086f 100644 --- a/reactos/dll/win32/mapi32/version.rc +++ b/reactos/dll/win32/mapi32/version.rc @@ -45,6 +45,9 @@ #ifdef LANGUAGE_FR_FR #include "Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "Hu.rc" #endif diff --git a/reactos/dll/win32/modemui/lang/he-IL.rc b/reactos/dll/win32/modemui/lang/he-IL.rc new file mode 100644 index 00000000000..af12e2e2dae --- /dev/null +++ b/reactos/dll/win32/modemui/lang/he-IL.rc @@ -0,0 +1,613 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "שכפל...", 0 + MENUITEM "הסר", 1 + MENUITEM "ראה יומן", 2 + MENUITEM SEPARATOR + MENUITEM "מאפיינים", 3 + MENUITEM "העתק מאפיינים", 4 + MENUITEM "החל מאפיינים", 5 + END +END + +IDD_ADVANCED DIALOGEX 17, 12, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "הגדרות נוספות", 1018, 6, 6, 225, 70 + LTEXT "E&xtra initialization commands:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&Wait for credit card tone:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "שניות", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "בחירות אזור/מדינה", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "אפשרויות יציאה מתקדמות...", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "שנה העדפות ברירת מחדל...", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "יציאה:", 1018, 9, 8, 32, 10 + LTEXT "יציאת COM", 1095, 48, 8, 181, 10 + GROUPBOX "&Speaker volume", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "כבוי", 1045, 56, 40, 22, 8 + LTEXT "High", 1001, 155, 40, 25, 11 + GROUPBOX "&Maximum Port Speed", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "בקרת חיוג", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&Wait for dial tone before dialing", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Distinctive Ring" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "&This phone line has Distinctive Ring Services", 1069, 20, 7, 184, 10 + CTEXT "Ring Pattern", -1, 84, 21, 70, 8 + CTEXT "Type of Call", -1, 159, 21, 63, 8 + LTEXT "&Primary address:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Address &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Address &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Address &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Priority &callers:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Call&back:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Distinctive Ring" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "&This phone line has Distinctive Ring Services", 1069, 19, 7, 177, 10 + CTEXT "Ring Pattern", -1, 20, 21, 74, 8 + CTEXT "Type of Call", -1, 96, 21, 65, 8 + LTEXT "&Single ring:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Double ring:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "T&riple ring:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOGEX 0, 0, 238, 215 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "אבחונים" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "&Query Modem", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Record a &Log", 1020, 18, 187, 98, 10 + PUSHBUTTON "&View log", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Modem Information", 1047, 10, 6, 217, 164 + GROUPBOX "Logging", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "נא לחכות..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Communicating with Modem. This may take several seconds.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "ביטול", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Operator assisted (manual) dial", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "&Disconnect a call if idle for more than", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "&Cancel the call if not connected within", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Port speed:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "D&ata Protocol:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Comp&ression:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Flow control:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Call preferences", 1060, 11, 7, 217, 66 + LTEXT "דקות", 1044, 195, 38, 22, 8 + LTEXT "שניות", 1041, 194, 56, 22, 8 + GROUPBOX "Data Connection Preferences", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOGEX 17, 12, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "מתקדם" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Bring up terminal window &before dialing", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Bring up terminal window a&fter dialing", 1001, 20, 38, 200, 10 + RTEXT "&Data bits:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Parity:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Stop bits:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Modulation:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Terminal Window", 1004, 10, 7, 217, 49 + GROUPBOX "הגדרות חומרה", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Switch &Type", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&First Number", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Second Number", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "נא לחכות" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Sending country/region information to Modem.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOGEX 0, 0, 360, 105 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "אזהרה" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Do not show this message again", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "אישור", 1, 302, 84, 50, 14 + LTEXT "Some modems do not properly handle initialization strings of this length.", -1, 50, 27, 304, 8 + LTEXT "Information about this limitation can be obtained from your modem manufacturer.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "You have entered a modem initialization string greater than 57 characters long.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "מודמים" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "The following &modems are installed:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "הוסף...", 110, 56, 198, 60, 14 + PUSHBUTTON "הסר", 112, 121, 198, 60, 14 + PUSHBUTTON "מאפיינים", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "נא להמתין..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "עצור", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "מסיר", -1, 40, 8, 151, 8 + LTEXT "מודם", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "חיבור טורי RS-232" + 181 "מודם חיצוני" + 182 "מודם פנימי" + 183 "מודם PCMCIA" + 184 "מודם מקביל" + 185 "יציאה מקבילה" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "זוגי" + 251 "איזוגי" + 252 "None" + 253 "Mark" + 254 "Space" + 255 "1" + 256 "1.5" + 257 "2" + 260 "Xon / Xoff" + 261 "חומרה" + 262 "None" + 263 "On" + 264 "Low" + 265 "V.23 (Minitel)" + 266 "רגיל" + 267 "Non-standard (Bell, HST)" + 270 "Append to &Log" + 300 "לא מצוין" + 301 "מידע" + 302 "פקס" + 303 "מידע" + 304 "None" + 320 "Country/region setting updated" + 340 "מודם" + 341 "הגדרות מודם" + 342 "כתובת מודם" + 400 "Country/region setting not updated" + 401 "Some modems do not accept user initialization commands greater than 57 characters.\n\nInformation about this limitation can be obtained from your modem manufacturer" + 402 "אזהרה" + 460 "There is not enough memory to view the General dialog box.\nClose some files or programs, and then try again." + 461 "There is not enough memory to view the Modem Settings dialog box.\nClose some files or programs, and then try again." + 463 "Each calling address must be set to 'Automatic' or to a unique ring pattern.\n\nChange the duplicate ring pattern to a different one." + 465 "Standard EC" + 466 "Forced EC" + 467 "סלולרי" + 468 "מופסק" + 469 "מאופשר" + 470 "מופסק" + 480 "AUTO (1 Ch.)" + 481 "AUTO (2 Ch.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Analog (V.34/V.90)" + 550 "ESS5 (AT&T) (North America)" + 551 "AT&T Point to Multipoint" + 552 "National ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (Japan)" + 555 "European ISDN (DSS1)" + 556 "German National (1TR6) (rarely used)" + 557 "French National (VN3) (rarely used)" + 558 "Belgium National (rarely used)" + 559 "Australian National (rarely used)" + 560 "Unknown switch" + 570 "The ISDN Configuration for this modem\nis not complete.\n\nPlease fill out the information in the\nISDN Tab before using this modem." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Analog RLP" + 615 "Analog NRLP" + 616 "GPRS" + 617 "PIAFS - incoming" + 618 "PIAFS - outgoing" + 700 "Use current TAPI location" + 2006 "Attached To" + 2007 "Not present" + 2008 "Not functional" + 2009 "Needs reboot" + 2010 "#To finish setting up your modem, you must restart your computer.\n\nDo you want to restart your computer now?" + 2011 "Modem not properly installed" + 2012 "יציאה לא ידועה" + 3000 "הגדרת מודם" + 3018 "מודמים" + 3019 "Installs a new modem and changes modem properties." + 3053 "The modem properties cannot be displayed because the modem is not available.\n\nRestart the system and try again." + 3054 "Properties for Modems" + 3060 "Are you sure you want to remove the selected modem(s) from your system?" + 3061 "ReactOS was unable to remove the modem '%1' from %2." + 3062 "מודם" + 3069 "There is not enough memory to open the modem control panel.\n\nClose some programs and try again." + 3073 "You must be a System Administrator to install a modem." + 3074 "No modems are installed. You must be a System Administrator to install a modem." + 3076 "You must shut down and restart your computer before the new settings will take effect.\n\nDo you want to restart your computer now?" + 3077 "Network Settings Change" + 3200 "300 Baud" + 3201 "1200 Baud" + 3202 "2400 Baud" + 3203 "9600 Baud" + 3204 "19.2K Baud" + 3205 "38.4K Baud" + 3206 "57.6K Baud" + 3207 "אין תגובה" + 3212 "פקודה" + 3213 "תגובה" + 3214 "The port that the modem is attached could not be opened. This may be the result of a hardware conflict. Check the device manager to verify all devices are functional." + 3215 "The port that the modem is using is currently open by another application. Exit any application that may currently be using the port." + 3218 "OpenComm" + 3221 "115K Baud" + 3222 "Updating" + 3223 "שגיאה" + 3233 "הצלחה" + 3236 "The modem failed to respond. Make sure it is properly connected and turned on. If it is an internal modem or is connected, verify that the interrupt for the port is properly set." + 3237 "COMMAND NOT SUPPORTED" + 3238 "שדה" + 3239 "ערך" + 3240 " Default Preferences" + 3241 " Connection Preferences" + 6144 "יפן" + 6145 "אלבניה" + 6146 "אלג'יריה" + 6147 "American Samoa" + 6148 "גרמניה (קוד מדינה/אזור 04)" + 6149 "Anguilla" + 6150 "Antigua and Barbuda" + 6151 "ארגנטינה" + 6152 "Ascension Island" + 6153 "אוסטרליה" + 6154 "אוסטריה" + 6155 "איי הבהמס" + 6156 "בחריין" + 6157 "בנגלדש" + 6158 "ברבדוס" + 6159 "בלגיה" + 6160 "בליז" + 6161 "Benin" + 6162 "ברמודה" + 6163 "בהוטן" + 6164 "בוליביה" + 6165 "Botswana" + 6166 "ברזיל" + 6167 "Country/region code (23)" + 6168 "British Indian Ocean Territory" + 6169 "British Virgin Islands" + 6170 "Brunei" + 6171 "בולגריה" + 6172 "Myanmar" + 6173 "Burundi" + 6174 "בלרוס" + 6175 "קמרון" + 6176 "קנדה" + 6177 "Cape Verde" + 6178 "Cayman Islands" + 6179 "Central African Republic" + 6180 "צ'אד" + 6181 "צ'ילה" + 6182 "סין" + 6183 "קולמביה" + 6184 "Comoros" + 6185 "קונגו" + 6186 "Cook Islands" + 6187 "קוסטה ריקה" + 6188 "קובה" + 6189 "קפריסין" + 6190 "צ'כיה" + 6191 "קמבודיה" + 6192 "צפון קוריאה" + 6193 "דנמרק" + 6194 "Djibouti" + 6195 "Dominican Republic" + 6196 "Dominica" + 6197 "אקוודור" + 6198 "מצרים" + 6199 "אל סלבדור" + 6200 "Equatorial Guinea" + 6201 "אתיופיה" + 6202 "Falkland Islands (Islas Malvinas)" + 6203 "Fiji Islands" + 6204 "פינדלנד" + 6205 "צרפת" + 6206 "French Polynesia" + 6207 "Country/region code (63)" + 6208 "גבון" + 6209 "גמביה" + 6210 "Germany (Country/region code 66)" + 6211 "אנגולה" + 6212 "Ghana" + 6213 "Gibraltar" + 6214 "יוון" + 6215 "Grenada" + 6216 "גואם" + 6217 "גווטמלה" + 6218 "Guernsey" + 6219 "גינאה" + 6220 "Guinea-Bissau" + 6221 "Guyana" + 6222 "האיטי" + 6223 "הונדורס" + 6224 "הונג קונג SAR" + 6225 "הונגריה" + 6226 "איסלנד" + 6227 "הודו" + 6228 "אינדונזיה" + 6229 "אירן" + 6230 "עירק" + 6231 "אירלנד" + 6232 "ישראל" + 6233 "איטליה" + 6234 "Cote d'Ivoire" + 6235 "Jamaica" + 6236 "אפגניסטן" + 6237 "Jersey" + 6238 "ירדן" + 6239 "קניה" + 6240 "Kiribati" + 6241 "קוריאה" + 6242 "כווית" + 6243 "לאוס" + 6244 "לבנון" + 6245 "Lesotho" + 6246 "ליבריה" + 6247 "לוב" + 6248 "Liechtenstein" + 6249 "לוקסמבורג" + 6250 "מקאו SAR" + 6251 "מדגסקר" + 6252 "מלזיה" + 6253 "Malawi" + 6254 "Maldives" + 6255 "מאלי" + 6256 "מלטה" + 6257 "Mauritania" + 6258 "Mauritius" + 6259 "מקסיקו" + 6260 "מונקו" + 6261 "מונגוליה" + 6262 "Montserrat" + 6263 "מרוקו" + 6264 "Mozambique" + 6265 "Nauru" + 6266 "נפאל" + 6267 "הולנד" + 6268 "Netherlands Antilles" + 6269 "New Caledonia" + 6270 "ניו זילנד" + 6271 "Nicaragua" + 6272 "ניז'ר" + 6273 "ניגריה" + 6274 "נורבגיה" + 6275 "עומן" + 6276 "פקיסטן" + 6277 "פנמה" + 6278 "Papua New Guinea" + 6279 "Paraguay" + 6280 "פרו" + 6281 "הפיליפינים" + 6282 "פולין" + 6283 "פורטוגל" + 6284 "Puerto Rico" + 6285 "קטאר" + 6286 "רומניה" + 6287 "Rwanda" + 6288 "St. Kitts and Nevis" + 6289 "Country/region code (145)" + 6290 "St. Helena" + 6291 "St. Lucia" + 6292 "סן מרינו" + 6293 "Country/region code (148)" + 6294 "Sao Tome and Principe" + 6295 "St. Vincent and the Grenadines" + 6296 "ערב הסעודית" + 6297 "סנגל" + 6298 "Seychelles" + 6299 "סיירה לאונה" + 6300 "סינגפור" + 6301 "איי שלמה" + 6302 "סומליה" + 6303 "דרום אפריקה" + 6304 "ספרד" + 6305 "סרי לנקה" + 6306 "סודן" + 6307 "Suriname" + 6308 "Swaziland" + 6309 "שוודיה" + 6310 "שוויץ" + 6311 "סוריה" + 6312 "Tanzania" + 6313 "Thailand" + 6314 "Togo" + 6315 "Tonga" + 6316 "Trinidad and Tobago" + 6317 "טוניסיה" + 6318 "טורקיה" + 6319 "Turks and Caicos Islands" + 6320 "Tuvalu" + 6321 "אוגנדה" + 6322 "אוקראינה" + 6323 "United Arab Emirates" + 6324 "בריטניה" + 6325 "ארצות הברית" + 6326 "Burkina Faso" + 6327 "Uruguay" + 6328 "Country/region code (184)" + 6329 "Vanuatu" + 6330 "הוותיקן" + 6331 "Venezuela" + 6332 "Vietnam" + 6333 "Wallis and Futuna" + 6334 "Samoa" + 6335 "תימן" + 6336 "תימן" + 6337 "Country/region code (193)" + 6338 "Congo (DRC)" + 6339 "זמביה" + 6340 "Zimbabwe" + 6501 "מולדובה" + 6502 "אסטוניה" + 6503 "ליטא" + 6504 "ארמניה" + 6505 "גאורגיה" + 6506 "אזרבייג'ן" + 6507 "טורקמניסטן" + 6508 "אוזבקיסטן" + 6509 "קזחסטן" + 6510 "טג'יקיסטן" + 6511 "קירגיזסטן" + 6512 "לטביה" + 6513 "רוסיה" + 6600 "קרואטיה" + 6601 "סלובניה" + 6602 "מקדוניה, FYRO" + 6603 "Bosnia and Herzegovina" + 6604 "יוגוסלביה" + 20013 "מזהה חומרה" +END diff --git a/reactos/dll/win32/modemui/modemui.rc b/reactos/dll/win32/modemui/modemui.rc index 6ff16602a47..92050a80c43 100644 --- a/reactos/dll/win32/modemui/modemui.rc +++ b/reactos/dll/win32/modemui/modemui.rc @@ -15,6 +15,7 @@ IDI_703 ICON "res/703.ico" // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif @@ -24,6 +25,9 @@ IDI_703 ICON "res/703.ico" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/reactos/dll/win32/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc index 9d825457584..cd478f0ddee 100644 --- a/reactos/dll/win32/mpr/mpr.rc +++ b/reactos/dll/win32/mpr/mpr.rc @@ -71,6 +71,9 @@ #ifdef LANGUAGE_FR_FR #include "mpr_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "mpr_He.rc" +#endif #ifdef LANGUAGE_JA_JP #include "mpr_Ja.rc" #endif diff --git a/reactos/dll/win32/mpr/mpr_He.rc b/reactos/dll/win32/mpr/mpr_He.rc new file mode 100644 index 00000000000..c4642402606 --- /dev/null +++ b/reactos/dll/win32/mpr/mpr_He.rc @@ -0,0 +1,50 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mprres.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_ENTIRENETWORK "הרשת כולה" +} + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הזן סיסמת רשת" +FONT 8, "MS Shell Dlg" +{ + LTEXT "נא הכנס את שם המתשמש והסיסמה שלך:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "שרת מתווך (Proxy)", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "שם משתמש", -1, 40, 66, 50, 10 + LTEXT "סיסמה", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "זכור את הסיסמה (לא בטוח)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ביטול", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} diff --git a/reactos/dll/win32/msacm32/msacm.rc b/reactos/dll/win32/msacm32/msacm.rc index 94cb0e3de53..fcf631f2c88 100644 --- a/reactos/dll/win32/msacm32/msacm.rc +++ b/reactos/dll/win32/msacm32/msacm.rc @@ -73,6 +73,9 @@ #ifdef LANGUAGE_FR_FR #include "msacm_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "msacm_He.rc" +#endif #ifdef LANGUAGE_JA_JP #include "msacm_Ja.rc" #endif diff --git a/reactos/dll/win32/msacm32/msacm_He.rc b/reactos/dll/win32/msacm32/msacm_He.rc new file mode 100644 index 00000000000..561d07463e3 --- /dev/null +++ b/reactos/dll/win32/msacm32/msacm_He.rc @@ -0,0 +1,58 @@ +/* + * Hebrew resource file for MS ACM + * + * Copyright 2000 Eric Pouech + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wineacm.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "בחירת שמע" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "שם:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "שמירה בשם...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "הסר", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "פורמט:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "מאפיינים:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "אישור", IDOK, 48, 80, 40, 14 + PUSHBUTTON "ביטול", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "עזרה", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc new file mode 100644 index 00000000000..109127259bd --- /dev/null +++ b/reactos/dll/win32/msgina/lang/he-IL.rc @@ -0,0 +1,58 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "נא להמתין..." +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ברוכים הבאים לReactOS" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 5, 32, 32 + LTEXT "לחץ על Ctrl-Alt-Del בו זמנית",IDC_STATIC, 38, 10, 144, 14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "כניסה" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "שם משתמש:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "סיסמה:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + PUSHBUTTON "אישור",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "ביטול",IDCANCEL,115,122,50,14 + PUSHBUTTON "כיבוי",IDC_SHUTDOWN,179,122,50,14 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "אבטחה" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "מה ברצונך לעשות?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "לנעול את המחשב",IDC_LOCK,10,76,70,14 + PUSHBUTTON "להתנתק",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "לכבות",IDC_SHUTDOWN,170,76,70,14 + PUSHBUTTON "מנהל המשימות",IDC_TASKMGR,90,95,70,14 + PUSHBUTTON "ביטול",IDCANCEL,170,95,70,14 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "ברוכים הבאים!" + IDS_LOCKEDSAS "המחשב שלך כרגע נעול." + IDS_PRESSCTRLALTDELETE "לחץ על Ctrl+Alt+Delete כדי להכנס." + IDS_ASKFORUSER "שם משתמש: " + IDS_ASKFORPASSWORD "סיסמה: " + IDS_FORCELOGOFF "זה יגרום להתנתקות המשתמש הנוכחי ולאבד את כל המידע שאינו נשמר. להמשיך?" +END diff --git a/reactos/dll/win32/msgina/msgina.rc b/reactos/dll/win32/msgina/msgina.rc index 107f76debe9..777301720e8 100644 --- a/reactos/dll/win32/msgina/msgina.rc +++ b/reactos/dll/win32/msgina/msgina.rc @@ -18,6 +18,7 @@ IDI_LOCKICON ICON "resources/21.ico" #include "lang/es-ES.rc" #include "lang/de-DE.rc" #include "lang/fr-FR.rc" +#include "lang/he-IL.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" diff --git a/reactos/dll/win32/mshtml/He.rc b/reactos/dll/win32/mshtml/He.rc new file mode 100644 index 00000000000..079c9f8a0d4 --- /dev/null +++ b/reactos/dll/win32/mshtml/He.rc @@ -0,0 +1,70 @@ +/* + * Copyright 2005-2006 Jacek Caban + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_HTMLDISABLED "הדמיית HTML כרגע מופסקת." + IDS_HTMLDOCUMENT "מסמך HTML" + IDS_DOWNLOADING "מוריד..." + IDS_INSTALLING "מתקין..." +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "מתקין Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "התקדמות", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "התקנה", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "קישור" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "מידע קישור", -1, 5, 5, 190, 55 + LTEXT "סוג:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} diff --git a/reactos/dll/win32/mshtml/rsrc.rc b/reactos/dll/win32/mshtml/rsrc.rc index fb687e057da..5c371112cd5 100644 --- a/reactos/dll/win32/mshtml/rsrc.rc +++ b/reactos/dll/win32/mshtml/rsrc.rc @@ -71,6 +71,9 @@ #ifdef LANGUAGE_FR_FR #include "Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "Hu.rc" #endif diff --git a/reactos/dll/win32/msi/msi_He.rc b/reactos/dll/win32/msi/msi_He.rc new file mode 100644 index 00000000000..33461168298 --- /dev/null +++ b/reactos/dll/win32/msi/msi_He.rc @@ -0,0 +1,39 @@ +/* + * Hebrew resources for MSI + * + * Copyright 2005 Mike McCormack + * Copyright 2010 Detlef Riekenberg + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "הנתיב %s לא נמצא" + 9 "הכנס דיסק %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a patch:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\nLog and UI Modifiers for above commands:\n\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\t/q{|n|b|r|f|n+|b+|b-}\nRegister MSI Service:\n\t/y\nUnregister MSI Service:\n\t/z\nDisplay this help:\n\t/help\n\t/?\n" + 11 "הזן איזו תיקיה מכילה את %s" + 12 "מקור ההתקנה עבור התכונה חסר" + 13 "כונן רשת עבור התכונה חסר" + 14 "מהתקן מ:" + 15 "בחר איזו תיקיה מכילה את %s" +} diff --git a/reactos/dll/win32/msports/lang/he-IL.rc b/reactos/dll/win32/msports/lang/he-IL.rc new file mode 100644 index 00000000000..25aeeb1bc11 --- /dev/null +++ b/reactos/dll/win32/msports/lang/he-IL.rc @@ -0,0 +1,21 @@ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "הגדרות יציאה" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "סיביות לשניה:", -1, 74, 19, 62, 8, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "סיביות מידע:", -1, 74, 40, 62, 8 + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "&Parity:", -1, 74, 61, 62, 8 + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "סיביות עצירה:", -1, 74, 82, 62, 8 + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "בקרת זרימה:", - 1, 74, 102, 62, 8 + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "מתקדם...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP + PUSHBUTTON "שחזר ברירת מחדל",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP +END diff --git a/reactos/dll/win32/msports/msports.rc b/reactos/dll/win32/msports/msports.rc index fc8d821ac33..f7b1e67b42c 100644 --- a/reactos/dll/win32/msports/msports.rc +++ b/reactos/dll/win32/msports/msports.rc @@ -18,6 +18,9 @@ #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/reactos/dll/win32/msrle32/msrle_He.rc b/reactos/dll/win32/msrle32/msrle_He.rc new file mode 100644 index 00000000000..ff36acd14ca --- /dev/null +++ b/reactos/dll/win32/msrle32/msrle_He.rc @@ -0,0 +1,34 @@ +/* + * Hebrew resource file for MS-RLE + * + * Copyright 2002 Michael Günnewig + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE מקודד וידאו" + IDS_ABOUT "Wine MS-RLE מקודד וידאו\nזכויות יוצרים 2002 ע""י Michael Günnewig" +} diff --git a/reactos/dll/win32/msrle32/rsrc.rc b/reactos/dll/win32/msrle32/rsrc.rc index 366efafae0d..c1aead966fd 100644 --- a/reactos/dll/win32/msrle32/rsrc.rc +++ b/reactos/dll/win32/msrle32/rsrc.rc @@ -81,6 +81,9 @@ #ifdef LANGUAGE_FR_FR #include "msrle_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "msrle_He.rc" +#endif #ifdef LANGUAGE_JA_JP #include "msrle_Ja.rc" #endif diff --git a/reactos/dll/win32/msvfw32/msvfw32_He.rc b/reactos/dll/win32/msvfw32/msvfw32_He.rc new file mode 100644 index 00000000000..41694638f30 --- /dev/null +++ b/reactos/dll/win32/msvfw32/msvfw32_He.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msvideo_private.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "דחיסת וידאו" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "אישור",IDOK,129,2,49,14 + PUSHBUTTON "ביטול",IDCANCEL,129,18,49,14 + + LTEXT "דוחס:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "הגדרה...",882,129,36,49,14 + PUSHBUTTON "אודות...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "איכות דחיסה:",886,9,34,80,8 + + CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "שקופיות:",889,103,62,26,10 + + CONTROL "קצב מידע",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "ק""ב/שניה",896,102,78,26,10 +} + +STRINGTABLE +{ + IDS_FULLFRAMES "שקופיות מלאות (לא דחוס)" +} diff --git a/reactos/dll/win32/msvfw32/rsrc.rc b/reactos/dll/win32/msvfw32/rsrc.rc index 8840e2fec30..af3d16f19c4 100644 --- a/reactos/dll/win32/msvfw32/rsrc.rc +++ b/reactos/dll/win32/msvfw32/rsrc.rc @@ -61,6 +61,9 @@ #ifdef LANGUAGE_FR_FR #include "msvfw32_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "msvfw32_He.rc" +#endif #ifdef LANGUAGE_IT_IT #include "msvfw32_It.rc" #endif diff --git a/reactos/dll/win32/netcfgx/lang/he-IL.rc b/reactos/dll/win32/netcfgx/lang/he-IL.rc new file mode 100644 index 00000000000..968fcf2e6df --- /dev/null +++ b/reactos/dll/win32/netcfgx/lang/he-IL.rc @@ -0,0 +1,230 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_TCPIP_BASIC_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 228, 27 + CONTROL "השג כתובת IP באופן אוטומטי", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "השתמש בכתובת הIP הבאה:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "כתובת IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "מסכת רשת משנה:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "שער ברירת מחדל:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "השג כתובת שרת DNS באופן אוטומטי.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "השתמש בכתובות שרתי הDNS הבאים:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "שרת DNS מועדף:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "שרת DNS חלופי:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "מתקדם", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "הגדרה חלופית" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 + CONTROL "כתובת IP פרטית אוטומטית", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX + CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + LTEXT "כתובת IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 + LTEXT "מסכת רשת משנה:", -1, 14, 95, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 + LTEXT "שער ברירת מחדל:", -1, 14, 115, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 + LTEXT "שרת DNS מועדף:", -1, 14, 150, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 + LTEXT "שרת DNS חלופי:", -1, 14, 165, 180, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 +END + +IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "הגדרות IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "כתובות IP", -1, 5, 5, 240, 90 + CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 + PUSHBUTTON "הוסף...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "ערוך...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "שערי רשת ברירת מחדל:", -1, 5, 100, 240, 90 + CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 + PUSHBUTTON "הוסף...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "ערוך...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 5, 200, 240, 30 + CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Interface metric:", -1, 15, 215, 90, 12 + EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER +END + +IDD_TCPIP_ADVDNS_DLG DIALOGEX DISCARDABLE 0, 0, 247, 270 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "DNS" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 + PUSHBUTTON "הזז למעלה", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "הזז למטה", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "הוסף...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "ערוך...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 + CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 + CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + PUSHBUTTON "הזז למעלה", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "הזז למעטה", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "הוסף...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "ערוך...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP + CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + +END + +IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "אפשרויות" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OPTLIST, 5, 30, 230, 70 + LTEXT "הגדרות אפשרויות", -1, 5, 15, 130, 12 + PUSHBUTTON "מאפיינים", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "תיאור:", -1, 5, 120, 240, 70 + LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 +END + +IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "כתובת TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "כתובת IP:", -1, 5, 15, 70, 12 + LTEXT "מסכת רשת משנה:", -1, 5, 30, 70, 12 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "כתובת שער TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "שער:", -1, 5, 15, 70, 12 + CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP +END + +IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "שרת DNS של TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 + LTEXT "שרת DNS:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "TCP/IP Domain Suffix" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP + LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "סינון TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "", -1, 5, 30, 90, 150 + CONTROL "התר להכל", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "התר רק ל", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 + PUSHBUTTON "הוסף", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 105, 30, 90, 150 + CONTROL "התר להכל", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "התר רק ל", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 + PUSHBUTTON "הוסף", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 205, 30, 90, 150 + CONTROL "התר להכל", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "התר רק ל", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 + PUSHBUTTON "הוסף", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "הסר", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "אישור", IDC_OK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "הוסף מסנן" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 + PUSHBUTTON "אישור", IDC_OK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_NET_CONNECT "חיבור רשת" + IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." + IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." + IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." + IDS_TCPFILTER "סינון TCP/IP" + IDS_IPADDR "כתובת IP" + IDS_SUBMASK "מסכת רשת משנה" + IDS_GATEWAY "שער" + IDS_METRIC "Metric" + IDS_DHCPACTIVE "DHCP מאופשר" + IDS_AUTOMATIC "אוטומטי" + IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_TCPIP "ReactOS-TCP/IP" + IDS_ADD "הוסף" + IDS_MOD "אישור" + IDS_TCP_PORTS "יציאות TCP" + IDS_UDP_PORTS "יציאות UDP" + IDS_IP_PROTO "פרוטוקולי IP" + IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." + IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." + IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." + IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." + IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." + IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." + IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." + IDS_DUP_SUFFIX "The DNS suffix is already on the list." + IDS_DUP_IPADDR "The IP address is already on the list." + IDS_DUP_GW "The default gateway is already on the list." +END + diff --git a/reactos/dll/win32/netcfgx/netcfgx.rc b/reactos/dll/win32/netcfgx/netcfgx.rc index 2f913736b4c..93bbc0b05d2 100644 --- a/reactos/dll/win32/netcfgx/netcfgx.rc +++ b/reactos/dll/win32/netcfgx/netcfgx.rc @@ -40,6 +40,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/win32/netid/lang/he-IL.rc b/reactos/dll/win32/netid/lang/he-IL.rc new file mode 100644 index 00000000000..eec6ea72738 --- /dev/null +++ b/reactos/dll/win32/netid/lang/he-IL.rc @@ -0,0 +1,79 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "שם המחשב" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS uses the following information to identify your computer on the network.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "תיאור המחשב:", IDC_STATIC, 6, 40, 90, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "שם המחשב המלא:", IDC_STATIC, 6, 68, 85, 9 + EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "קבוצת עבודה:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click ""Network ID"".", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "מזהה רשת...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "שנה...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9 +END + +IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "שינוי שם המחשב" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(message goes here)", 1017, 7, 5, 218, 30 + LTEXT "שם המחשב:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "שם המחשב המלא:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "עוד...", 1003, 150, 102, 75, 14 + GROUPBOX "חבר של", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "מתחם:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "קבוצת עבודה:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "מצא את המתחם שלי", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "אישור", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "ביטול", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS Suffix and NetBIOS Computer Name" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "אישור", 1, 153, 104, 50, 14 + PUSHBUTTON "ביטול", 2, 209, 104, 50, 14 + LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* לא ידוע *" + 2 "WORKGROUP" + 3 "The following error occurred while attempting to read domain membership information:" + 4 "Computer Name Changes" + 5 "קבוצת עבודה:" + 6 "מתחם:" + 22 "ברוך הבא לקבוצת העבודה 1%" + 23 "ברוך הבא למתחם 1%" + 24 "You must restart this computer for the changes to take effect." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." + 1021 "Note: Only Administrators can change the identification of this computer." + 1022 "Note: The identification of the computer cannot be changed because:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" +//Windows allows using these characters, although it displays a warning message. Forbidding the use of these characters means incompatibility with Windows. + 3210 "&Details >>" + 3220 "<< &Details" + 4000 "מידע" + 4001 "Can't set new a computer name!" +END diff --git a/reactos/dll/win32/netid/rsrc.rc b/reactos/dll/win32/netid/rsrc.rc index 8188a689559..5df463349dc 100644 --- a/reactos/dll/win32/netid/rsrc.rc +++ b/reactos/dll/win32/netid/rsrc.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/reactos/dll/win32/netshell/lang/he-IL.rc b/reactos/dll/win32/netshell/lang/he-IL.rc new file mode 100644 index 00000000000..44873789a6e --- /dev/null +++ b/reactos/dll/win32/netshell/lang/he-IL.rc @@ -0,0 +1,126 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "התחבר באמצעות:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "הגדרה", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 + PUSHBUTTON "התקן", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "הסר התקנה", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + 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 +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "כללי" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "חיבור", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "מצב:", -1, 19, 20, 60, 8 + LTEXT "משך זמן:", -1, 19, 34, 60, 8 + LTEXT "מהירות:", -1, 19, 48, 60, 8 + GROUPBOX "פעילות", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "נשלח", -1, 26, 90, 60, 8 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 + LTEXT "התקבל", -1, 149, 90, 37, 8 + LTEXT "בתים:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "מאפיינים", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "הפסק", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "תמיכה" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "מצב החיבור", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "סוג כתובת:", -1, 22, 20, 80, 8 + LTEXT "כתובת IP:", -1, 22, 34, 80, 8 + LTEXT "מסכת רשת משנה:", -1, 22, 48, 80, 8 + LTEXT "שער ברירת מחדל:", -1, 22, 62, 80, 8 + + RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + + PUSHBUTTON "מאפיינים...", IDC_DETAILS, 22, 76, 62, 14 +END + +IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "פרטי חיבור הרשת" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "מאפייני חיבור הרשת:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "סגור", IDC_CLOSE, 125, 165, 62, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PHYSICAL_ADDRESS "כתובת פיזית" + IDS_IP_ADDRESS "כתובת IP" + IDS_SUBNET_MASK "מסכת רשת משנה" + IDS_DEF_GATEWAY "שער ברירת מחדל" + IDS_DHCP_SERVER "שרת DHCP" + IDS_LEASE_OBTAINED "חכירה הושגה" + IDS_LEASE_EXPIRES "פקיעת תוקף החכירה" + IDS_DNS_SERVERS "שרתי DNS" + IDS_WINS_SERVERS "שרתי WINS" + IDS_PROPERTY "מאפיין" + IDS_VALUE "ערך" + IDS_NETWORKCONNECTION "חיבור רשת" + IDS_SHV_COLUMN_NAME "שם" + IDS_SHV_COLUMN_TYPE "סוג" + IDS_SHV_COLUMN_STATE "מצב" + IDS_SHV_COLUMN_DEVNAME "שם התקן" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "בעלים" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "מופסק" + IDS_STATUS_UNREACHABLE "לא מחובר" + IDS_STATUS_DISCONNECTED "כבל רשת מנותק" + IDS_STATUS_CONNECTING "משיג כתובת רשת" + IDS_STATUS_CONNECTED "מחובר" + IDS_STATUS_OPERATIONAL "מחובר" + + IDS_NET_ACTIVATE "הפעל" + IDS_NET_DEACTIVATE "הפסק" + IDS_NET_STATUS "מצב" + IDS_NET_REPAIR "תקן" + IDS_NET_CREATELINK "צור קיצור דרך" + IDS_NET_DELETE "מחק" + IDS_NET_RENAME "שנה שם" + IDS_NET_PROPERTIES "מאפיינים" + + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" + IDS_DURATION_DAY "%d יום %s" + IDS_DURATION_DAYS "%d ימים %s" + IDS_ASSIGNED_DHCP "מוקצה ע""י DHCP" + IDS_ASSIGNED_MANUAL "מוגדר ידנית" +END diff --git a/reactos/dll/win32/netshell/netshell.rc b/reactos/dll/win32/netshell/netshell.rc index 93859648d5b..aff49f88e8e 100644 --- a/reactos/dll/win32/netshell/netshell.rc +++ b/reactos/dll/win32/netshell/netshell.rc @@ -48,6 +48,9 @@ IDI_NET_TRANSREC ICON "res/nettrrec.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/win32/newdev/lang/he-IL.rc b/reactos/dll/win32/newdev/lang/he-IL.rc new file mode 100644 index 00000000000..03969ac2002 --- /dev/null +++ b/reactos/dll/win32/newdev/lang/he-IL.rc @@ -0,0 +1,109 @@ +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ברוכים הבאים",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "This wizard installs a new device driver for:", + IDC_STATIC,120,21,195,16 + LTEXT "לחץ הבא כדי להמשיך.",IDC_STATIC,120,169,195,17 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 + CONTROL "התקן תוכנת מנהל התקן באופן אוטומטי",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "התקן תוכנת מהל התקן ממיקום מסוים",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ההגדרה נכשלה",IDC_FINISHTITLE,120,8,195,24 + LTEXT "The device could not be installed because the driver could not be found.", + IDC_STATIC,120,40,195,19 + LTEXT "Click on Back if you have a driver disk or know the path to the driver.", + IDC_STATIC,120,98,181,24 + CONTROL "Do not show this dialog anymore",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ההגדרה נכשלה",IDC_FINISHTITLE,120,8,195,24 + LTEXT "The device could not be installed because an unexpected error happened.", + IDC_STATIC,120,40,195,19 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "חפש במיקומים הבאים",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "בחר באופן ידני",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "חפש במדיה נשלפת",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "כלול את הנתיב הבא",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "בחר",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ההגדרה הושלמה",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "לחץ סיום כדי לסגור את האשף.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "הגדרת התקן" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ההגדרה הושלמה",IDC_FINISHTITLE,120,8,195,11 + LTEXT "The wizard has finished installing the driver for:", + IDC_STATIC,120,32,195,19 + LTEXT "לחץ סיום כדי לסגור את האשף.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + diff --git a/reactos/dll/win32/newdev/rsrc.rc b/reactos/dll/win32/newdev/rsrc.rc index d976c2a3cdb..9e433e6ee8e 100644 --- a/reactos/dll/win32/newdev/rsrc.rc +++ b/reactos/dll/win32/newdev/rsrc.rc @@ -8,6 +8,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -29,6 +30,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/reactos/dll/win32/oleacc/oleacc.rc b/reactos/dll/win32/oleacc/oleacc.rc index a14a4a20d12..442639ec402 100644 --- a/reactos/dll/win32/oleacc/oleacc.rc +++ b/reactos/dll/win32/oleacc/oleacc.rc @@ -41,6 +41,9 @@ #ifdef LANGUAGE_FR_FR #include "oleacc_Fr.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "oleacc_He.rc" +#endif #ifdef LANGUAGE_HU_HU #include "oleacc_Hu.rc" #endif diff --git a/reactos/dll/win32/oleacc/oleacc_He.rc b/reactos/dll/win32/oleacc/oleacc_He.rc new file mode 100644 index 00000000000..985af397a33 --- /dev/null +++ b/reactos/dll/win32/oleacc/oleacc_He.rc @@ -0,0 +1,94 @@ +/* + * Hebrew resources for oleacc + * + * Copyright 2008 Nikolay Sivov + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "oleacc.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "שורת הכותרת" + ROLE_SYSTEM_MENUBAR "שורת התפריטים" + ROLE_SYSTEM_SCROLLBAR "סרגל הגלילה" + ROLE_SYSTEM_GRIP "אחיזה" + ROLE_SYSTEM_SOUND "שמע" + ROLE_SYSTEM_CURSOR "סמן" + ROLE_SYSTEM_CARET "סמן" + ROLE_SYSTEM_ALERT "התראה" + ROLE_SYSTEM_WINDOW "חלון" + ROLE_SYSTEM_CLIENT "לקוח" + ROLE_SYSTEM_MENUPOPUP "תפריט קופץ" + ROLE_SYSTEM_MENUITEM "פריט תפריט" + ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_APPLICATION "יישום" + ROLE_SYSTEM_DOCUMENT "מסמך" + ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_CHART "רשומה" + ROLE_SYSTEM_DIALOG "דו שיח" + ROLE_SYSTEM_BORDER "גבול" + ROLE_SYSTEM_GROUPING "קיבוץ" + ROLE_SYSTEM_SEPARATOR "מפריד" + ROLE_SYSTEM_TOOLBAR "סרגל כלים" + ROLE_SYSTEM_STATUSBAR "שורת מצב" + ROLE_SYSTEM_TABLE "טבלה" + ROLE_SYSTEM_COLUMNHEADER "column header" + ROLE_SYSTEM_ROWHEADER "row header" + ROLE_SYSTEM_COLUMN "עמודה" + ROLE_SYSTEM_ROW "שורה" + ROLE_SYSTEM_CELL "תא" + ROLE_SYSTEM_LINK "קישור" + ROLE_SYSTEM_HELPBALLOON "בלון עזרה" + ROLE_SYSTEM_CHARACTER "character" + ROLE_SYSTEM_LIST "רשימה" + ROLE_SYSTEM_LISTITEM "רשימת פריטים" + ROLE_SYSTEM_OUTLINE "outline" + ROLE_SYSTEM_OUTLINEITEM "outline item" + ROLE_SYSTEM_PAGETAB "page tab" + ROLE_SYSTEM_PROPERTYPAGE "property page" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "graphic" + ROLE_SYSTEM_STATICTEXT "טקסט נייח" + ROLE_SYSTEM_TEXT "טקסט" + ROLE_SYSTEM_PUSHBUTTON "כפתור לחיצה" + ROLE_SYSTEM_CHECKBUTTON "כפתור סימון" + ROLE_SYSTEM_RADIOBUTTON "כפתור רדיו" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "drop down" + ROLE_SYSTEM_PROGRESSBAR "שורת התקדמות" + ROLE_SYSTEM_DIAL "חייג" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "slider" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "הנפשה" + ROLE_SYSTEM_EQUATION "משוואה" + ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" + ROLE_SYSTEM_BUTTONMENU "menu button" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" + ROLE_SYSTEM_WHITESPACE "רווח לבן" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "שעון" + ROLE_SYSTEM_SPLITBUTTON "split button" + ROLE_SYSTEM_IPADDRESS "כתובת IP" + ROLE_SYSTEM_OUTLINEBUTTON "outline button" +} diff --git a/reactos/dll/win32/oleaut32/oleaut32.rc b/reactos/dll/win32/oleaut32/oleaut32.rc index b15b856b5e7..bb096d26096 100644 --- a/reactos/dll/win32/oleaut32/oleaut32.rc +++ b/reactos/dll/win32/oleaut32/oleaut32.rc @@ -81,6 +81,9 @@ #ifdef LANGUAGE_DE_DE #include "oleaut32_De.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "oleaut32_He.rc" +#endif #ifdef LANGUAGE_LT_LT #include "oleaut32_Lt.rc" #endif diff --git a/reactos/dll/win32/oleaut32/oleaut32_He.rc b/reactos/dll/win32/oleaut32/oleaut32_He.rc new file mode 100644 index 00000000000..2c51c093e8d --- /dev/null +++ b/reactos/dll/win32/oleaut32/oleaut32_He.rc @@ -0,0 +1,35 @@ +/* + * Hebrew resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * Translated by Baruch Rutman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_TRUE "אמת" + IDS_FALSE "שקר" + IDS_YES "כן" + IDS_NO "לא" + IDS_ON "פועל" + IDS_OFF "לא פועל" +} From 062d16ac10ff78bd635b494047878c3cf7678d89 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 22 Jan 2013 22:51:51 +0000 Subject: [PATCH 38/71] [INCLUDE] - Remove duplicate dllimport attributes CORE-6917 #resolve - Add annotations for wcslen - Add kernelspecs.h (complete) - Add some more entries in driverspecs.h - Fix a number of annotations svn path=/trunk/; revision=58204 --- reactos/include/crt/string.h | 9 +- reactos/include/ddk/kernelspecs.h | 109 +++++++++++++++++++++++++ reactos/include/ddk/ntifs.h | 7 +- reactos/include/ddk/wdm.h | 81 +++++++++--------- reactos/include/ndk/cmfuncs.h | 36 +++++--- reactos/include/ndk/exfuncs.h | 4 +- reactos/include/ndk/iofuncs.h | 4 +- reactos/include/ndk/kefuncs.h | 12 +-- reactos/include/ndk/ldrfuncs.h | 2 +- reactos/include/ndk/mmfuncs.h | 2 +- reactos/include/ndk/psfuncs.h | 12 +-- reactos/include/ndk/rtlfuncs.h | 31 ++++--- reactos/include/psdk/driverspecs.h | 127 +++++++++++++++-------------- reactos/include/psdk/sal.h | 2 +- reactos/include/xdk/rtlfuncs.h | 22 +++-- reactos/include/xdk/wdm.template.h | 1 + reactos/include/xdk/zwfuncs.h | 2 +- 17 files changed, 313 insertions(+), 150 deletions(-) create mode 100644 reactos/include/ddk/kernelspecs.h diff --git a/reactos/include/crt/string.h b/reactos/include/crt/string.h index 472d76ce9fe..214b1aa8369 100644 --- a/reactos/include/crt/string.h +++ b/reactos/include/crt/string.h @@ -118,7 +118,14 @@ extern "C" { _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); + +_Ret_range_(==,_String_length_(_Str)) +_CRTIMP +size_t +__cdecl +wcslen( + _In_z_ const wchar_t *_Str); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); diff --git a/reactos/include/ddk/kernelspecs.h b/reactos/include/ddk/kernelspecs.h new file mode 100644 index 00000000000..637bc2106de --- /dev/null +++ b/reactos/include/ddk/kernelspecs.h @@ -0,0 +1,109 @@ +/* + * kernelspecs.h + * + * SAL 2 annotations for kernel mode drivers + * + * This file is part of the ReactOS DDK package. + * + * Contributor: + * Timo Kreuzer (timo.kreuzer@reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once + +#define KERNELSPECS_H + +#include "driverspecs.h" + +#ifdef _PREFAST_ + +#undef _IRQL_always_function_max_ +#undef _IRQL_always_function_min_ +#undef _IRQL_raises_ +#undef _IRQL_requires_ +#undef _IRQL_requires_max_ +#undef _IRQL_requires_min_ +#undef _IRQL_requires_same_ +#undef _IRQL_restores_ +#undef _IRQL_restores_global_ +#undef _IRQL_saves_ +#undef _IRQL_saves_global_ +#undef _IRQL_uses_cancel_ +#undef _IRQL_is_cancel_ +#undef __drv_setsIRQL +#undef __drv_raisesIRQL +#undef __drv_requiresIRQL +#undef __drv_maxIRQL +#undef __drv_minIRQL +#undef __drv_savesIRQL +#undef __drv_savesIRQLGlobal +#undef __drv_restoresIRQL +#undef __drv_restoresIRQLGlobal +#undef __drv_minFunctionIRQL +#undef __drv_maxFunctionIRQL +#undef __drv_sameIRQL +#undef __drv_useCancelIRQL +#undef __drv_isCancelIRQL + +#define _IRQL_always_function_max_(irql) _Pre_ _SA_annotes1(SAL_maxFunctionIrql,irql) +#define _IRQL_always_function_min_(irql) _Pre_ _SA_annotes1(SAL_minFunctionIrql,irql) +#define _IRQL_raises_(irql) _Post_ _SA_annotes1(SAL_raiseIRQL,irql) +#define _IRQL_requires_(irql) _Pre_ _SA_annotes1(SAL_IRQL,irql) +#define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) +#define _IRQL_requires_min_(irql) _Pre_ _SA_annotes1(SAL_minIRQL,irql) +#define _IRQL_requires_same_ _Post_ _SA_annotes0(SAL_sameIRQL) +#define _IRQL_restores_ _Post_ _SA_annotes0(SAL_restoreIRQL) +#define _IRQL_restores_global_(kind,param) _Post_ _SA_annotes2(SAL_restoreIRQLGlobal, #kind, param\t) +#define _IRQL_saves_ _Post_ _SA_annotes0(SAL_saveIRQL) +#define _IRQL_saves_global_(kind,param) _Post_ _SA_annotes2(SAL_saveIRQLGlobal,#kind, param\t) +#define _IRQL_uses_cancel_ _Post_ _SA_annotes0(SAL_UseCancelIrql) +#define _IRQL_is_cancel_ _IRQL_uses_cancel_ _Releases_nonreentrant_lock_(_Global_cancel_spin_lock_) \ + _At_(return, _IRQL_always_function_min_(2 /*DISPATCH_LEVEL*/) _IRQL_requires_(2 /*DISPATCH_LEVEL*/)) +#define __drv_setsIRQL(irql) _Post_ _SA_annotes1(SAL_IRQL,irql) +#define __drv_raisesIRQL _IRQL_raises_ +#define __drv_requiresIRQL _IRQL_requires_ +#define __drv_maxIRQL _IRQL_requires_max_ +#define __drv_minIRQL _IRQL_requires_min_ +#define __drv_savesIRQL _IRQL_saves_ +#define __drv_savesIRQLGlobal _IRQL_saves_global_ +#define __drv_restoresIRQL _IRQL_restores_ +#define __drv_restoresIRQLGlobal _IRQL_restores_global_ +#define __drv_minFunctionIRQL _IRQL_always_function_min_ +#define __drv_maxFunctionIRQL _IRQL_always_function_max_ +#define __drv_sameIRQL _IRQL_requires_same_ +#define __drv_useCancelIRQL _IRQL_uses_cancel_ +#define __drv_isCancelIRQL _IRQL_is_cancel_ + +#ifdef __cplusplus +extern "C" { +#endif + +__ANNOTATION(SAL_IRQL(__int64);) +__ANNOTATION(SAL_raiseIRQL(__int64);) +__ANNOTATION(SAL_IRQL(__int64);) +__ANNOTATION(SAL_maxIRQL(__int64);) +__ANNOTATION(SAL_minIRQL(__int64);) +__ANNOTATION(SAL_saveIRQL(void);) +__ANNOTATION(SAL_saveIRQLGlobal(_In_ char *, ...);) +__ANNOTATION(SAL_restoreIRQL(void);) +__ANNOTATION(SAL_restoreIRQLGlobal(_In_ char *, ...);) +__ANNOTATION(SAL_minFunctionIrql(__int64);) +__ANNOTATION(SAL_maxFunctionIrql(__int64);) +__ANNOTATION(SAL_sameIRQL(void);) +__ANNOTATION(SAL_UseCancelIrql(void);) + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* _PREFAST_ */ diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index b846fc64692..02528b8f3bd 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -1344,12 +1344,13 @@ RtlSecondsSince1980ToTime( _Out_ PLARGE_INTEGER Time); _Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - _In_ PLARGE_INTEGER Time, - _Out_ PULONG ElapsedSeconds); + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds); NTSYSAPI VOID @@ -9165,7 +9166,7 @@ ZwOpenDirectoryObject( _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index c30a4fe21bf..00f9f2f79d8 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #ifndef GUID_DEFINED @@ -8742,14 +8743,18 @@ RtlGUIDFromString( _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI RtlInitUnicodeString( - _Out_ PUNICODE_STRING DestinationString, - _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); /* VOID * RtlMoveMemory( @@ -9328,13 +9333,14 @@ RtlSetDaclSecurityDescriptor( #define RtlStoreUlongPtr(Address,Value) RtlStoreUlong(Address,Value) #endif /* _WIN64 */ -_Success_(return != 0) +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeFieldsToTime( - _In_ PTIME_FIELDS TimeFields, - _Out_ PLARGE_INTEGER Time); + _In_ PTIME_FIELDS TimeFields, + _Out_ PLARGE_INTEGER Time); NTSYSAPI VOID @@ -16669,17 +16675,18 @@ NTSYSAPI NTSTATUS NTAPI ZwCreateFile( - _Out_ PHANDLE FileHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _Out_ PIO_STATUS_BLOCK IoStatusBlock, - _In_opt_ PLARGE_INTEGER AllocationSize, - _In_ ULONG FileAttributes, - _In_ ULONG ShareAccess, - _In_ ULONG CreateDisposition, - _In_ ULONG CreateOptions, - _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, - _In_ ULONG EaLength); + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength +); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI @@ -17310,8 +17317,8 @@ NTSYSCALLAPI NTSTATUS NTAPI ZwRollbackComplete( - IN HANDLE EnlistmentHandle, - IN PLARGE_INTEGER TmVirtualClock OPTIONAL); + _In_ HANDLE EnlistmentHandle, + _In_opt_ PLARGE_INTEGER TmVirtualClock); NTSYSCALLAPI NTSTATUS @@ -17347,29 +17354,29 @@ NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeMultipleKeys( - IN HANDLE MasterKeyHandle, - IN ULONG Count OPTIONAL, - IN OBJECT_ATTRIBUTES SubordinateObjects[] OPTIONAL, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer OPTIONAL, - IN ULONG BufferSize, - IN BOOLEAN Asynchronous); + _In_ HANDLE MasterKeyHandle, + _In_opt_ ULONG Count, + _In_opt_ OBJECT_ATTRIBUTES SubordinateObjects[], + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree, + _Out_opt_ PVOID Buffer, + _In_ ULONG BufferSize, + _In_ BOOLEAN Asynchronous); NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( - IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueEntries, - IN ULONG EntryCount, - OUT PVOID ValueBuffer, - IN OUT PULONG BufferLength, - OUT PULONG RequiredBufferLength OPTIONAL); + _In_ HANDLE KeyHandle, + _Inout_ PKEY_VALUE_ENTRY ValueEntries, + _In_ ULONG EntryCount, + _Out_ PVOID ValueBuffer, + _Inout_ PULONG BufferLength, + _Out_opt_ PULONG RequiredBufferLength); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI diff --git a/reactos/include/ndk/cmfuncs.h b/reactos/include/ndk/cmfuncs.h index 3d9a68efc6b..37d83ec16b4 100644 --- a/reactos/include/ndk/cmfuncs.h +++ b/reactos/include/ndk/cmfuncs.h @@ -41,17 +41,18 @@ NtCompressKey( _In_ HANDLE Key ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI NTSTATUS NTAPI NtCreateKey( _Out_ PHANDLE KeyHandle, _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ ULONG TitleIndex, + _Reserved_ ULONG TitleIndex, _In_opt_ PUNICODE_STRING Class, _In_ ULONG CreateOptions, - _In_opt_ PULONG Disposition + _Out_opt_ PULONG Disposition ); NTSYSCALLAPI @@ -81,14 +82,17 @@ NtEnumerateKey( _Out_ PULONG ResultLength ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) +NTSYSAPI NTSTATUS NTAPI NtEnumerateValueKey( _In_ HANDLE KeyHandle, _In_ ULONG Index, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -246,14 +250,17 @@ NtQueryOpenSubKeysEx( _In_ PULONG RequiredSize ); -NTSYSCALLAPI +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) +NTSYSAPI NTSTATUS NTAPI NtQueryValueKey( _In_ HANDLE KeyHandle, _In_ PUNICODE_STRING ValueName, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -354,6 +361,7 @@ NtUnloadKeyEx( ); #ifdef NTOS_MODE_USER +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI NTSTATUS NTAPI @@ -361,10 +369,10 @@ ZwCreateKey( _Out_ PHANDLE KeyHandle, _In_ ACCESS_MASK DesiredAccess, _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ ULONG TitleIndex, + _Reserved_ ULONG TitleIndex, _In_opt_ PUNICODE_STRING Class, _In_ ULONG CreateOptions, - _In_opt_ PULONG Disposition + _Out_opt_ PULONG Disposition ); NTSYSAPI @@ -394,6 +402,9 @@ ZwEnumerateKey( _Out_ PULONG ResultLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) NTSYSAPI NTSTATUS NTAPI @@ -401,7 +412,7 @@ ZwEnumerateValueKey( _In_ HANDLE KeyHandle, _In_ ULONG Index, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); @@ -497,6 +508,9 @@ ZwQueryMultipleValueKey( _Out_ PULONG ReturnLength ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_When_(Length == 0, _Post_satisfies_(return < 0)) +_When_(Length > 0, _Post_satisfies_(return <= 0)) NTSYSAPI NTSTATUS NTAPI @@ -504,7 +518,7 @@ ZwQueryValueKey( _In_ HANDLE KeyHandle, _In_ PUNICODE_STRING ValueName, _In_ KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - _Out_bytecap_(Length) PVOID KeyValueInformation, + _Out_writes_bytes_opt_(Length) PVOID KeyValueInformation, _In_ ULONG Length, _Out_ PULONG ResultLength ); diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h index 12de25dcc23..3fa9fa17f00 100644 --- a/reactos/include/ndk/exfuncs.h +++ b/reactos/include/ndk/exfuncs.h @@ -459,7 +459,7 @@ NTAPI NtReleaseSemaphore( _In_ HANDLE SemaphoreHandle, _In_ LONG ReleaseCount, - _Out_ PLONG PreviousCount + _Out_opt_ PLONG PreviousCount ); NTSYSCALLAPI @@ -903,7 +903,7 @@ NTAPI ZwReleaseSemaphore( _In_ HANDLE SemaphoreHandle, _In_ LONG ReleaseCount, - _Out_ PLONG PreviousCount + _Out_opt_ PLONG PreviousCount ); NTSYSAPI diff --git a/reactos/include/ndk/iofuncs.h b/reactos/include/ndk/iofuncs.h index 5e566527bdf..e18a88557c5 100644 --- a/reactos/include/ndk/iofuncs.h +++ b/reactos/include/ndk/iofuncs.h @@ -113,7 +113,7 @@ NTAPI NtCreateIoCompletion( _Out_ PHANDLE IoCompletionHandle, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG NumberOfConcurrentThreads ); @@ -653,7 +653,7 @@ NTAPI ZwCreateIoCompletion( _Out_ PHANDLE IoCompletionHandle, _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG NumberOfConcurrentThreads ); diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h index 14658052242..7006a96ea2e 100644 --- a/reactos/include/ndk/kefuncs.h +++ b/reactos/include/ndk/kefuncs.h @@ -437,9 +437,9 @@ NTAPI NtQueueApcThread( _In_ HANDLE ThreadHandle, _In_ PKNORMAL_ROUTINE ApcRoutine, - _In_ PVOID NormalContext, - _In_ PVOID SystemArgument1, - _In_ PVOID SystemArgument2 + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 ); NTSYSCALLAPI @@ -643,9 +643,9 @@ NTAPI ZwQueueApcThread( _In_ HANDLE ThreadHandle, _In_ PKNORMAL_ROUTINE ApcRoutine, - _In_ PVOID NormalContext, - _In_ PVOID SystemArgument1, - _In_ PVOID SystemArgument2 + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 ); NTSYSAPI diff --git a/reactos/include/ndk/ldrfuncs.h b/reactos/include/ndk/ldrfuncs.h index 4b628f50f6f..04af5a8c396 100644 --- a/reactos/include/ndk/ldrfuncs.h +++ b/reactos/include/ndk/ldrfuncs.h @@ -56,7 +56,7 @@ LdrEnumResources( _In_ PLDR_RESOURCE_INFO ResourceInfo, _In_ ULONG Level, _Inout_ ULONG *ResourceCount, - _Out_opt_ PLDR_ENUM_RESOURCE_INFO Resources + _Out_writes_to_(*ResourceCount,*ResourceCount) LDR_ENUM_RESOURCE_INFO *Resources ); diff --git a/reactos/include/ndk/mmfuncs.h b/reactos/include/ndk/mmfuncs.h index 93c4840bb61..0d3782fba9e 100644 --- a/reactos/include/ndk/mmfuncs.h +++ b/reactos/include/ndk/mmfuncs.h @@ -319,7 +319,7 @@ ZwAreMappedFilesTheSame( _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h index 5a89ae028e6..d0439120a79 100644 --- a/reactos/include/ndk/psfuncs.h +++ b/reactos/include/ndk/psfuncs.h @@ -284,7 +284,7 @@ NTSTATUS NTAPI NtAlertResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); typedef ULONG APPHELPCACHESERVICECLASS; @@ -488,7 +488,7 @@ NtQueryInformationThread( _In_ THREADINFOCLASS ThreadInformationClass, _Out_ PVOID ThreadInformation, _In_ ULONG ThreadInformationLength, - _Out_ PULONG ReturnLength + _Out_opt_ PULONG ReturnLength ); NTSYSCALLAPI @@ -503,7 +503,7 @@ NTSTATUS NTAPI NtResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSCALLAPI @@ -588,7 +588,7 @@ NTSTATUS NTAPI ZwAlertResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSAPI @@ -734,7 +734,7 @@ ZwQueryInformationThread( _In_ THREADINFOCLASS ThreadInformationClass, _Out_ PVOID ThreadInformation, _In_ ULONG ThreadInformationLength, - _Out_ PULONG ReturnLength + _Out_opt_ PULONG ReturnLength ); NTSYSAPI @@ -749,7 +749,7 @@ NTSTATUS NTAPI ZwResumeThread( _In_ HANDLE ThreadHandle, - _Out_ PULONG SuspendCount + _Out_opt_ PULONG SuspendCount ); NTSYSAPI diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 992fd04d9da..a48f974249f 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -1667,7 +1667,7 @@ RtlLargeIntegerToChar( _In_ PLARGE_INTEGER Value, _In_ ULONG Base, _In_ ULONG Length, - _Inout_ PCHAR String + _Out_ PCHAR String ); NTSYSAPI @@ -2129,8 +2129,12 @@ RtlHashUnicodeString( _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI @@ -2411,8 +2415,8 @@ RtlCreateUserThread( _In_ SIZE_T StackCommit, _In_ PTHREAD_START_ROUTINE StartAddress, _In_ PVOID Parameter, - _Inout_ PHANDLE ThreadHandle, - _Inout_ PCLIENT_ID ClientId + _Out_opt_ PHANDLE ThreadHandle, + _Out_opt_ PCLIENT_ID ClientId ); #endif @@ -2538,7 +2542,7 @@ NTSTATUS NTAPI RtlDeregisterWaitEx( _In_ HANDLE hWaitHandle, - _In_ HANDLE hCompletionEvent + _In_opt_ HANDLE hCompletionEvent ); NTSYSAPI @@ -2682,7 +2686,7 @@ ULONG NTAPI RtlGetCurrentDirectory_U( _In_ ULONG MaximumLength, - _Out_z_bytecap_(MaximumLength) PWSTR Buffer + _Out_bytecap_(MaximumLength) PWSTR Buffer ); NTSYSAPI @@ -3176,7 +3180,7 @@ NTSTATUS NTAPI RtlDeleteTimerQueueEx( _In_ HANDLE TimerQueue, - _In_ HANDLE CompletionEvent + _In_opt_ HANDLE CompletionEvent ); NTSYSAPI @@ -3645,7 +3649,8 @@ NTSYSAPI NTSTATUS NTAPI RtlFormatCurrentUserKeyPath( - _Inout_ PUNICODE_STRING KeyPath + _Out_ _At_(KeyPath->Buffer, __drv_allocatesMem(Mem) _Post_bytecap_(KeyPath->MaximumLength) _Post_bytecount_(KeyPath->Length)) + PUNICODE_STRING KeyPath ); NTSYSAPI @@ -3700,7 +3705,7 @@ NTSTATUS NTAPI RtlpNtEnumerateSubKey( _In_ HANDLE KeyHandle, - _Out_ PUNICODE_STRING SubKeyName, + _Inout_ PUNICODE_STRING SubKeyName, _In_ ULONG Index, _In_ ULONG Unused ); @@ -3974,6 +3979,8 @@ NTAPI RtlSetTimeZoneInformation( _In_ PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI @@ -3982,12 +3989,14 @@ RtlTimeFieldsToTime( _Out_ PLARGE_INTEGER Time ); +_Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - PLARGE_INTEGER Time, - _Out_ PULONG SecondsSince1970 + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds ); NTSYSAPI diff --git a/reactos/include/psdk/driverspecs.h b/reactos/include/psdk/driverspecs.h index a70b665fed7..f43e488c38d 100644 --- a/reactos/include/psdk/driverspecs.h +++ b/reactos/include/psdk/driverspecs.h @@ -17,12 +17,34 @@ #ifdef _PREFAST_ -// Stubs -#define ___drv_unit_internal_kernel_driver -#define ___drv_unit_kernel_code -#define ___drv_unit_kernel_driver -#define ___drv_unit_user_code -#define ___drv_unit_user_driver +/* IRQL annotations are only valid when included from kernelspecs.h */ +#define _IRQL_always_function_max_(irql) +#define _IRQL_always_function_min_(irql) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(irql) +#define _IRQL_requires_(irql) +#define _IRQL_requires_max_(irql) +#define _IRQL_requires_max_defined +#define _IRQL_requires_min_(irql) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(kind,param) +#define _IRQL_saves_ +#define _IRQL_saves_global_(kind,param) +#define _IRQL_uses_cancel_ +#define __drv_setsIRQL(irql) + +#define _Dispatch_type_ _Function_class_ +#define _Kernel_clear_do_init_(yesNo) _Post_ _SA_annotes1(SAL_clearDoInit,yesNo) +#define _Kernel_float_restored_ _Post_ _SA_annotes0(SAL_floatRestored) +#define _Kernel_float_saved_ _Post_ _SA_annotes0(SAL_floatSaved) +#define _Kernel_float_used_ _Post_ _SA_annotes0(SAL_floatUsed) +#define _Kernel_IoGetDmaAdapter_ _Post_ _SA_annotes0(SAL_IoGetDmaAdapter) +#define _Kernel_releases_resource_(kind) _Post_ _SA_annotes1(SAL_release, #kind) +#define _Kernel_requires_resource_held_(kind) _Pre_ _SA_annotes1(SAL_mustHold, #kind) +#define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) +#define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) + #define __drv_acquiresCancelSpinLock #define __drv_acquiresCriticalRegion #define __drv_acquiresExclusiveResource(kind) @@ -30,11 +52,11 @@ #define __drv_acquiresPriorityRegion #define __drv_acquiresResource(kind) #define __drv_acquiresResourceGlobal(kind,param) -#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) -#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) -#define __drv_arg(expr,annotes) -#define __drv_at(expr,annotes) -#define __drv_callbackType(kind) +#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) +#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) +#define __drv_arg(expr,annotes) _At_(expr,annotes) +#define __drv_at(expr,annotes) _At_(expr,annotes) +#define __drv_callbackType(kind) _SA_annotes1(SAL_callbackType, #kind) #define __drv_clearDoInit #define __drv_completionType(kindlist) #define __drv_constant @@ -46,12 +68,12 @@ #define __drv_floatSaved #define __drv_floatUsed #define __drv_formatString(kind) -#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) +#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) #define __drv_fun(annotes) #define __drv_functionClass -#define __drv_holdsCancelSpinLock() -#define __drv_holdsCriticalRegion() -#define __drv_holdsPriorityRegion() +#define __drv_holdsCancelSpinLock() _Holds_resource_global_("CancelSpinLock",) +#define __drv_holdsCriticalRegion() _Holds_resource_global_("CriticalRegion",) +#define __drv_holdsPriorityRegion() _Holds_resource_global_("PriorityRegion",) #define __drv_in_deref(annotes) #define __drv_in(annotes) #define __drv_innerAcquiresGlobal(kind,param) @@ -60,7 +82,7 @@ #define __drv_innerReleasesGlobal(kind,param) #define __drv_interlocked #define __drv_IoGetDmaAdapter -#define __drv_isCancelIRQL +#define __drv_isCancelIRQL _IRQL_is_cancel_ #define __drv_isObjectPointer #define __drv_KMDF #define __drv_maxFunctionIRQL @@ -101,7 +123,6 @@ #define __drv_sameIRQL #define __drv_savesIRQL #define __drv_savesIRQLGlobal -#define __drv_setsIRQL(irql) #define __drv_strictType(typename,mode) #define __drv_strictTypeMatch(mode) #define __drv_unit(p) @@ -116,14 +137,35 @@ #define __prefast_operator_new_throws #define __user_code #define __user_driver +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver + +__ANNOTATION(SAL_neverHold(_In_ char *);) +__ANNOTATION(SAL_acquire(_In_ char *);) +__ANNOTATION(SAL_floatUsed(void);) +__ANNOTATION(SAL_floatSaved(void);) +__ANNOTATION(SAL_floatRestored(void);) +__ANNOTATION(SAL_clearDoInit(enum __SAL_YesNo);) +__ANNOTATION(SAL_maxIRQL(__int64);) +__ANNOTATION(SAL_IsAliased(void);) +__ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) +__ANNOTATION(SAL_mustHold(_In_ char *);) +__ANNOTATION(SAL_release(_In_ char *);) +__ANNOTATION(SAL_IoGetDmaAdapter(void);) + +#else + +/* Dummys */ #define _Dispatch_type_ #define _IRQL_always_function_max_(irql) #define _IRQL_always_function_min_(irql) #define _IRQL_is_cancel_ #define _IRQL_raises_(irql) #define _IRQL_requires_(irql) -#define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) -#define _IRQL_requires_max_defined +#define _IRQL_requires_max_(irql) #define _IRQL_requires_min_(irql) #define _IRQL_requires_same_ #define _IRQL_restores_ @@ -138,23 +180,8 @@ #define _Kernel_IoGetDmaAdapter_ #define _Kernel_releases_resource_(kind) #define _Kernel_requires_resource_held_(kind) -#define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) -#define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) - -__ANNOTATION(SAL_maxIRQL(__int64);) -__ANNOTATION(SAL_IsAliased(void);) -__ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) -__ANNOTATION(SAL_neverHold(__In_impl_ char *);) -__ANNOTATION(SAL_acquire(__In_impl_ char *);) - -#else - -/* Dummys */ -#define ___drv_unit_internal_kernel_driver -#define ___drv_unit_kernel_code -#define ___drv_unit_kernel_driver -#define ___drv_unit_user_code -#define ___drv_unit_user_driver +#define _Kernel_requires_resource_not_held_(kind) +#define _Kernel_acquires_resource_(kind) #define __drv_acquiresCancelSpinLock #define __drv_acquiresCriticalRegion #define __drv_acquiresExclusiveResource(kind) @@ -248,29 +275,11 @@ __ANNOTATION(SAL_acquire(__In_impl_ char *);) #define __prefast_operator_new_throws #define __user_code #define __user_driver -#define _Dispatch_type_ -#define _IRQL_always_function_max_(irql) -#define _IRQL_always_function_min_(irql) -#define _IRQL_is_cancel_ -#define _IRQL_raises_(irql) -#define _IRQL_requires_(irql) -#define _IRQL_requires_max_(irql) -#define _IRQL_requires_min_(irql) -#define _IRQL_requires_same_ -#define _IRQL_restores_ -#define _IRQL_restores_global_(kind,param) -#define _IRQL_saves_ -#define _IRQL_saves_global_(kind,param) -#define _IRQL_uses_cancel_ -#define _Kernel_clear_do_init_(yesNo) -#define _Kernel_float_restored_ -#define _Kernel_float_saved_ -#define _Kernel_float_used_ -#define _Kernel_IoGetDmaAdapter_ -#define _Kernel_releases_resource_(kind) -#define _Kernel_requires_resource_held_(kind) -#define _Kernel_requires_resource_not_held_(kind) -#define _Kernel_acquires_resource_(kind) +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver #endif diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h index 90d8a9a6951..4e14876315d 100644 --- a/reactos/include/psdk/sal.h +++ b/reactos/include/psdk/sal.h @@ -855,7 +855,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; //#define _Outref_result_maybenull_ //#define _Outref_result_nullonfailure_ #define _Points_to_data_ _SAL2_NAME(_Points_to_data_) _Group_([SAL_pre] [SAL_at(p1="*_Curr_")] _Group_([SAL_annotes(Name="SAL_mayBePointer", p1="__no")]) ) -//#define _Post_bytecap_(size) +#define _Post_bytecap_(size) _SAL11_NAME(_Post_bytecap_) _Group_([SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) #define _Post_bytecount_(size) _SAL11_NAME(_Post_bytecount_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) //#define _Post_bytecount_c_(size) //#define _Post_bytecount_x_(size) diff --git a/reactos/include/xdk/rtlfuncs.h b/reactos/include/xdk/rtlfuncs.h index 95f1900c2ab..d696f774949 100644 --- a/reactos/include/xdk/rtlfuncs.h +++ b/reactos/include/xdk/rtlfuncs.h @@ -217,14 +217,18 @@ RtlGUIDFromString( _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, _At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) -_At_(DestinationString->MaximumLength, _Post_equal_to_((_String_length_(SourceString)+1) * sizeof(WCHAR))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) NTSYSAPI VOID NTAPI RtlInitUnicodeString( - _Out_ PUNICODE_STRING DestinationString, - _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); + _Out_ PUNICODE_STRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCWSTR SourceString); /* VOID * RtlMoveMemory( @@ -805,13 +809,14 @@ RtlSetDaclSecurityDescriptor( #define RtlStoreUlongPtr(Address,Value) RtlStoreUlong(Address,Value) #endif /* _WIN64 */ -_Success_(return != 0) +_Success_(return!=FALSE) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeFieldsToTime( - _In_ PTIME_FIELDS TimeFields, - _Out_ PLARGE_INTEGER Time); + _In_ PTIME_FIELDS TimeFields, + _Out_ PLARGE_INTEGER Time); NTSYSAPI VOID @@ -1566,12 +1571,13 @@ RtlSecondsSince1980ToTime( _Out_ PLARGE_INTEGER Time); _Success_(return != 0) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlTimeToSecondsSince1970( - _In_ PLARGE_INTEGER Time, - _Out_ PULONG ElapsedSeconds); + _In_ PLARGE_INTEGER Time, + _Out_ PULONG ElapsedSeconds); NTSYSAPI VOID diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h index 2cbe9da7754..e26010816af 100644 --- a/reactos/include/xdk/wdm.template.h +++ b/reactos/include/xdk/wdm.template.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #ifndef GUID_DEFINED diff --git a/reactos/include/xdk/zwfuncs.h b/reactos/include/xdk/zwfuncs.h index 86e333fcb52..69d778401a3 100644 --- a/reactos/include/xdk/zwfuncs.h +++ b/reactos/include/xdk/zwfuncs.h @@ -593,7 +593,7 @@ ZwOpenDirectoryObject( _Must_inspect_result_ _At_(*BaseAddress, __drv_allocatesMem(Mem)) -__kernel_entry NTSYSCALLAPI +__kernel_entry NTSYSAPI NTSTATUS NTAPI From 015d42cf42ab3734dee2d96a50d8fc6b122c9fa3 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Tue, 22 Jan 2013 23:50:02 +0000 Subject: [PATCH 39/71] Fix MSVC build. svn path=/trunk/; revision=58206 --- reactos/base/applications/wordpad/He.rc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/reactos/base/applications/wordpad/He.rc b/reactos/base/applications/wordpad/He.rc index 6019da0c8a1..05f2768adbb 100644 --- a/reactos/base/applications/wordpad/He.rc +++ b/reactos/base/applications/wordpad/He.rc @@ -20,6 +20,9 @@ #include "wordpad.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDM_MAINMENU MENU @@ -263,12 +266,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." END - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -BEGIN - STRING_ALIGN_LEFT, "שמאל" - STRING_ALIGN_RIGHT, "ימין" - STRING_ALIGN_CENTER, "מרכז" -END From 87644827ce39df7a950abf84a22ae576b2f95db2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 23 Jan 2013 19:09:52 +0000 Subject: [PATCH 40/71] [LIB/ATL] * Fix a typo. * Remove a redundant assign. svn path=/trunk/; revision=58207 --- reactos/lib/atl/statreg.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reactos/lib/atl/statreg.h b/reactos/lib/atl/statreg.h index 83d83a1a2d7..6ae3187e5aa 100644 --- a/reactos/lib/atl/statreg.h +++ b/reactos/lib/atl/statreg.h @@ -173,7 +173,7 @@ public: HRESULT STDMETHODCALLTYPE ResourceUnregister(LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - return ResourceRegisterSz(resFileName, MAKEINTRESOURCEW(nID), szType); + return ResourceUnregisterSz(resFileName, MAKEINTRESOURCEW(nID), szType); } protected: @@ -505,7 +505,6 @@ private: iter = *pstr; hkey = NULL; - iter = *pstr; hres = get_word(&iter, buf); if (FAILED(hres)) return hres; From 8c4e91a1fc67c5271e49a96949926437303b54e5 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 23 Jan 2013 21:07:37 +0000 Subject: [PATCH 41/71] =?UTF-8?q?[EXPLORER=5FNEW]=20-=20Do=20not=20allow?= =?UTF-8?q?=20multiple=20run=20dialogs.=20Based=20on=20patch=20by=20Edijs?= =?UTF-8?q?=20Kolesnikovi=C4=8Ds=20&=20Gr=C3=A9gori=20Mac=C3=A1rio=20Harbs?= =?UTF-8?q?.=20CORE-6871=20#resolve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=58208 --- reactos/base/shell/explorer-new/traywnd.c | 32 +++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/reactos/base/shell/explorer-new/traywnd.c b/reactos/base/shell/explorer-new/traywnd.c index a86e9f4d879..ab1ff82fa23 100644 --- a/reactos/base/shell/explorer-new/traywnd.c +++ b/reactos/base/shell/explorer-new/traywnd.c @@ -93,6 +93,7 @@ typedef struct HBITMAP hbmStartMenu; HWND hWndTrayProperties; + HWND hwndRunFileDlgOwner; } ITrayWindowImpl; BOOL LaunchCPanel(HWND hwnd, LPCTSTR applet) @@ -2000,16 +2001,37 @@ RunFileDlgThread(IN OUT PVOID pParam) NULL, NULL); + This->hwndRunFileDlgOwner = hwnd; + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + This->hwndRunFileDlgOwner = NULL; DestroyWindow(hwnd); return 0; } +static void +ITrayWindowImpl_ShowRunFileDlg(IN ITrayWindowImpl *This) +{ + HWND hRunDlg; + if (This->hwndRunFileDlgOwner) + { + hRunDlg = GetLastActivePopup(This->hwndRunFileDlgOwner); + if (hRunDlg != NULL && + hRunDlg != This->hwndRunFileDlgOwner) + { + SetForegroundWindow(hRunDlg); + return; + } + } + + CloseHandle(CreateThread(NULL, 0, RunFileDlgThread, This, 0, NULL)); +} + static LRESULT CALLBACK TrayWndProc(IN HWND hwnd, IN UINT uMsg, @@ -2529,13 +2551,7 @@ HandleTrayContextMenu: case IDM_RUN: { - CloseHandle(CreateThread(NULL, - 0, - RunFileDlgThread, - This, - 0, - NULL)); - + ITrayWindowImpl_ShowRunFileDlg(This); break; } @@ -2782,7 +2798,7 @@ TrayMessageLoop(IN OUT ITrayWindow *Tray) switch (Msg.wParam) { case IDHK_RUN: /* Win+R */ - CloseHandle(CreateThread(NULL, 0, RunFileDlgThread, This, 0, NULL)); + ITrayWindowImpl_ShowRunFileDlg(This); break; } } From d6e068a86cb46ef493cd59a439a34a317d0689fa Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 23 Jan 2013 22:55:35 +0000 Subject: [PATCH 42/71] [EXPAT] * Don't compile a static lib out of it. svn path=/trunk/; revision=58209 --- reactos/lib/3rdparty/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactos/lib/3rdparty/CMakeLists.txt b/reactos/lib/3rdparty/CMakeLists.txt index c46c0407dac..3526e3c26d8 100644 --- a/reactos/lib/3rdparty/CMakeLists.txt +++ b/reactos/lib/3rdparty/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(adns) add_subdirectory(bzip2) add_subdirectory(cardlib) -add_subdirectory(expat) +#add_subdirectory(expat) nothing seems to link to it add_subdirectory(freetype) add_subdirectory(fullfat) add_subdirectory(libmpg123) From 7d4974af75c79a76e4df3c45cdd81b203851a00e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 24 Jan 2013 22:20:54 +0000 Subject: [PATCH 43/71] [SHELL32_WINETEST] * Add some missing includes. svn path=/trunk/; revision=58212 --- rostests/winetests/shell32/shellpath.c | 1 + rostests/winetests/shell32/shlexec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/rostests/winetests/shell32/shellpath.c b/rostests/winetests/shell32/shellpath.c index 729a341edc7..e6b70d01a5e 100644 --- a/rostests/winetests/shell32/shellpath.c +++ b/rostests/winetests/shell32/shellpath.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "shlguid.h" #include "shlobj.h" +#include "shellapi.h" #include "shlwapi.h" #include "knownfolders.h" #include "wine/test.h" diff --git a/rostests/winetests/shell32/shlexec.c b/rostests/winetests/shell32/shlexec.c index 3d363cdd016..ef39a0dd656 100755 --- a/rostests/winetests/shell32/shlexec.c +++ b/rostests/winetests/shell32/shlexec.c @@ -43,6 +43,7 @@ #include "wtypes.h" #include "winbase.h" #include "windef.h" +#include "ddeml.h" #include "shellapi.h" #include "shlwapi.h" #include "wine/test.h" From 2bd930547c961bcc29040186efd39ce6871de483 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 24 Jan 2013 23:00:42 +0000 Subject: [PATCH 44/71] * Slap *some* sense into our header inclusions. * This significantly shrinks the dependency tracking data and the compiled objects size, which speeds up the whole build process (especially the incremental builds) accelerating the daily development as a result. * No intended code changes, ~27% smaller build. Enjoy ;) svn path=/trunk/; revision=58214 --- reactos/base/applications/atactl/atactl.cpp | 7 ++- reactos/base/applications/cacls/cacls.c | 2 +- reactos/base/applications/cacls/cacls.rc | 2 +- reactos/base/applications/cacls/precomp.h | 7 ++- reactos/base/applications/calc/calc.h | 12 +++-- reactos/base/applications/calc/resource.h | 3 +- reactos/base/applications/calc/resource.rc | 3 +- reactos/base/applications/charmap/charmap.rc | 6 ++- reactos/base/applications/charmap/precomp.h | 11 ++-- reactos/base/applications/charmap/resource.h | 2 + .../applications/cmdutils/dbgprint/dbgprint.c | 6 ++- .../applications/cmdutils/doskey/doskey.c | 7 ++- .../applications/cmdutils/doskey/doskey.h | 2 + .../applications/cmdutils/doskey/doskey.rc | 3 +- .../base/applications/cmdutils/find/find.c | 15 +++--- .../base/applications/cmdutils/find/find.rc | 4 ++ .../applications/cmdutils/find/resource.h | 2 + .../base/applications/cmdutils/find/rsrc.rc | 3 -- .../applications/cmdutils/hostname/hostname.c | 7 ++- .../cmdutils/lodctr/lodctr_main.c | 4 +- .../base/applications/cmdutils/more/more.c | 12 +++-- .../base/applications/cmdutils/more/more.rc | 2 +- reactos/base/applications/cmdutils/reg/reg.c | 8 ++- reactos/base/applications/cmdutils/reg/reg.h | 4 +- reactos/base/applications/cmdutils/reg/reg.rc | 7 +-- .../base/applications/cmdutils/reg/rsrc.rc | 4 -- .../base/applications/cmdutils/xcopy/xcopy.c | 14 +++-- .../base/applications/cmdutils/xcopy/xcopy.h | 2 + reactos/base/applications/control/control.h | 7 ++- reactos/base/applications/control/resource.h | 2 + reactos/base/applications/dxdiag/d3dtest7.c | 2 +- reactos/base/applications/dxdiag/d3dtest8.c | 2 +- reactos/base/applications/dxdiag/d3dtest9.c | 2 +- reactos/base/applications/dxdiag/dxdiag.rc | 3 +- reactos/base/applications/dxdiag/precomp.h | 20 ++++--- reactos/base/applications/extrac32/extrac32.c | 6 +-- reactos/base/applications/findstr/findstr.c | 12 ++--- reactos/base/applications/findstr/findstr.rc | 4 ++ reactos/base/applications/findstr/resource.h | 2 + reactos/base/applications/findstr/rsrc.rc | 3 -- reactos/base/applications/fontview/display.c | 3 -- reactos/base/applications/fontview/display.h | 8 +++ reactos/base/applications/fontview/fontview.h | 5 +- .../base/applications/fontview/fontview.rc | 3 +- reactos/base/applications/fontview/resource.h | 2 +- .../applications/games/solitaire/resource.h | 1 + .../base/applications/games/solitaire/rsrc.rc | 4 +- .../applications/games/solitaire/solitaire.h | 13 +++-- .../base/applications/games/spider/resource.h | 3 +- .../base/applications/games/spider/rsrc.rc | 4 +- .../base/applications/games/spider/spider.h | 13 ++--- .../base/applications/games/winmine/dialog.c | 5 +- .../base/applications/games/winmine/main.c | 11 ++-- .../base/applications/games/winmine/main.h | 4 +- .../applications/games/winmine/resource.h | 3 +- .../base/applications/games/winmine/rsrc.rc | 3 ++ reactos/base/applications/hh/hh.rc | 3 +- reactos/base/applications/hh/main.c | 4 +- reactos/base/applications/iexplore/main.c | 2 +- reactos/base/applications/kbswitch/kbswitch.h | 10 ++-- .../base/applications/kbswitch/kbswitch.rc | 3 +- reactos/base/applications/kbswitch/resource.h | 2 + reactos/base/applications/logoff/logoff.rc | 3 +- reactos/base/applications/logoff/precomp.h | 11 ++-- reactos/base/applications/logoff/resource.h | 2 + reactos/base/applications/magnify/magnifier.h | 12 +++-- reactos/base/applications/magnify/magnify.rc | 4 +- reactos/base/applications/magnify/resource.h | 2 + reactos/base/applications/magnify/rsrc.rc | 3 -- reactos/base/applications/mmc/mmc.rc | 3 +- reactos/base/applications/mmc/precomp.h | 8 +-- reactos/base/applications/mmc/rsrc.rc | 3 -- reactos/base/applications/mplay32/mplay32.h | 9 +++- reactos/base/applications/mplay32/mplay32.rc | 3 +- reactos/base/applications/mplay32/rsrc.rc | 3 -- .../base/applications/msconfig/freeldrpage.c | 2 +- .../base/applications/msconfig/generalpage.c | 2 +- reactos/base/applications/msconfig/msconfig.c | 2 +- reactos/base/applications/msconfig/msconfig.h | 1 - .../base/applications/msconfig/msconfig.rc | 6 +-- reactos/base/applications/msconfig/precomp.h | 14 +++-- reactos/base/applications/msconfig/resource.h | 2 + reactos/base/applications/msconfig/rsrc.rc | 3 -- reactos/base/applications/msconfig/srvpage.c | 2 +- .../base/applications/msconfig/startuppage.c | 2 +- .../base/applications/msconfig/systempage.c | 2 +- .../base/applications/msconfig/toolspage.c | 2 +- .../applications/mscutils/devmgmt/devmgmt.rc | 5 +- .../applications/mscutils/devmgmt/precomp.h | 12 +++-- .../applications/mscutils/devmgmt/resource.h | 2 + .../applications/mscutils/devmgmt/rsrc.rc | 3 -- .../applications/mscutils/eventvwr/eventvwr.c | 13 +++-- .../mscutils/eventvwr/eventvwr.rc | 8 ++- .../applications/mscutils/eventvwr/resource.h | 3 +- .../applications/mscutils/eventvwr/rsrc.rc | 3 -- .../applications/mscutils/servman/control.c | 2 - .../applications/mscutils/servman/create.c | 4 -- .../applications/mscutils/servman/delete.c | 1 - .../mscutils/servman/dependencies_tv1.c | 2 - .../mscutils/servman/dependencies_tv2.c | 3 -- .../applications/mscutils/servman/export.c | 2 - .../applications/mscutils/servman/listview.c | 6 --- .../applications/mscutils/servman/precomp.h | 16 ++++-- .../applications/mscutils/servman/propsheet.c | 3 -- .../mscutils/servman/propsheet_depends.c | 2 - .../mscutils/servman/propsheet_general.c | 7 --- .../applications/mscutils/servman/query.c | 7 --- .../applications/mscutils/servman/resource.h | 2 + .../applications/mscutils/servman/rsrc.rc | 3 -- .../applications/mscutils/servman/servman.rc | 7 ++- .../applications/mscutils/servman/start.c | 1 - .../base/applications/mscutils/servman/stop.c | 2 - .../mscutils/servman/stop_dependencies.c | 3 -- reactos/base/applications/mspaint/globalvar.h | 4 +- reactos/base/applications/mspaint/precomp.h | 17 ++++-- reactos/base/applications/mspaint/rsrc.rc | 4 +- reactos/base/applications/mstsc/bitmap.c | 2 +- reactos/base/applications/mstsc/bsops.c | 3 +- reactos/base/applications/mstsc/cache.c | 2 +- reactos/base/applications/mstsc/channels.c | 2 +- .../base/applications/mstsc/connectdialog.c | 2 +- reactos/base/applications/mstsc/iso.c | 2 +- reactos/base/applications/mstsc/licence.c | 2 +- reactos/base/applications/mstsc/mcs.c | 2 +- reactos/base/applications/mstsc/mppc.c | 2 +- reactos/base/applications/mstsc/orders.c | 3 +- reactos/base/applications/mstsc/precomp.h | 16 ++++-- reactos/base/applications/mstsc/pstcache.c | 2 +- reactos/base/applications/mstsc/rdc.rc | 5 +- reactos/base/applications/mstsc/rdesktop.h | 10 ++-- reactos/base/applications/mstsc/rdp.c | 3 +- reactos/base/applications/mstsc/rdp5.c | 2 +- reactos/base/applications/mstsc/resource.h | 2 + reactos/base/applications/mstsc/rsrc.rc | 3 -- reactos/base/applications/mstsc/secure.c | 2 +- reactos/base/applications/mstsc/settings.c | 2 +- reactos/base/applications/mstsc/ssl_calls.c | 2 +- reactos/base/applications/mstsc/tcp.c | 3 +- reactos/base/applications/mstsc/uimain.c | 2 +- reactos/base/applications/mstsc/win32.c | 4 +- reactos/base/applications/network/arp/arp.c | 20 ++----- reactos/base/applications/network/dwnl/dwnl.c | 1 - .../applications/network/finger/finger.rc | 2 - .../applications/network/finger/precomp.h | 18 ++----- reactos/base/applications/network/ftp/ftp.rc | 2 - .../base/applications/network/ftp/ftp_var.h | 7 +-- .../base/applications/network/ftp/precomp.h | 22 ++++---- .../applications/network/ftp/prototypes.h | 1 + .../applications/network/ipconfig/ipconfig.c | 9 ++-- .../applications/network/ipconfig/ipconfig.rc | 4 +- .../applications/network/ipconfig/resource.h | 1 + .../base/applications/network/net/cmdStop.c | 2 - .../base/applications/network/net/cmdstart.c | 2 - reactos/base/applications/network/net/help.c | 1 - reactos/base/applications/network/net/main.c | 21 -------- reactos/base/applications/network/net/net.h | 9 ++-- .../base/applications/network/netsh/netsh.c | 2 +- .../applications/network/netstat/netstat.c | 19 +++---- .../applications/network/netstat/netstat.h | 3 -- .../applications/network/netstat/netstat.rc | 2 - .../applications/network/nslookup/nslookup.h | 8 +-- reactos/base/applications/network/ping/ping.c | 14 +++-- .../base/applications/network/ping/ping.rc | 3 +- .../base/applications/network/ping/resource.h | 3 +- .../base/applications/network/route/route.c | 7 ++- .../base/applications/network/route/route.rc | 2 - .../network/telnet/src/ansiprsr.h | 8 +-- .../applications/network/telnet/src/precomp.h | 48 ++++++++--------- .../network/telnet/src/stl_bids.h | 2 +- .../network/telnet/src/tconsole.h | 2 +- .../applications/network/telnet/src/tkeydef.h | 2 +- .../applications/network/telnet/src/tkeymap.h | 2 +- .../applications/network/telnet/src/tmapldr.h | 4 +- .../applications/network/telnet/src/tmouse.h | 2 +- .../applications/network/telnet/src/tnclass.h | 20 +++---- .../applications/network/telnet/src/tnclip.h | 2 +- .../applications/network/telnet/src/tncon.h | 4 +- .../applications/network/telnet/src/tnerror.h | 9 +++- .../network/telnet/src/tnetwork.h | 2 +- .../applications/network/telnet/src/tnmain.h | 15 +++--- .../applications/network/telnet/src/tparams.h | 2 +- .../applications/network/telnet/src/tparser.h | 2 +- .../applications/network/telnet/src/tscript.h | 5 +- .../applications/network/telnet/src/tscroll.h | 2 +- .../network/telnet/src/ttelhndl.h | 4 +- .../applications/network/telnet/telnet.rc | 2 - .../applications/network/tracert/tracert.c | 18 ------- .../applications/network/tracert/tracert.h | 8 +-- .../base/applications/network/whois/whois.c | 5 +- .../base/applications/network/whois/whois.rc | 2 - .../applications/network/wlanconf/resource.h | 2 + .../applications/network/wlanconf/wlanconf.c | 7 ++- .../applications/network/wlanconf/wlanconf.rc | 4 +- reactos/base/applications/notepad/dialog.c | 2 +- reactos/base/applications/notepad/license.c | 3 +- reactos/base/applications/notepad/main.c | 2 +- reactos/base/applications/notepad/notepad.h | 10 ++-- .../base/applications/notepad/notepad_res.h | 2 + reactos/base/applications/notepad/rsrc.rc | 9 ++-- reactos/base/applications/notepad/settings.c | 2 +- reactos/base/applications/notepad/text.c | 3 +- reactos/base/applications/rapps/aboutdlg.c | 1 - reactos/base/applications/rapps/available.c | 1 - reactos/base/applications/rapps/installed.c | 1 - reactos/base/applications/rapps/rapps.h | 16 ++++-- reactos/base/applications/rapps/rapps.rc | 6 ++- reactos/base/applications/regedit/about.c | 3 +- reactos/base/applications/regedit/childwnd.c | 2 +- reactos/base/applications/regedit/edit.c | 2 +- reactos/base/applications/regedit/error.c | 2 +- reactos/base/applications/regedit/find.c | 4 +- reactos/base/applications/regedit/framewnd.c | 2 +- reactos/base/applications/regedit/hexedit.c | 3 +- reactos/base/applications/regedit/listview.c | 2 +- reactos/base/applications/regedit/main.c | 2 +- reactos/base/applications/regedit/regedit.c | 2 +- reactos/base/applications/regedit/regedit.h | 8 +-- reactos/base/applications/regedit/regedit.rc | 8 +-- reactos/base/applications/regedit/resource.h | 2 + reactos/base/applications/regedit/security.c | 2 +- reactos/base/applications/regedit/settings.c | 2 +- reactos/base/applications/regedit/treeview.c | 2 +- reactos/base/applications/regedt32/regedt32.c | 2 + .../base/applications/regedt32/resource.rc | 3 +- reactos/base/applications/sc/create.c | 1 - reactos/base/applications/sc/print.c | 1 - reactos/base/applications/sc/sc.h | 6 ++- reactos/base/applications/sc/sc.rc | 3 -- .../applications/screensavers/3dtext/3dtext.h | 10 ++-- .../screensavers/3dtext/resource.h | 2 + .../applications/screensavers/3dtext/rsrc.rc | 4 +- .../applications/screensavers/logon/logon.c | 8 ++- .../applications/screensavers/logon/logon.rc | 3 +- .../screensavers/logon/resource.h | 2 + reactos/base/applications/setup16/main.c | 3 ++ reactos/base/applications/shutdown/precomp.h | 8 ++- reactos/base/applications/shutdown/rsrc.rc | 4 -- .../base/applications/shutdown/shutdown.rc | 5 +- .../base/applications/sndrec32/audio_api.hpp | 12 ++--- .../base/applications/sndrec32/audio_def.hpp | 4 +- .../applications/sndrec32/audio_membuffer.hpp | 2 +- .../applications/sndrec32/audio_producer.hpp | 2 +- .../sndrec32/audio_resampler_acm.cpp | 2 +- .../sndrec32/audio_resampler_acm.hpp | 2 +- .../applications/sndrec32/audio_wavein.hpp | 2 +- .../applications/sndrec32/audio_waveout.hpp | 2 +- .../base/applications/sndrec32/kkaudio.hpp | 5 -- reactos/base/applications/sndrec32/resource.h | 2 + reactos/base/applications/sndrec32/rsrc.rc | 4 +- .../base/applications/sndrec32/sndrec32.cpp | 10 ++-- reactos/base/applications/sndrec32/sndrec32.h | 6 --- reactos/base/applications/sndrec32/stdafx.h | 16 +++--- .../base/applications/sndrec32/targetver.h | 3 -- reactos/base/applications/sndvol32/dialog.c | 6 +-- reactos/base/applications/sndvol32/misc.c | 2 +- reactos/base/applications/sndvol32/mixer.c | 1 - reactos/base/applications/sndvol32/rsrc.rc | 3 -- reactos/base/applications/sndvol32/sndvol32.c | 1 - reactos/base/applications/sndvol32/sndvol32.h | 12 +++-- .../base/applications/sndvol32/sndvol32.rc | 6 +-- reactos/base/applications/taskmgr/about.c | 2 +- reactos/base/applications/taskmgr/affinity.c | 2 +- reactos/base/applications/taskmgr/applpage.c | 2 +- reactos/base/applications/taskmgr/column.c | 2 +- reactos/base/applications/taskmgr/dbgchnl.c | 2 +- reactos/base/applications/taskmgr/debug.c | 2 +- reactos/base/applications/taskmgr/endproc.c | 2 +- reactos/base/applications/taskmgr/graph.c | 2 +- reactos/base/applications/taskmgr/graphctl.c | 2 +- reactos/base/applications/taskmgr/optnmenu.c | 2 +- reactos/base/applications/taskmgr/perfdata.c | 2 +- reactos/base/applications/taskmgr/perfpage.c | 2 +- reactos/base/applications/taskmgr/precomp.h | 6 ++- reactos/base/applications/taskmgr/priority.c | 2 +- reactos/base/applications/taskmgr/proclist.c | 2 +- reactos/base/applications/taskmgr/procpage.c | 2 +- reactos/base/applications/taskmgr/run.c | 2 +- reactos/base/applications/taskmgr/taskmgr.c | 2 +- reactos/base/applications/taskmgr/taskmgr.rc | 5 +- reactos/base/applications/taskmgr/trayicon.c | 2 +- reactos/base/applications/winhlp32/callback.c | 11 ++-- reactos/base/applications/winhlp32/hlpfile.c | 15 +++--- reactos/base/applications/winhlp32/macro.c | 16 +++--- reactos/base/applications/winhlp32/macro.h | 6 +-- reactos/base/applications/winhlp32/rsrc.rc | 3 ++ reactos/base/applications/winhlp32/winhelp.c | 26 ++++----- reactos/base/applications/winhlp32/winhelp.h | 6 +-- .../base/applications/winhlp32/winhelp_res.h | 3 +- reactos/base/applications/winver/winver.c | 5 +- .../base/applications/wordpad/olecallback.c | 5 +- reactos/base/applications/wordpad/print.c | 8 ++- reactos/base/applications/wordpad/registry.c | 2 + reactos/base/applications/wordpad/rsrc.rc | 3 ++ reactos/base/applications/wordpad/wordpad.c | 13 ++--- reactos/base/applications/wordpad/wordpad.h | 3 +- reactos/base/applications/write/resources.h | 2 +- reactos/base/applications/write/rsrc.rc | 2 + reactos/base/applications/write/write.c | 6 +-- reactos/base/services/audiosrv/audiosrv.h | 10 ++-- .../base/services/audiosrv/pnp_list_manager.c | 1 - reactos/base/services/eventlog/eventlog.h | 6 ++- reactos/base/services/rpcss/epmp.c | 7 ++- reactos/base/services/rpcss/irotp.c | 14 ++--- reactos/base/services/rpcss/rpcss.h | 6 ++- reactos/base/services/rpcss/rpcss.rc | 2 - reactos/base/services/rpcss/rpcss_main.c | 11 ++-- reactos/base/services/spoolsv/spoolsv.c | 7 ++- reactos/base/services/svchost/svchost.c | 5 -- reactos/base/services/svchost/svchost.h | 8 ++- reactos/base/services/svchost/svchost.rc | 2 - reactos/base/services/tcpsvcs/tcpsvcs.h | 8 ++- reactos/base/services/telnetd/serviceentry.c | 9 ++-- reactos/base/services/telnetd/telnetd.h | 8 +-- reactos/base/services/telnetd/telnetd.rc | 2 - reactos/base/services/thmsvc/thmsvc.c | 6 +-- reactos/base/services/umpnpmgr/umpnpmgr.c | 16 +++--- reactos/base/services/wlansvc/rpcserver.c | 4 +- reactos/base/services/wlansvc/wlansvc.c | 4 +- reactos/base/setup/reactos/reactos.c | 9 ++-- reactos/base/setup/reactos/reactos.rc | 5 +- reactos/base/setup/reactos/rsrc.rc | 3 -- reactos/base/setup/setup/setup.c | 11 ++-- reactos/base/setup/setup/setup.rc | 2 - reactos/base/setup/usetup/interface/consup.c | 2 +- reactos/base/setup/usetup/interface/devinst.c | 2 +- reactos/base/setup/usetup/interface/usetup.c | 2 +- reactos/base/setup/usetup/native/console.c | 2 +- reactos/base/setup/usetup/native/fslist.c | 2 +- .../base/setup/usetup/native/utils/console.c | 2 +- .../base/setup/usetup/native/utils/keytrans.c | 2 +- reactos/base/setup/usetup/usetup.h | 12 +++-- reactos/base/setup/usetup/usetup.rc | 2 - reactos/base/setup/vmwinst/rsrc.rc | 3 -- reactos/base/setup/vmwinst/vmwinst.c | 14 +++-- reactos/base/setup/vmwinst/vmwinst.rc | 4 +- reactos/base/setup/welcome/resource.h | 1 + reactos/base/setup/welcome/rsrc.rc | 3 -- reactos/base/setup/welcome/welcome.c | 10 ++-- reactos/base/setup/welcome/welcome.rc | 3 +- reactos/base/shell/cmd/alias.c | 2 +- reactos/base/shell/cmd/assoc.c | 2 +- reactos/base/shell/cmd/attrib.c | 3 +- reactos/base/shell/cmd/batch.c | 3 +- reactos/base/shell/cmd/beep.c | 2 +- reactos/base/shell/cmd/call.c | 3 +- reactos/base/shell/cmd/chcp.c | 4 +- reactos/base/shell/cmd/choice.c | 2 +- reactos/base/shell/cmd/cls.c | 2 +- reactos/base/shell/cmd/cmd.c | 2 +- reactos/base/shell/cmd/cmd.h | 8 +-- reactos/base/shell/cmd/cmd.rc | 3 +- reactos/base/shell/cmd/cmddbg.c | 2 +- reactos/base/shell/cmd/cmdinput.c | 3 +- reactos/base/shell/cmd/cmdtable.c | 3 +- reactos/base/shell/cmd/color.c | 7 +-- reactos/base/shell/cmd/console.c | 3 +- reactos/base/shell/cmd/copy.c | 2 +- reactos/base/shell/cmd/date.c | 2 +- reactos/base/shell/cmd/del.c | 3 +- reactos/base/shell/cmd/delay.c | 2 +- reactos/base/shell/cmd/dir.c | 2 +- reactos/base/shell/cmd/dirstack.c | 2 +- reactos/base/shell/cmd/echo.c | 2 +- reactos/base/shell/cmd/error.c | 2 +- reactos/base/shell/cmd/filecomp.c | 2 +- reactos/base/shell/cmd/for.c | 2 +- reactos/base/shell/cmd/free.c | 2 +- reactos/base/shell/cmd/goto.c | 2 +- reactos/base/shell/cmd/history.c | 2 +- reactos/base/shell/cmd/if.c | 2 +- reactos/base/shell/cmd/internal.c | 2 +- reactos/base/shell/cmd/label.c | 2 +- reactos/base/shell/cmd/locale.c | 3 +- reactos/base/shell/cmd/main.c | 2 +- reactos/base/shell/cmd/memory.c | 2 +- reactos/base/shell/cmd/misc.c | 3 +- reactos/base/shell/cmd/mklink.c | 2 +- reactos/base/shell/cmd/move.c | 2 +- reactos/base/shell/cmd/msgbox.c | 2 +- reactos/base/shell/cmd/parser.c | 2 +- reactos/base/shell/cmd/path.c | 2 +- reactos/base/shell/cmd/pause.c | 2 +- reactos/base/shell/cmd/precomp.h | 20 +++---- reactos/base/shell/cmd/prompt.c | 2 +- reactos/base/shell/cmd/redir.c | 2 +- reactos/base/shell/cmd/ren.c | 2 +- reactos/base/shell/cmd/replace.c | 2 +- reactos/base/shell/cmd/resource.h | 3 +- reactos/base/shell/cmd/screen.c | 2 +- reactos/base/shell/cmd/set.c | 2 +- reactos/base/shell/cmd/setlocal.c | 3 +- reactos/base/shell/cmd/shift.c | 3 +- reactos/base/shell/cmd/start.c | 2 +- reactos/base/shell/cmd/strtoclr.c | 3 +- reactos/base/shell/cmd/time.c | 2 +- reactos/base/shell/cmd/timer.c | 6 +-- reactos/base/shell/cmd/title.c | 2 +- reactos/base/shell/cmd/type.c | 2 +- reactos/base/shell/cmd/ver.c | 2 +- reactos/base/shell/cmd/verify.c | 2 +- reactos/base/shell/cmd/vol.c | 2 +- reactos/base/shell/cmd/where.c | 2 +- reactos/base/shell/cmd/window.c | 2 +- reactos/base/shell/explorer-new/desktop.c | 2 +- reactos/base/shell/explorer-new/dragdrop.c | 2 +- reactos/base/shell/explorer-new/explorer.c | 2 +- reactos/base/shell/explorer-new/explorer.rc | 4 +- reactos/base/shell/explorer-new/precomp.h | 26 ++++----- reactos/base/shell/explorer-new/settings.c | 2 +- reactos/base/shell/explorer-new/startmnu.c | 2 +- reactos/base/shell/explorer-new/taskband.c | 2 +- reactos/base/shell/explorer-new/taskswnd.c | 2 +- reactos/base/shell/explorer-new/tbsite.c | 2 +- reactos/base/shell/explorer-new/trayntfy.c | 4 +- reactos/base/shell/explorer-new/trayprop.c | 2 +- reactos/base/shell/explorer-new/traywnd.c | 2 +- reactos/base/shell/explorer/explorer.cpp | 6 ++- reactos/base/shell/explorer/explorer.rc | 2 - .../base/shell/explorer/explorer_intres.rc | 3 +- reactos/base/shell/explorer/i386-stub-win32.c | 4 +- .../shell/explorer/notifyhook/notifyhook.rc | 2 - reactos/base/shell/explorer/precomp.h | 13 ++++- reactos/base/shell/explorer/utility/utility.h | 21 +++++--- .../base/shell/explorer/utility/xmlstorage.h | 4 +- reactos/base/system/autochk/autochk.c | 3 +- reactos/base/system/bootok/bootok.c | 5 +- reactos/base/system/diskpart/diskpart.h | 9 ++-- reactos/base/system/expand/expand.c | 10 ++-- reactos/base/system/expand/expand.rc | 1 - reactos/base/system/format/format.c | 11 ++-- reactos/base/system/format/format.rc | 5 +- reactos/base/system/format/resource.h | 2 +- reactos/base/system/format/rsrc.rc | 3 -- reactos/base/system/lsass/lsass.c | 3 +- reactos/base/system/lsass/lsass.rc | 2 - reactos/base/system/msiexec/msiexec.c | 16 ++++-- reactos/base/system/msiexec/rsrc.rc | 2 +- reactos/base/system/msiexec/service.c | 11 ++-- reactos/base/system/regsvr32/regsvr32.c | 16 +++--- reactos/base/system/regsvr32/regsvr32.rc | 5 +- reactos/base/system/regsvr32/resource.h | 2 +- reactos/base/system/regsvr32/rsrc.rc | 3 -- reactos/base/system/rundll32/CMakeLists.txt | 2 - reactos/base/system/rundll32/resource.h | 2 +- reactos/base/system/rundll32/rsrc.rc | 3 -- reactos/base/system/rundll32/rundll32.c | 14 ++--- reactos/base/system/rundll32/rundll32.rc | 5 +- reactos/base/system/runonce/runonce.c | 1 - reactos/base/system/runonce/runonce.h | 7 ++- reactos/base/system/runonce/runonce.rc | 5 +- reactos/base/system/services/services.h | 9 ++-- reactos/base/system/services/services.rc | 2 - reactos/base/system/smss/crashdmp.c | 2 +- reactos/base/system/smss/pagefile.c | 2 +- reactos/base/system/smss/sminit.c | 2 +- reactos/base/system/smss/smloop.c | 2 +- reactos/base/system/smss/smsbapi.c | 2 +- reactos/base/system/smss/smsessn.c | 2 +- reactos/base/system/smss/smss.c | 2 +- reactos/base/system/smss/smss.h | 23 ++++++-- reactos/base/system/smss/smsubsys.c | 2 +- reactos/base/system/smss/smutil.c | 2 +- reactos/base/system/subst/resource.h | 2 + reactos/base/system/subst/rsrc.rc | 3 -- reactos/base/system/subst/subst.c | 10 ++-- reactos/base/system/subst/subst.rc | 5 +- reactos/base/system/userinit/resource.h | 12 +---- reactos/base/system/userinit/rsrc.rc | 4 -- reactos/base/system/userinit/userinit.c | 15 ++++-- reactos/base/system/userinit/userinit.rc | 5 +- reactos/base/system/winlogon/environment.c | 3 -- reactos/base/system/winlogon/resource.h | 2 + reactos/base/system/winlogon/rsrc.rc | 3 -- reactos/base/system/winlogon/sas.c | 2 - reactos/base/system/winlogon/screensaver.c | 2 - reactos/base/system/winlogon/setup.c | 2 - reactos/base/system/winlogon/winlogon.c | 2 - reactos/base/system/winlogon/winlogon.h | 7 +-- reactos/base/system/winlogon/winlogon.rc | 4 +- reactos/base/system/winlogon/wlx.c | 2 - reactos/dll/3rdparty/libjpeg/jerror.c | 2 + reactos/dll/3rdparty/libpng/pngpriv.h | 2 + reactos/dll/3rdparty/libxslt/security.c | 2 +- reactos/dll/3rdparty/libxslt/xsltlocale.h | 6 ++- reactos/dll/cpl/access/access.h | 11 ++-- reactos/dll/cpl/access/access.rc | 5 +- reactos/dll/cpl/access/rsrc.rc | 3 -- reactos/dll/cpl/appwiz/appwiz.h | 20 ++++--- reactos/dll/cpl/appwiz/appwiz.rc | 4 +- reactos/dll/cpl/appwiz/rsrc.rc | 3 -- reactos/dll/cpl/console/console.h | 11 ++-- reactos/dll/cpl/console/console.rc | 3 +- reactos/dll/cpl/console/rsrc.rc | 3 -- reactos/dll/cpl/desk/desk.h | 14 +++-- reactos/dll/cpl/desk/desk.rc | 4 +- reactos/dll/cpl/desk/preview.h | 2 - reactos/dll/cpl/desk/rsrc.rc | 3 -- reactos/dll/cpl/hdwwiz/hdwwiz.h | 16 +++--- reactos/dll/cpl/hdwwiz/hdwwiz.rc | 5 +- reactos/dll/cpl/hdwwiz/rsrc.rc | 3 -- reactos/dll/cpl/inetcpl/content.c | 3 +- reactos/dll/cpl/inetcpl/general.c | 11 ++-- reactos/dll/cpl/inetcpl/inetcpl.c | 12 +++-- reactos/dll/cpl/inetcpl/security.c | 20 ++++--- reactos/dll/cpl/input/input.h | 14 ++--- reactos/dll/cpl/input/input.rc | 5 +- reactos/dll/cpl/input/rsrc.rc | 3 -- reactos/dll/cpl/intl/intl.h | 13 +++-- reactos/dll/cpl/intl/intl.rc | 5 +- reactos/dll/cpl/intl/rsrc.rc | 3 -- reactos/dll/cpl/joy/joy.h | 13 ++--- reactos/dll/cpl/joy/joy.rc | 4 +- reactos/dll/cpl/joy/rsrc.rc | 3 -- reactos/dll/cpl/main/main.h | 17 +++--- reactos/dll/cpl/main/main.rc | 5 +- reactos/dll/cpl/main/rsrc.rc | 3 -- reactos/dll/cpl/mmsys/mmsys.h | 16 ++++-- reactos/dll/cpl/mmsys/mmsys.rc | 5 +- reactos/dll/cpl/mmsys/rsrc.rc | 3 -- reactos/dll/cpl/ncpa/ncpa.c | 8 +-- reactos/dll/cpl/odbccp32/odbccp32.h | 6 ++- reactos/dll/cpl/odbccp32/odbccp32.rc | 2 - reactos/dll/cpl/powercfg/powercfg.h | 14 ++--- reactos/dll/cpl/powercfg/powercfg.rc | 5 +- reactos/dll/cpl/powercfg/rsrc.rc | 3 -- reactos/dll/cpl/sysdm/precomp.h | 14 +++-- reactos/dll/cpl/sysdm/rsrc.rc | 3 -- reactos/dll/cpl/sysdm/sysdm.rc | 4 +- reactos/dll/cpl/telephon/rsrc.rc | 3 -- reactos/dll/cpl/telephon/telephon.c | 5 +- reactos/dll/cpl/telephon/telephon.rc | 3 +- reactos/dll/cpl/timedate/clock.c | 2 +- reactos/dll/cpl/timedate/dateandtime.c | 2 +- reactos/dll/cpl/timedate/internettime.c | 2 +- reactos/dll/cpl/timedate/monthcal.c | 2 +- reactos/dll/cpl/timedate/ntpclient.c | 2 +- reactos/dll/cpl/timedate/rsrc.rc | 3 -- reactos/dll/cpl/timedate/timedate.c | 2 +- reactos/dll/cpl/timedate/timedate.h | 13 ++++- reactos/dll/cpl/timedate/timedate.rc | 4 +- reactos/dll/cpl/timedate/timezone.c | 2 +- reactos/dll/cpl/usrmgr/resource.h | 2 - reactos/dll/cpl/usrmgr/rsrc.rc | 3 -- reactos/dll/cpl/usrmgr/usrmgr.h | 9 ++-- reactos/dll/cpl/usrmgr/usrmgr.rc | 5 +- reactos/dll/cpl/wined3dcfg/rsrc.rc | 3 -- reactos/dll/cpl/wined3dcfg/wined3dcfg.c | 1 - reactos/dll/cpl/wined3dcfg/wined3dcfg.h | 9 ++-- reactos/dll/cpl/wined3dcfg/wined3dcfg.rc | 4 +- reactos/dll/directx/amstream/amstream.c | 8 +-- .../dll/directx/amstream/amstream_private.h | 19 ++++--- reactos/dll/directx/amstream/main.c | 24 +++++---- reactos/dll/directx/amstream/mediastream.c | 12 ++--- .../dll/directx/amstream/mediastreamfilter.c | 12 ++--- reactos/dll/directx/devenum/createdevenum.c | 8 +-- reactos/dll/directx/devenum/devenum.rc | 4 +- reactos/dll/directx/devenum/devenum_main.c | 4 +- reactos/dll/directx/devenum/devenum_private.h | 26 +++++---- reactos/dll/directx/devenum/factory.c | 2 +- reactos/dll/directx/devenum/mediacatenum.c | 6 +-- .../dll/directx/devenum/parsedisplayname.c | 2 +- reactos/dll/directx/dinput/data_formats.c | 9 +++- reactos/dll/directx/dinput/device.c | 24 ++++----- reactos/dll/directx/dinput/device_private.h | 10 ++-- reactos/dll/directx/dinput/dinput_main.c | 22 ++++---- reactos/dll/directx/dinput/dinput_private.h | 14 +++-- reactos/dll/directx/dinput/joystick_linux.c | 32 +++++------ .../dll/directx/dinput/joystick_linuxinput.c | 32 +++++------ reactos/dll/directx/dinput/keyboard.c | 24 ++++----- reactos/dll/directx/dinput/mouse.c | 28 +++++----- reactos/dll/directx/dinput/regsvr.c | 24 +++++---- reactos/dll/directx/dinput8/dinput8_main.c | 21 ++++---- reactos/dll/directx/dinput8/regsvr.c | 22 ++++---- reactos/dll/directx/dmusic/dmusic_main.c | 4 +- reactos/dll/directx/dmusic/dmusic_private.h | 31 ++++++----- reactos/dll/directx/dmusic/regsvr.c | 2 +- reactos/dll/directx/dplayx/dpclassfactory.c | 14 ++--- reactos/dll/directx/dplayx/dpinit.h | 8 +-- reactos/dll/directx/dplayx/dplay.c | 30 +++++------ reactos/dll/directx/dplayx/dplay_global.h | 6 +-- reactos/dll/directx/dplayx/dplaysp.c | 14 ++--- reactos/dll/directx/dplayx/dplaysp.h | 16 +++--- reactos/dll/directx/dplayx/dplayx_global.c | 20 +++---- reactos/dll/directx/dplayx/dplayx_global.h | 12 +++-- reactos/dll/directx/dplayx/dplayx_main.c | 10 ++-- reactos/dll/directx/dplayx/dplayx_messages.c | 20 +++---- reactos/dll/directx/dplayx/dplayx_messages.h | 14 ++--- reactos/dll/directx/dplayx/dplayx_queue.h | 6 +-- reactos/dll/directx/dplayx/dplobby.c | 18 +++---- reactos/dll/directx/dplayx/lobbysp.c | 8 +-- reactos/dll/directx/dplayx/lobbysp.h | 8 +-- reactos/dll/directx/dplayx/name_server.c | 24 ++++----- reactos/dll/directx/dplayx/name_server.h | 12 ++--- reactos/dll/directx/dplayx/regsvr.c | 22 ++++---- reactos/dll/directx/dsound/buffer.c | 20 ++++--- reactos/dll/directx/dsound/capture.c | 24 +++++---- reactos/dll/directx/dsound/dsound.c | 32 ++++++----- reactos/dll/directx/dsound/dsound_convert.c | 20 ++++--- reactos/dll/directx/dsound/dsound_main.c | 34 ++++++------ reactos/dll/directx/dsound/dsound_private.h | 2 +- reactos/dll/directx/dsound/duplex.c | 22 ++++---- reactos/dll/directx/dsound/mixer.c | 18 ++++--- reactos/dll/directx/dsound/primary.c | 22 ++++---- reactos/dll/directx/dsound/propset.c | 30 ++++++----- reactos/dll/directx/dsound/regsvr.c | 20 ++++--- reactos/dll/directx/dsound/sound3d.c | 22 ++++---- reactos/dll/directx/dxdiagn/container.c | 6 +-- reactos/dll/directx/dxdiagn/dxdiag_main.c | 4 +- reactos/dll/directx/dxdiagn/dxdiag_private.h | 18 ++++--- reactos/dll/directx/dxdiagn/provider.c | 4 +- reactos/dll/directx/dxdiagn/regsvr.c | 21 ++++---- reactos/dll/directx/ksproxy/precomp.h | 12 +++-- reactos/dll/directx/ksuser/ksuser.h | 11 ++-- reactos/dll/directx/msdmo/dmoreg.c | 24 +++++---- reactos/dll/directx/msdmo/dmort.c | 15 +++--- reactos/dll/directx/msdmo/stubs.c | 5 +- reactos/dll/directx/qedit/main.c | 2 +- reactos/dll/directx/qedit/mediadet.c | 12 ++--- reactos/dll/directx/qedit/qedit_private.h | 21 +++++--- reactos/dll/directx/qedit/regsvr.c | 4 +- reactos/dll/directx/qedit/samplegrabber.c | 14 ++--- reactos/dll/directx/quartz/acmwrapper.c | 22 ++++---- reactos/dll/directx/quartz/avidec.c | 24 ++++----- reactos/dll/directx/quartz/avisplit.c | 16 +++--- reactos/dll/directx/quartz/control.c | 4 +- reactos/dll/directx/quartz/dsoundrender.c | 24 ++++----- reactos/dll/directx/quartz/enumfilters.c | 2 +- reactos/dll/directx/quartz/enummedia.c | 2 +- reactos/dll/directx/quartz/enummoniker.c | 2 +- reactos/dll/directx/quartz/enumpins.c | 2 +- reactos/dll/directx/quartz/enumregfilters.c | 4 +- reactos/dll/directx/quartz/filesource.c | 14 ++--- reactos/dll/directx/quartz/filtergraph.c | 30 +++++------ reactos/dll/directx/quartz/filtermapper.c | 24 ++++----- reactos/dll/directx/quartz/main.c | 6 +-- reactos/dll/directx/quartz/memallocator.c | 12 ++--- reactos/dll/directx/quartz/mpegsplit.c | 14 ++--- reactos/dll/directx/quartz/nullrenderer.c | 24 ++++----- reactos/dll/directx/quartz/parser.c | 10 ++-- reactos/dll/directx/quartz/pin.c | 8 +-- reactos/dll/directx/quartz/quartz_private.h | 20 ++++--- reactos/dll/directx/quartz/regsvr.c | 29 +++++----- reactos/dll/directx/quartz/systemclock.c | 6 +-- reactos/dll/directx/quartz/transform.c | 22 ++++---- reactos/dll/directx/quartz/videorenderer.c | 28 +++++----- reactos/dll/directx/quartz/waveparser.c | 16 +++--- reactos/dll/directx/wine/d3d8/buffer.c | 2 +- reactos/dll/directx/wine/d3d8/d3d8_main.c | 6 +-- reactos/dll/directx/wine/d3d8/d3d8_private.h | 16 +++--- reactos/dll/directx/wine/d3d8/device.c | 16 +++--- reactos/dll/directx/wine/d3d8/directx.c | 16 +++--- reactos/dll/directx/wine/d3d8/shader.c | 2 +- reactos/dll/directx/wine/d3d8/surface.c | 2 +- reactos/dll/directx/wine/d3d8/swapchain.c | 2 +- reactos/dll/directx/wine/d3d8/texture.c | 2 +- .../dll/directx/wine/d3d8/vertexdeclaration.c | 2 +- reactos/dll/directx/wine/d3d8/volume.c | 2 +- reactos/dll/directx/wine/d3d9/buffer.c | 2 +- reactos/dll/directx/wine/d3d9/d3d9_main.c | 4 +- reactos/dll/directx/wine/d3d9/d3d9_private.h | 20 ++++--- reactos/dll/directx/wine/d3d9/device.c | 2 +- reactos/dll/directx/wine/d3d9/directx.c | 2 +- reactos/dll/directx/wine/d3d9/query.c | 2 +- reactos/dll/directx/wine/d3d9/shader.c | 2 +- reactos/dll/directx/wine/d3d9/stateblock.c | 2 +- reactos/dll/directx/wine/d3d9/surface.c | 2 +- reactos/dll/directx/wine/d3d9/swapchain.c | 2 +- reactos/dll/directx/wine/d3d9/texture.c | 2 +- .../dll/directx/wine/d3d9/vertexdeclaration.c | 2 +- reactos/dll/directx/wine/d3d9/volume.c | 2 +- .../dll/directx/wine/d3dx9_24/d3dx9_24_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_25/d3dx9_25_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_26/d3dx9_26_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_27/d3dx9_27_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_28/d3dx9_28_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_29/d3dx9_29_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_30/d3dx9_30_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_31/d3dx9_31_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_32/d3dx9_32_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_33/d3dx9_33_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_34/d3dx9_34_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_35/d3dx9_35_main.c | 18 ++++--- reactos/dll/directx/wine/d3dx9_36/core.c | 12 ++--- .../dll/directx/wine/d3dx9_36/d3dx9_36_main.c | 20 ++++--- .../directx/wine/d3dx9_36/d3dx9_36_private.h | 14 +++-- reactos/dll/directx/wine/d3dx9_36/font.c | 8 +-- reactos/dll/directx/wine/d3dx9_36/math.c | 8 +-- reactos/dll/directx/wine/d3dx9_36/mesh.c | 18 ++++--- reactos/dll/directx/wine/d3dx9_36/shader.c | 16 +++--- reactos/dll/directx/wine/d3dx9_36/sprite.c | 2 +- reactos/dll/directx/wine/d3dx9_36/surface.c | 4 +- reactos/dll/directx/wine/d3dx9_36/texture.c | 2 +- reactos/dll/directx/wine/d3dx9_36/util.c | 2 +- .../dll/directx/wine/d3dx9_37/d3dx9_37_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_38/d3dx9_38_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_39/d3dx9_39_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_40/d3dx9_40_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_41/d3dx9_41_main.c | 18 ++++--- .../dll/directx/wine/d3dx9_42/d3dx9_42_main.c | 18 ++++--- reactos/dll/directx/wine/ddraw/clipper.c | 4 +- reactos/dll/directx/wine/ddraw/ddraw.c | 4 +- reactos/dll/directx/wine/ddraw/ddraw.rc | 2 +- .../dll/directx/wine/ddraw/ddraw_private.h | 22 ++++---- reactos/dll/directx/wine/ddraw/device.c | 4 +- .../dll/directx/wine/ddraw/executebuffer.c | 4 +- reactos/dll/directx/wine/ddraw/light.c | 4 +- reactos/dll/directx/wine/ddraw/main.c | 10 ++-- reactos/dll/directx/wine/ddraw/material.c | 4 +- reactos/dll/directx/wine/ddraw/palette.c | 4 +- reactos/dll/directx/wine/ddraw/surface.c | 4 +- reactos/dll/directx/wine/ddraw/utils.c | 4 +- reactos/dll/directx/wine/ddraw/vertexbuffer.c | 4 +- reactos/dll/directx/wine/ddraw/viewport.c | 4 +- .../directx/wine/wined3d/arb_program_shader.c | 6 +-- .../wine/wined3d/ati_fragment_shader.c | 8 +-- reactos/dll/directx/wine/wined3d/buffer.c | 4 +- reactos/dll/directx/wine/wined3d/context.c | 6 +-- reactos/dll/directx/wine/wined3d/device.c | 6 +-- reactos/dll/directx/wine/wined3d/directx.c | 6 +-- reactos/dll/directx/wine/wined3d/drawprim.c | 8 +-- reactos/dll/directx/wine/wined3d/gl_compat.c | 6 +-- .../dll/directx/wine/wined3d/glsl_shader.c | 6 +-- .../wine/wined3d/nvidia_texture_shader.c | 8 +-- reactos/dll/directx/wine/wined3d/palette.c | 10 ++-- reactos/dll/directx/wine/wined3d/query.c | 4 +- reactos/dll/directx/wine/wined3d/resource.c | 4 +- reactos/dll/directx/wine/wined3d/shader.c | 8 +-- reactos/dll/directx/wine/wined3d/shader_sm1.c | 4 +- reactos/dll/directx/wine/wined3d/shader_sm4.c | 4 +- reactos/dll/directx/wine/wined3d/state.c | 6 +-- reactos/dll/directx/wine/wined3d/stateblock.c | 4 +- reactos/dll/directx/wine/wined3d/surface.c | 4 +- reactos/dll/directx/wine/wined3d/swapchain.c | 4 +- reactos/dll/directx/wine/wined3d/texture.c | 4 +- reactos/dll/directx/wine/wined3d/utils.c | 4 +- .../directx/wine/wined3d/vertexdeclaration.c | 4 +- reactos/dll/directx/wine/wined3d/view.c | 4 +- reactos/dll/directx/wine/wined3d/volume.c | 4 +- .../dll/directx/wine/wined3d/wined3d_main.c | 6 +-- .../directx/wine/wined3d/wined3d_private.h | 32 ++++++----- reactos/dll/keyboard/kbda1/kbda1.c | 5 +- reactos/dll/keyboard/kbda2/kbda2.c | 5 +- reactos/dll/keyboard/kbda3/kbda3.c | 5 +- reactos/dll/keyboard/kbdal/kbdal.c | 5 +- reactos/dll/keyboard/kbdarme/kbdarme.c | 5 +- reactos/dll/keyboard/kbdarmw/kbdarmw.c | 5 +- reactos/dll/keyboard/kbdaze/kbdaze.c | 5 +- reactos/dll/keyboard/kbdazel/kbdazel.c | 5 +- reactos/dll/keyboard/kbdbe/kbdbe.c | 5 +- reactos/dll/keyboard/kbdbga/kbdbga.c | 5 +- reactos/dll/keyboard/kbdbgm/kbdbgm.c | 5 +- reactos/dll/keyboard/kbdbgt/kbdbgt.c | 5 +- reactos/dll/keyboard/kbdblr/kbdblr.c | 5 +- reactos/dll/keyboard/kbdbr/kbdbr.c | 5 +- reactos/dll/keyboard/kbdbur/kbdbur.c | 5 +- reactos/dll/keyboard/kbdcan/kbdcan.c | 5 +- reactos/dll/keyboard/kbdcr/kbdcr.c | 5 +- reactos/dll/keyboard/kbdcz/kbdcz.c | 5 +- reactos/dll/keyboard/kbdcz1/kbdcz1.c | 5 +- reactos/dll/keyboard/kbdda/kbdda.c | 5 +- reactos/dll/keyboard/kbddv/kbddv.c | 5 +- reactos/dll/keyboard/kbdes/kbdes.c | 5 +- reactos/dll/keyboard/kbdest/kbdest.c | 5 +- reactos/dll/keyboard/kbdfc/kbdfc.c | 5 +- reactos/dll/keyboard/kbdfi/kbdfi.c | 5 +- reactos/dll/keyboard/kbdfr/kbdfr.c | 5 +- reactos/dll/keyboard/kbdgeo/kbdgeo.c | 5 +- reactos/dll/keyboard/kbdgerg/kbdgerg.c | 5 +- reactos/dll/keyboard/kbdgneo/kbdgneo.c | 5 +- reactos/dll/keyboard/kbdgr/kbdgr.c | 5 +- reactos/dll/keyboard/kbdgrist/kbdgrist.c | 5 +- reactos/dll/keyboard/kbdhe/kbdhe.c | 5 +- reactos/dll/keyboard/kbdheb/kbdheb.c | 5 +- reactos/dll/keyboard/kbdhu/kbdhu.c | 5 +- reactos/dll/keyboard/kbdic/kbdic.c | 5 +- reactos/dll/keyboard/kbdinasa/kbdinasa.c | 5 +- reactos/dll/keyboard/kbdinben/kbdinben.c | 5 +- reactos/dll/keyboard/kbdindev/kbdindev.c | 5 +- reactos/dll/keyboard/kbdinguj/kbdinguj.c | 5 +- reactos/dll/keyboard/kbdinmal/kbdinmal.c | 5 +- reactos/dll/keyboard/kbdir/kbdir.c | 5 +- reactos/dll/keyboard/kbdit/kbdit.c | 5 +- reactos/dll/keyboard/kbdja/kbdja.c | 5 +- reactos/dll/keyboard/kbdkaz/kbdkaz.c | 5 +- reactos/dll/keyboard/kbdko/kbdko.c | 5 +- reactos/dll/keyboard/kbdla/kbdla.c | 5 +- reactos/dll/keyboard/kbdlt1/kbdlt1.c | 5 +- reactos/dll/keyboard/kbdlv/kbdlv.c | 5 +- reactos/dll/keyboard/kbdmac/kbdmac.c | 5 +- reactos/dll/keyboard/kbdne/kbdne.c | 5 +- reactos/dll/keyboard/kbdno/kbdno.c | 5 +- reactos/dll/keyboard/kbdpl/kbdpl.c | 5 +- reactos/dll/keyboard/kbdpl1/kbdpl1.c | 5 +- reactos/dll/keyboard/kbdpo/kbdpo.c | 5 +- reactos/dll/keyboard/kbdro/kbdro.c | 5 +- reactos/dll/keyboard/kbdru/kbdru.c | 5 +- reactos/dll/keyboard/kbdru1/kbdru1.c | 5 +- reactos/dll/keyboard/kbdsg/kbdsg.c | 5 +- reactos/dll/keyboard/kbdsk/kbdsk.c | 5 +- reactos/dll/keyboard/kbdsk1/kbdsk1.c | 5 +- reactos/dll/keyboard/kbdsw/kbdsw.c | 5 +- reactos/dll/keyboard/kbdtat/kbdtat.c | 5 +- reactos/dll/keyboard/kbdth0/kbdth0.c | 5 +- reactos/dll/keyboard/kbdth1/kbdth1.c | 5 +- reactos/dll/keyboard/kbdth2/kbdth2.c | 5 +- reactos/dll/keyboard/kbdth3/kbdth3.c | 5 +- reactos/dll/keyboard/kbdtuf/kbdtuf.c | 5 +- reactos/dll/keyboard/kbdtuq/kbdtuq.c | 5 +- reactos/dll/keyboard/kbduk/kbduk.c | 5 +- reactos/dll/keyboard/kbdur/kbdur.c | 5 +- reactos/dll/keyboard/kbdurs/kbdurs.c | 5 +- reactos/dll/keyboard/kbdus/kbdus.c | 5 +- reactos/dll/keyboard/kbdusa/kbdusa.c | 5 +- reactos/dll/keyboard/kbdusl/kbdusl.c | 5 +- reactos/dll/keyboard/kbdusr/kbdusr.c | 5 +- reactos/dll/keyboard/kbdusx/kbdusx.c | 5 +- reactos/dll/keyboard/kbduzb/kbduzb.c | 5 +- reactos/dll/keyboard/kbdvntc/kbdvntc.c | 5 +- reactos/dll/keyboard/kbdycc/kbdycc.c | 5 +- reactos/dll/keyboard/kbdycl/kbdycl.c | 5 +- reactos/dll/ntdll/def/ntdll.rc | 4 +- reactos/dll/ntdll/include/ntdll.h | 9 ++-- reactos/dll/opengl/glu32/src/include/gluos.h | 6 ++- .../src/libnurbs/interface/bezierEval.cc | 6 +-- .../src/libnurbs/interface/bezierPatch.cc | 4 +- .../src/libnurbs/interface/bezierPatchMesh.cc | 6 +-- .../src/libnurbs/interface/glcurveval.cc | 6 +-- .../src/libnurbs/interface/glinterface.cc | 10 ++-- .../src/libnurbs/interface/glrenderer.cc | 2 +- .../src/libnurbs/interface/glsurfeval.cc | 10 ++-- .../src/libnurbs/interface/incurveeval.cc | 4 +- .../src/libnurbs/interface/insurfeval.cc | 6 +-- .../glu32/src/libnurbs/internals/arc.cc | 12 ++--- .../opengl/glu32/src/libnurbs/internals/arc.h | 4 +- .../glu32/src/libnurbs/internals/arcsorter.cc | 4 +- .../glu32/src/libnurbs/internals/arctess.cc | 10 ++-- .../glu32/src/libnurbs/internals/arctess.h | 2 +- .../glu32/src/libnurbs/internals/backend.cc | 6 +-- .../glu32/src/libnurbs/internals/backend.h | 4 +- .../src/libnurbs/internals/basiccrveval.cc | 4 +- .../src/libnurbs/internals/basiccrveval.h | 2 +- .../src/libnurbs/internals/basicsurfeval.cc | 4 +- .../glu32/src/libnurbs/internals/bezierarc.h | 2 +- .../glu32/src/libnurbs/internals/bin.cc | 6 +-- .../opengl/glu32/src/libnurbs/internals/bin.h | 4 +- .../glu32/src/libnurbs/internals/bufpool.cc | 4 +- .../glu32/src/libnurbs/internals/bufpool.h | 2 +- .../glu32/src/libnurbs/internals/ccw.cc | 12 ++--- .../src/libnurbs/internals/coveandtiler.cc | 12 ++--- .../src/libnurbs/internals/coveandtiler.h | 2 +- .../glu32/src/libnurbs/internals/curve.cc | 10 ++-- .../glu32/src/libnurbs/internals/curvelist.cc | 8 +-- .../glu32/src/libnurbs/internals/curvelist.h | 4 +- .../glu32/src/libnurbs/internals/curvesub.cc | 2 +- .../src/libnurbs/internals/dataTransform.cc | 12 ++--- .../src/libnurbs/internals/displaylist.cc | 6 +-- .../src/libnurbs/internals/displaylist.h | 6 +-- .../glu32/src/libnurbs/internals/flist.cc | 4 +- .../glu32/src/libnurbs/internals/flist.h | 2 +- .../src/libnurbs/internals/flistsorter.cc | 2 +- .../src/libnurbs/internals/gridtrimvertex.h | 2 +- .../glu32/src/libnurbs/internals/hull.cc | 18 +++---- .../glu32/src/libnurbs/internals/hull.h | 4 +- .../glu32/src/libnurbs/internals/intersect.cc | 12 ++--- .../src/libnurbs/internals/knotvector.cc | 4 +- .../glu32/src/libnurbs/internals/mapdesc.cc | 12 ++--- .../glu32/src/libnurbs/internals/mapdesc.h | 2 +- .../glu32/src/libnurbs/internals/mapdescv.cc | 10 ++-- .../glu32/src/libnurbs/internals/maplist.cc | 10 ++-- .../glu32/src/libnurbs/internals/maplist.h | 4 +- .../glu32/src/libnurbs/internals/mesher.cc | 18 +++---- .../internals/monoTriangulationBackend.cc | 2 +- .../src/libnurbs/internals/monotonizer.cc | 12 ++--- .../glu32/src/libnurbs/internals/mycode.cc | 2 +- .../src/libnurbs/internals/nurbsinterfac.cc | 8 +-- .../glu32/src/libnurbs/internals/nurbstess.cc | 14 ++--- .../glu32/src/libnurbs/internals/nurbstess.h | 4 +- .../glu32/src/libnurbs/internals/patch.cc | 12 ++--- .../glu32/src/libnurbs/internals/patchlist.cc | 10 ++-- .../glu32/src/libnurbs/internals/patchlist.h | 4 +- .../glu32/src/libnurbs/internals/pwlarc.h | 2 +- .../glu32/src/libnurbs/internals/quilt.cc | 6 +-- .../glu32/src/libnurbs/internals/quilt.h | 2 +- .../glu32/src/libnurbs/internals/reader.cc | 4 +- .../src/libnurbs/internals/renderhints.cc | 2 +- .../glu32/src/libnurbs/internals/simplemath.h | 2 +- .../glu32/src/libnurbs/internals/slicer.cc | 20 +++---- .../glu32/src/libnurbs/internals/slicer.h | 4 +- .../glu32/src/libnurbs/internals/sorter.cc | 2 +- .../glu32/src/libnurbs/internals/splitarcs.cc | 12 ++--- .../src/libnurbs/internals/subdivider.cc | 18 +++---- .../glu32/src/libnurbs/internals/subdivider.h | 2 +- .../glu32/src/libnurbs/internals/tobezier.cc | 6 +-- .../glu32/src/libnurbs/internals/trimline.cc | 6 +-- .../glu32/src/libnurbs/internals/trimline.h | 2 +- .../src/libnurbs/internals/trimregion.cc | 6 +-- .../src/libnurbs/internals/trimvertpool.cc | 10 ++-- .../glu32/src/libnurbs/internals/uarray.cc | 6 +-- .../glu32/src/libnurbs/internals/varray.cc | 6 +-- .../src/libnurbs/nurbtess/directedLine.cc | 10 ++-- .../src/libnurbs/nurbtess/directedLine.h | 2 +- .../glu32/src/libnurbs/nurbtess/gridWrap.cc | 4 +- .../glu32/src/libnurbs/nurbtess/gridWrap.h | 6 +-- .../glu32/src/libnurbs/nurbtess/monoChain.cc | 8 +-- .../glu32/src/libnurbs/nurbtess/monoChain.h | 2 +- .../src/libnurbs/nurbtess/monoPolyPart.cc | 4 +- .../libnurbs/nurbtess/monoTriangulation.cc | 10 ++-- .../src/libnurbs/nurbtess/monoTriangulation.h | 2 +- .../glu32/src/libnurbs/nurbtess/partitionX.cc | 2 +- .../glu32/src/libnurbs/nurbtess/partitionY.cc | 2 +- .../glu32/src/libnurbs/nurbtess/polyDBG.cc | 6 +-- .../glu32/src/libnurbs/nurbtess/polyDBG.h | 4 +- .../glu32/src/libnurbs/nurbtess/polyUtil.cc | 4 +- .../src/libnurbs/nurbtess/primitiveStream.cc | 4 +- .../glu32/src/libnurbs/nurbtess/quicksort.cc | 4 +- .../glu32/src/libnurbs/nurbtess/quicksort.h | 4 +- .../glu32/src/libnurbs/nurbtess/rectBlock.cc | 6 +-- .../glu32/src/libnurbs/nurbtess/rectBlock.h | 2 +- .../glu32/src/libnurbs/nurbtess/sampleComp.cc | 6 +-- .../glu32/src/libnurbs/nurbtess/sampleComp.h | 2 +- .../src/libnurbs/nurbtess/sampleCompBot.cc | 6 +-- .../src/libnurbs/nurbtess/sampleCompRight.cc | 10 ++-- .../src/libnurbs/nurbtess/sampleCompTop.cc | 6 +-- .../src/libnurbs/nurbtess/sampleMonoPoly.cc | 4 +- .../src/libnurbs/nurbtess/sampleMonoPoly.h | 2 +- .../src/libnurbs/nurbtess/sampledLine.cc | 2 +- .../glu32/src/libnurbs/nurbtess/searchTree.cc | 2 +- reactos/dll/opengl/glu32/src/libtess/dict.c | 2 +- reactos/dll/opengl/glu32/src/libtess/geom.c | 2 +- .../dll/opengl/glu32/src/libtess/memalloc.c | 2 +- reactos/dll/opengl/glu32/src/libtess/mesh.c | 2 +- reactos/dll/opengl/glu32/src/libtess/normal.c | 8 +-- reactos/dll/opengl/glu32/src/libtess/normal.h | 2 +- .../opengl/glu32/src/libtess/priorityq-heap.c | 6 +-- .../opengl/glu32/src/libtess/priorityq-sort.h | 2 +- .../dll/opengl/glu32/src/libtess/priorityq.c | 4 +- reactos/dll/opengl/glu32/src/libtess/render.c | 6 +-- reactos/dll/opengl/glu32/src/libtess/render.h | 2 +- reactos/dll/opengl/glu32/src/libtess/sweep.c | 12 ++--- reactos/dll/opengl/glu32/src/libtess/sweep.h | 4 +- reactos/dll/opengl/glu32/src/libtess/tess.c | 6 +-- reactos/dll/opengl/glu32/src/libtess/tess.h | 2 +- .../dll/opengl/glu32/src/libtess/tessmono.c | 6 +-- reactos/dll/opengl/glu32/src/libutil/glue.c | 4 +- reactos/dll/opengl/glu32/src/libutil/mipmap.c | 8 +-- .../dll/opengl/glu32/src/libutil/project.c | 2 +- reactos/dll/opengl/glu32/src/libutil/quad.c | 6 +-- .../dll/opengl/glu32/src/libutil/registry.c | 6 +-- reactos/dll/opengl/mesa/include/GL/gl.h | 5 +- .../mesa/src/gallium/auxiliary/os/os_misc.c | 5 +- .../mesa/src/gallium/auxiliary/os/os_thread.h | 5 +- .../mesa/src/gallium/auxiliary/os/os_time.c | 5 +- .../gallium/auxiliary/rtasm/rtasm_execmem.c | 2 +- .../src/gallium/auxiliary/util/u_cpu_detect.c | 4 +- .../gallium/auxiliary/util/u_debug_symbol.c | 2 +- .../mesa/src/gallium/auxiliary/util/u_dl.c | 4 +- .../src/gallium/auxiliary/util/u_network.c | 5 +- .../gallium/state_trackers/wgl/stw_context.c | 2 +- .../gallium/state_trackers/wgl/stw_context.h | 2 +- .../gallium/state_trackers/wgl/stw_device.c | 2 +- .../state_trackers/wgl/stw_ext_context.c | 2 +- .../wgl/stw_ext_extensionsstring.c | 5 +- .../state_trackers/wgl/stw_ext_gallium.h | 2 +- .../state_trackers/wgl/stw_ext_pbuffer.c | 2 +- .../state_trackers/wgl/stw_ext_pixelformat.c | 2 +- .../state_trackers/wgl/stw_ext_swapinterval.c | 5 +- .../state_trackers/wgl/stw_framebuffer.c | 2 +- .../state_trackers/wgl/stw_framebuffer.h | 2 +- .../state_trackers/wgl/stw_getprocaddress.c | 2 +- .../src/gallium/state_trackers/wgl/stw_icd.h | 5 +- .../state_trackers/wgl/stw_pixelformat.h | 2 +- .../src/gallium/state_trackers/wgl/stw_st.h | 3 +- .../src/gallium/state_trackers/wgl/stw_tls.c | 2 +- .../src/gallium/state_trackers/wgl/stw_tls.h | 5 +- .../src/gallium/state_trackers/wgl/stw_wgl.c | 2 +- .../src/gallium/state_trackers/wgl/stw_wgl.h | 2 +- .../gallium/state_trackers/wgl/stw_winsys.h | 2 +- .../dll/opengl/mesa/src/mapi/mapi/u_execmem.c | 3 +- .../dll/opengl/mesa/src/mapi/mapi/u_thread.h | 5 +- .../dll/opengl/mesa/src/mesa/main/dlopen.c | 4 +- .../dll/opengl/mesa/src/mesa/main/glheader.h | 4 +- reactos/dll/opengl/opengl32/opengl32.h | 12 +++-- reactos/dll/shellext/deskadp/deskadp.rc | 4 +- reactos/dll/shellext/deskadp/precomp.h | 9 +++- reactos/dll/shellext/deskadp/rsrc.rc | 3 -- reactos/dll/shellext/deskmon/deskmon.rc | 4 +- reactos/dll/shellext/deskmon/precomp.h | 9 +++- reactos/dll/shellext/deskmon/rsrc.rc | 3 -- reactos/dll/shellext/devcpux/processor.c | 9 +++- reactos/dll/shellext/devcpux/processor.rc | 4 +- reactos/dll/shellext/devcpux/resource.h | 2 + reactos/dll/shellext/fontext/fontext.h | 10 ++-- reactos/dll/shellext/fontext/fontext.rc | 3 +- reactos/dll/shellext/fontext/rsrc.rc | 3 -- reactos/dll/shellext/slayer/precomp.h | 16 +++--- reactos/dll/shellext/slayer/rsrc.rc | 3 -- reactos/dll/shellext/slayer/slayer.c | 2 +- reactos/dll/shellext/slayer/slayer.rc | 4 +- reactos/dll/win32/acledit/acledit.rc | 3 +- reactos/dll/win32/acledit/acleditint.h | 3 +- reactos/dll/win32/aclui/aclui.c | 2 +- reactos/dll/win32/aclui/aclui.rc | 5 +- reactos/dll/win32/aclui/checklist.c | 2 +- reactos/dll/win32/aclui/guid.c | 8 ++- reactos/dll/win32/aclui/misc.c | 2 +- reactos/dll/win32/aclui/precomp.h | 15 ++++-- reactos/dll/win32/aclui/rsrc.rc | 3 -- reactos/dll/win32/aclui/sidcache.c | 2 +- reactos/dll/win32/activeds/activeds_main.c | 20 ++++--- reactos/dll/win32/activeds/stubs.c | 8 ++- reactos/dll/win32/actxprxy/usrmarshal.c | 28 +++++----- reactos/dll/win32/advapi32/advapi32.h | 11 ++-- reactos/dll/win32/advapi32/advapi32.rc | 2 +- reactos/dll/win32/advapi32/crypt/crypt.h | 8 +-- reactos/dll/win32/advpack/advpack.c | 22 ++++---- reactos/dll/win32/advpack/files.c | 28 +++++----- reactos/dll/win32/advpack/install.c | 30 ++++++----- reactos/dll/win32/advpack/reg.c | 20 +++---- reactos/dll/win32/atl/atl_main.c | 19 +++++-- reactos/dll/win32/atl/registrar.c | 19 +++++-- reactos/dll/win32/atl100/atl.c | 14 ++++- reactos/dll/win32/atl100/atl_ax.c | 32 ++++++----- reactos/dll/win32/atl100/registrar.c | 16 ++++-- reactos/dll/win32/authz/authz.c | 2 +- reactos/dll/win32/authz/authz.rc | 2 +- reactos/dll/win32/authz/clictx.c | 2 +- reactos/dll/win32/authz/precomp.h | 10 +++- reactos/dll/win32/authz/resman.c | 2 +- reactos/dll/win32/avicap32/avicap32.c | 16 ++++-- reactos/dll/win32/avicap32/avicap32.rc | 2 +- reactos/dll/win32/avifil32/acmstream.c | 24 +++++---- reactos/dll/win32/avifil32/api.c | 32 ++++++----- reactos/dll/win32/avifil32/avifile.c | 24 +++++---- reactos/dll/win32/avifil32/avifile_private.h | 4 +- reactos/dll/win32/avifil32/editstream.c | 24 +++++---- reactos/dll/win32/avifil32/extrachunk.c | 14 +++-- reactos/dll/win32/avifil32/extrachunk.h | 8 +-- reactos/dll/win32/avifil32/factory.c | 24 +++++---- reactos/dll/win32/avifil32/getframe.c | 16 +++--- reactos/dll/win32/avifil32/icmstream.c | 20 ++++--- reactos/dll/win32/avifil32/rsrc.rc | 7 ++- reactos/dll/win32/avifil32/tmpfile.c | 22 ++++---- reactos/dll/win32/avifil32/wavfile.c | 26 +++++---- reactos/dll/win32/batt/batt.c | 7 ++- reactos/dll/win32/batt/batt.rc | 3 +- reactos/dll/win32/batt/resource.h | 2 + reactos/dll/win32/bcrypt/bcrypt_main.c | 12 +++-- reactos/dll/win32/beepmidi/beepmidi.c | 9 ++-- reactos/dll/win32/browseui/browseui.rc | 7 ++- reactos/dll/win32/browseui/dllinstall.c | 3 +- reactos/dll/win32/browseui/precomp.h | 19 ++++--- reactos/dll/win32/browseui/resource.h | 2 + reactos/dll/win32/cabinet/cabinet.h | 14 +++-- reactos/dll/win32/cabinet/cabinet_main.c | 20 ++++--- reactos/dll/win32/cabinet/fci.c | 24 ++++----- reactos/dll/win32/cabinet/fdi.c | 14 ++--- reactos/dll/win32/cabinet/stubs.c | 2 +- reactos/dll/win32/cards/cards.c | 4 +- reactos/dll/win32/cards/cards.rc | 2 +- reactos/dll/win32/clusapi/clusapi.c | 10 ++-- reactos/dll/win32/comcat/comcat_main.c | 16 +++--- reactos/dll/win32/comctl32/animate.c | 24 +++++---- reactos/dll/win32/comctl32/comboex.c | 20 +++---- reactos/dll/win32/comctl32/comctl32.h | 16 +++--- reactos/dll/win32/comctl32/comctl32undoc.c | 38 +++++++------ reactos/dll/win32/comctl32/commctrl.c | 30 ++++++----- reactos/dll/win32/comctl32/datetime.c | 24 ++++----- reactos/dll/win32/comctl32/dpa.c | 18 ++++--- reactos/dll/win32/comctl32/draglist.c | 16 +++--- reactos/dll/win32/comctl32/dsa.c | 10 ++-- reactos/dll/win32/comctl32/flatsb.c | 12 ++--- reactos/dll/win32/comctl32/header.c | 30 ++++++----- reactos/dll/win32/comctl32/hotkey.c | 18 +++---- reactos/dll/win32/comctl32/imagelist.c | 28 +++++----- reactos/dll/win32/comctl32/ipaddress.c | 26 ++++----- reactos/dll/win32/comctl32/listview.c | 32 +++++------ reactos/dll/win32/comctl32/monthcal.c | 30 +++++------ reactos/dll/win32/comctl32/nativefont.c | 12 ++--- reactos/dll/win32/comctl32/pager.c | 18 +++---- reactos/dll/win32/comctl32/progress.c | 22 ++++---- reactos/dll/win32/comctl32/propsheet.c | 24 ++++----- reactos/dll/win32/comctl32/rebar.c | 24 ++++----- reactos/dll/win32/comctl32/rsrc.rc | 8 +-- reactos/dll/win32/comctl32/smoothscroll.c | 12 ++--- reactos/dll/win32/comctl32/status.c | 20 +++---- reactos/dll/win32/comctl32/string.c | 22 ++++---- reactos/dll/win32/comctl32/stubs.c | 2 +- reactos/dll/win32/comctl32/syslink.c | 20 +++---- reactos/dll/win32/comctl32/tab.c | 24 ++++----- reactos/dll/win32/comctl32/theme_button.c | 16 +++--- reactos/dll/win32/comctl32/theme_combo.c | 18 +++---- reactos/dll/win32/comctl32/theme_dialog.c | 18 +++---- reactos/dll/win32/comctl32/theme_edit.c | 18 +++---- reactos/dll/win32/comctl32/theme_listbox.c | 18 +++---- reactos/dll/win32/comctl32/theming.c | 12 ++--- reactos/dll/win32/comctl32/toolbar.c | 22 ++++---- reactos/dll/win32/comctl32/tooltips.c | 20 +++---- reactos/dll/win32/comctl32/trackbar.c | 22 ++++---- reactos/dll/win32/comctl32/treeview.c | 34 ++++++------ reactos/dll/win32/comctl32/updown.c | 28 +++++----- reactos/dll/win32/comdlg32/cdlg.h | 2 +- reactos/dll/win32/comdlg32/cdlg32.c | 22 ++++---- reactos/dll/win32/comdlg32/colordlg.c | 28 +++++----- reactos/dll/win32/comdlg32/filedlg.c | 46 ++++++++-------- reactos/dll/win32/comdlg32/filedlg31.c | 34 ++++++------ reactos/dll/win32/comdlg32/filedlgbrowser.c | 31 ++++++----- reactos/dll/win32/comdlg32/filedlgbrowser.h | 22 ++++---- reactos/dll/win32/comdlg32/finddlg.c | 24 +++++---- reactos/dll/win32/comdlg32/fontdlg.c | 30 ++++++----- reactos/dll/win32/comdlg32/printdlg.c | 34 ++++++------ reactos/dll/win32/comdlg32/rsrc.rc | 14 ++--- reactos/dll/win32/compstui/compstui_main.c | 14 ++--- reactos/dll/win32/credui/credui.rc | 4 +- reactos/dll/win32/credui/credui_main.c | 20 +++---- reactos/dll/win32/credui/credui_resources.h | 4 +- reactos/dll/win32/crtdll/dllmain.c | 8 +-- reactos/dll/win32/crtdll/precomp.h | 7 +-- reactos/dll/win32/crypt32/base64.c | 13 ++--- reactos/dll/win32/crypt32/cert.c | 18 ++++--- reactos/dll/win32/crypt32/crypt32.rc | 8 +-- reactos/dll/win32/crypt32/cryptres.h | 2 +- reactos/dll/win32/cryptdlg/cryptdlg.rc | 8 +-- reactos/dll/win32/cryptdlg/cryptres.h | 2 +- reactos/dll/win32/cryptdlg/main.c | 28 +++++----- reactos/dll/win32/cryptdll/cryptdll.c | 12 +++-- reactos/dll/win32/cryptdll/stubs.c | 4 +- reactos/dll/win32/cryptnet/cryptnet_main.c | 24 +++++---- reactos/dll/win32/cryptui/cryptui.rc | 10 ++-- reactos/dll/win32/cryptui/cryptuires.h | 6 +-- reactos/dll/win32/cryptui/main.c | 40 +++++++------- reactos/dll/win32/dbghelp/coff.c | 20 +++---- reactos/dll/win32/dbghelp/cpu_arm.c | 8 +-- reactos/dll/win32/dbghelp/dbghelp_private.h | 28 +++++----- reactos/dll/win32/dbghelp/dwarf.c | 28 +++++----- reactos/dll/win32/dbghelp/image.c | 12 ++--- reactos/dll/win32/dbghelp/module.c | 14 ++--- reactos/dll/win32/dbghelp/path.c | 14 ++--- reactos/dll/win32/dbghelp/source.c | 10 ++-- reactos/dll/win32/dbghelp/stabs.c | 26 ++++----- reactos/dll/win32/dbghelp/stack.c | 12 ++--- reactos/dll/win32/dciman32/dciman_main.c | 16 ++++-- reactos/dll/win32/devmgr/advprop.c | 2 +- reactos/dll/win32/devmgr/devmgr.rc | 5 +- reactos/dll/win32/devmgr/devprblm.c | 2 +- reactos/dll/win32/devmgr/hwpage.c | 2 +- reactos/dll/win32/devmgr/misc.c | 2 +- reactos/dll/win32/devmgr/precomp.h | 6 ++- reactos/dll/win32/devmgr/stubs.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/adapter.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/alloc.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/api.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/compat.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/hash.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/options.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/socket.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/tables.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/tree.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcp/util.c | 2 +- reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc | 2 - reactos/dll/win32/dhcpcsvc/include/rosdhcp.h | 15 ++++-- reactos/dll/win32/dnsapi/dnsapi/precomp.h | 3 +- .../win32/dnsapi/include/internal/windns.h | 2 +- reactos/dll/win32/dwmapi/dwmapi_main.c | 18 ++++--- reactos/dll/win32/fmifs/precomp.h | 6 ++- reactos/dll/win32/fusion/asmcache.c | 32 ++++++----- reactos/dll/win32/fusion/asmenum.c | 24 +++++---- reactos/dll/win32/fusion/asmname.c | 22 ++++---- reactos/dll/win32/fusion/assembly.c | 30 ++++++----- reactos/dll/win32/fusion/fusion.c | 18 ++++--- reactos/dll/win32/fusion/fusion_main.c | 10 ++-- reactos/dll/win32/fusion/fusionpriv.h | 10 ++-- reactos/dll/win32/gdiplus/brush.c | 20 +++---- reactos/dll/win32/gdiplus/customlinecap.c | 14 ++--- reactos/dll/win32/gdiplus/font.c | 24 ++++----- reactos/dll/win32/gdiplus/gdiplus.c | 22 ++++---- reactos/dll/win32/gdiplus/gdiplus_private.h | 22 ++++---- reactos/dll/win32/gdiplus/graphics.c | 34 ++++++------ reactos/dll/win32/gdiplus/graphicspath.c | 18 +++---- reactos/dll/win32/gdiplus/image.c | 24 ++++----- reactos/dll/win32/gdiplus/imageattributes.c | 10 ++-- reactos/dll/win32/gdiplus/matrix.c | 16 +++--- reactos/dll/win32/gdiplus/metafile.c | 30 +++++------ reactos/dll/win32/gdiplus/pathiterator.c | 14 ++--- reactos/dll/win32/gdiplus/pen.c | 14 ++--- reactos/dll/win32/gdiplus/region.c | 14 ++--- reactos/dll/win32/gdiplus/stringformat.c | 16 +++--- reactos/dll/win32/getuname/getuname.c | 2 +- reactos/dll/win32/getuname/getuname.rc | 2 +- reactos/dll/win32/hhctrl.ocx/chm.c | 6 +-- reactos/dll/win32/hhctrl.ocx/content.c | 2 +- reactos/dll/win32/hhctrl.ocx/help.c | 6 +-- reactos/dll/win32/hhctrl.ocx/hhctrl.c | 2 +- reactos/dll/win32/hhctrl.ocx/hhctrl.h | 28 +++++----- reactos/dll/win32/hhctrl.ocx/hhctrl.rc | 13 ++--- reactos/dll/win32/hhctrl.ocx/index.c | 2 +- reactos/dll/win32/hhctrl.ocx/regsvr.c | 24 +++++---- reactos/dll/win32/hhctrl.ocx/resource.h | 4 +- reactos/dll/win32/hhctrl.ocx/search.c | 2 +- reactos/dll/win32/hhctrl.ocx/stream.c | 2 +- reactos/dll/win32/hhctrl.ocx/webbrowser.c | 2 +- reactos/dll/win32/hid/hid.c | 2 +- reactos/dll/win32/hid/precomp.h | 8 +-- reactos/dll/win32/hid/stubs.c | 2 +- reactos/dll/win32/hlink/browse_ctx.c | 2 +- reactos/dll/win32/hlink/extserv.c | 4 +- reactos/dll/win32/hlink/hlink_main.c | 8 +-- reactos/dll/win32/hlink/hlink_private.h | 18 ++++--- reactos/dll/win32/hlink/link.c | 6 +-- reactos/dll/win32/hnetcfg/apps.c | 22 ++++---- reactos/dll/win32/hnetcfg/hnetcfg.c | 16 +++--- reactos/dll/win32/hnetcfg/manager.c | 24 +++++---- reactos/dll/win32/hnetcfg/policy.c | 22 ++++---- reactos/dll/win32/hnetcfg/port.c | 22 ++++---- reactos/dll/win32/hnetcfg/profile.c | 22 ++++---- reactos/dll/win32/hnetcfg/service.c | 22 ++++---- reactos/dll/win32/httpapi/httpapi_main.c | 14 +++-- reactos/dll/win32/iccvid/iccvid.c | 20 ++++--- reactos/dll/win32/iccvid/iccvid_private.h | 2 +- reactos/dll/win32/iccvid/rsrc.rc | 4 +- reactos/dll/win32/icmp/icmp_main.c | 24 +++++---- reactos/dll/win32/imaadp32.acm/imaadp32.c | 24 +++++---- reactos/dll/win32/imagehlp/access.c | 18 ++++--- reactos/dll/win32/imagehlp/imagehlp_main.c | 10 ++-- reactos/dll/win32/imagehlp/integrity.c | 16 +++--- reactos/dll/win32/imagehlp/modify.c | 14 ++--- reactos/dll/win32/imm32/imm.c | 26 ++++----- reactos/dll/win32/inetcomm/imaptransport.c | 20 ++++--- reactos/dll/win32/inetcomm/inetcomm_main.c | 24 +++++---- reactos/dll/win32/inetcomm/inetcomm_private.h | 8 +-- .../dll/win32/inetcomm/internettransport.c | 20 ++++--- reactos/dll/win32/inetcomm/mimeintl.c | 28 +++++----- reactos/dll/win32/inetcomm/mimeole.c | 22 ++++---- reactos/dll/win32/inetcomm/pop3transport.c | 20 ++++--- reactos/dll/win32/inetcomm/smtptransport.c | 20 ++++--- reactos/dll/win32/inetmib1/main.c | 16 +++--- reactos/dll/win32/initpki/main.c | 10 ++-- reactos/dll/win32/inseng/inseng_main.c | 20 ++++--- reactos/dll/win32/iologmsg/iologmsg.rc | 4 +- reactos/dll/win32/iphlpapi/ifenum.h | 8 +-- reactos/dll/win32/iphlpapi/iphlpapi_main.c | 2 +- reactos/dll/win32/iphlpapi/iphlpapi_private.h | 31 ++++++----- reactos/dll/win32/iphlpapi/ipstats.h | 8 +-- reactos/dll/win32/iphlpapi/resinfo_reactos.c | 2 +- reactos/dll/win32/iphlpapi/route_reactos.c | 2 +- reactos/dll/win32/itircl/itircl_main.c | 10 ++-- reactos/dll/win32/itss/chm_lib.c | 18 +++---- reactos/dll/win32/itss/itss.c | 30 ++++++----- reactos/dll/win32/itss/lzx.c | 10 ++-- reactos/dll/win32/itss/moniker.c | 22 ++++---- reactos/dll/win32/itss/protocol.c | 22 ++++---- reactos/dll/win32/itss/storage.c | 22 ++++---- reactos/dll/win32/jscript/activex.c | 10 ++-- reactos/dll/win32/jscript/array.c | 8 +-- reactos/dll/win32/jscript/bool.c | 2 +- reactos/dll/win32/jscript/date.c | 10 ++-- reactos/dll/win32/jscript/dispex.c | 4 +- reactos/dll/win32/jscript/engine.c | 8 +-- reactos/dll/win32/jscript/error.c | 8 +-- reactos/dll/win32/jscript/function.c | 2 +- reactos/dll/win32/jscript/global.c | 10 ++-- reactos/dll/win32/jscript/jscript.c | 4 +- reactos/dll/win32/jscript/jscript.h | 20 ++++--- reactos/dll/win32/jscript/jscript_main.c | 14 ++--- reactos/dll/win32/jscript/jsutils.c | 10 ++-- reactos/dll/win32/jscript/lex.c | 10 ++-- reactos/dll/win32/jscript/math.c | 12 ++--- reactos/dll/win32/jscript/number.c | 8 +-- reactos/dll/win32/jscript/object.c | 2 +- reactos/dll/win32/jscript/regexp.c | 2 +- reactos/dll/win32/jscript/string.c | 2 +- reactos/dll/win32/kernel32/k32.h | 19 ++++--- reactos/dll/win32/kernel32/kernel32.rc | 4 +- .../dll/win32/kernel32/winnls/locale_rc.rc | 6 +-- reactos/dll/win32/loadperf/loadperf_main.c | 16 +++--- reactos/dll/win32/loadperf/stubs.c | 4 +- reactos/dll/win32/localspl/localmon.c | 22 ++++---- reactos/dll/win32/localspl/localspl.rc | 10 ++-- reactos/dll/win32/localspl/localspl_main.c | 8 +-- reactos/dll/win32/localspl/localspl_private.h | 2 +- reactos/dll/win32/localspl/provider.c | 24 +++++---- reactos/dll/win32/localui/localui.c | 20 +++---- reactos/dll/win32/localui/localui.h | 4 +- reactos/dll/win32/lpk/ros_lpk.h | 4 +- reactos/dll/win32/lsasrv/lsasrv.h | 15 ++++-- reactos/dll/win32/lz32/version.rc | 2 +- reactos/dll/win32/mapi32/imalloc.c | 24 +++++---- reactos/dll/win32/mapi32/mapi32_main.c | 22 ++++---- reactos/dll/win32/mapi32/prop.c | 20 ++++--- reactos/dll/win32/mapi32/res.h | 2 +- reactos/dll/win32/mapi32/sendmail.c | 38 +++++++------ reactos/dll/win32/mapi32/stubs.c | 7 ++- reactos/dll/win32/mapi32/util.c | 32 ++++++----- reactos/dll/win32/mapi32/util.h | 2 +- reactos/dll/win32/mciavi32/info.c | 6 +-- reactos/dll/win32/mciavi32/mciavi.c | 6 +-- reactos/dll/win32/mciavi32/mciavi_res.rc | 8 +-- reactos/dll/win32/mciavi32/mmoutput.c | 2 +- reactos/dll/win32/mciavi32/private_mciavi.h | 22 ++++---- reactos/dll/win32/mciavi32/wnd.c | 4 +- reactos/dll/win32/mcicda/mcicda.c | 32 +++++------ reactos/dll/win32/mciqtz32/mciavi_res.rc | 8 +-- reactos/dll/win32/mciqtz32/mciqtz.c | 17 +++--- reactos/dll/win32/mciqtz32/mciqtz_private.h | 2 +- reactos/dll/win32/mciseq/mcimidi.c | 26 ++++----- reactos/dll/win32/mciwave/mciwave.c | 20 +++---- reactos/dll/win32/mlang/mlang.c | 29 +++++----- reactos/dll/win32/mmdrv/common.c | 2 +- reactos/dll/win32/mmdrv/entry.c | 2 +- reactos/dll/win32/mmdrv/kernel.c | 2 +- reactos/dll/win32/mmdrv/mmddk.h | 2 +- reactos/dll/win32/mmdrv/mmdrv.h | 9 ++-- reactos/dll/win32/mmdrv/mme.c | 2 +- reactos/dll/win32/mmdrv/mmioctl.h | 5 +- reactos/dll/win32/mmdrv/session.c | 2 +- reactos/dll/win32/mmdrv/utils.c | 2 +- reactos/dll/win32/mmdrv/wave.c | 2 +- reactos/dll/win32/mmdrv/wave_io.c | 2 +- reactos/dll/win32/modemui/modemui.c | 9 +++- reactos/dll/win32/modemui/modemui.rc | 4 +- reactos/dll/win32/mpr/auth.c | 10 ++-- reactos/dll/win32/mpr/mpr.rc | 8 +-- reactos/dll/win32/mpr/mpr_main.c | 12 +++-- reactos/dll/win32/mpr/mprres.h | 2 +- reactos/dll/win32/mpr/multinet.c | 10 ++-- reactos/dll/win32/mpr/netspi.h | 4 +- reactos/dll/win32/mpr/nps.c | 18 ++++--- reactos/dll/win32/mpr/pwcache.c | 14 ++--- reactos/dll/win32/mpr/version.rc | 2 +- reactos/dll/win32/mpr/wnet.c | 28 +++++----- reactos/dll/win32/mprapi/mprapi.c | 10 ++-- reactos/dll/win32/msacm32/driver.c | 32 +++++------ reactos/dll/win32/msacm32/filter.c | 22 ++++---- reactos/dll/win32/msacm32/format.c | 28 +++++----- reactos/dll/win32/msacm32/internal.c | 30 ++++++----- .../dll/win32/msacm32/msacm32.drv/wavemap.c | 22 ++++---- .../dll/win32/msacm32/msacm32.drv/wavemap.rc | 2 - reactos/dll/win32/msacm32/msacm32_main.c | 18 ++++--- reactos/dll/win32/msacm32/pcmconverter.c | 28 +++++----- reactos/dll/win32/msacm32/stream.c | 22 ++++---- reactos/dll/win32/msacm32/wineacm.h | 6 +-- reactos/dll/win32/msadp32.acm/msadp32.c | 24 +++++---- reactos/dll/win32/msafd/msafd.h | 12 +++-- reactos/dll/win32/mscat32/main.c | 10 ++-- reactos/dll/win32/mscms/handle.c | 18 +++---- reactos/dll/win32/mscms/icc.c | 18 +++---- reactos/dll/win32/mscms/mscms_main.c | 22 ++++---- reactos/dll/win32/mscms/profile.c | 28 +++++----- reactos/dll/win32/mscms/stub.c | 18 ++++--- reactos/dll/win32/mscms/transform.c | 22 ++++---- reactos/dll/win32/mscoree/assembly.c | 34 ++++++------ reactos/dll/win32/mscoree/config.c | 28 +++++----- reactos/dll/win32/mscoree/cordebug.c | 30 ++++++----- reactos/dll/win32/mscoree/corruntimehost.c | 38 +++++++------ reactos/dll/win32/mscoree/metadata.c | 34 ++++++------ reactos/dll/win32/mscoree/metahost.c | 36 +++++++------ reactos/dll/win32/mscoree/mscoree_main.c | 50 +++++++++-------- reactos/dll/win32/msctf/categorymgr.c | 28 +++++----- reactos/dll/win32/msctf/compartmentmgr.c | 34 ++++++------ reactos/dll/win32/msctf/context.c | 32 ++++++----- reactos/dll/win32/msctf/displayattributemgr.c | 16 +++--- reactos/dll/win32/msctf/documentmgr.c | 28 +++++----- reactos/dll/win32/msctf/inputprocessor.c | 32 ++++++----- reactos/dll/win32/msctf/langbarmgr.c | 16 +++--- reactos/dll/win32/msctf/msctf.c | 30 ++++++----- reactos/dll/win32/msctf/range.c | 30 ++++++----- reactos/dll/win32/msctf/threadmgr.c | 32 ++++++----- reactos/dll/win32/msctf/version.rc | 2 +- reactos/dll/win32/msftedit/msftedit_main.c | 32 ++++++----- reactos/dll/win32/msg711.acm/msg711.c | 24 +++++---- reactos/dll/win32/msgina/msgina.h | 12 ++++- reactos/dll/win32/msgina/msgina.rc | 4 +- reactos/dll/win32/msgsm32.acm/msgsm32.c | 32 +++++------ reactos/dll/win32/mshtml.tlb/rsrc.rc | 2 +- reactos/dll/win32/mshtml/conpoint.c | 14 +++-- reactos/dll/win32/mshtml/dispex.c | 14 +++-- reactos/dll/win32/mshtml/editor.c | 20 ++++--- reactos/dll/win32/mshtml/hlink.c | 16 +++--- reactos/dll/win32/mshtml/htmlanchor.c | 16 +++--- reactos/dll/win32/mshtml/htmlbody.c | 16 +++--- reactos/dll/win32/mshtml/htmlcomment.c | 14 +++-- reactos/dll/win32/mshtml/htmlcurstyle.c | 14 +++-- reactos/dll/win32/mshtml/htmldoc.c | 24 +++++---- reactos/dll/win32/mshtml/htmldoc3.c | 18 ++++--- reactos/dll/win32/mshtml/htmldoc5.c | 18 ++++--- reactos/dll/win32/mshtml/htmlelem.c | 19 ++++--- reactos/dll/win32/mshtml/htmlelem2.c | 16 +++--- reactos/dll/win32/mshtml/htmlelem3.c | 16 +++--- reactos/dll/win32/mshtml/htmlelemcol.c | 14 +++-- reactos/dll/win32/mshtml/htmlevent.c | 16 +++--- reactos/dll/win32/mshtml/htmlform.c | 14 +++-- reactos/dll/win32/mshtml/htmlframe.c | 14 +++-- reactos/dll/win32/mshtml/htmlframebase.c | 14 +++-- reactos/dll/win32/mshtml/htmlgeneric.c | 13 +++-- reactos/dll/win32/mshtml/htmliframe.c | 14 +++-- reactos/dll/win32/mshtml/htmlimg.c | 14 +++-- reactos/dll/win32/mshtml/htmlinput.c | 14 +++-- reactos/dll/win32/mshtml/htmllocation.c | 22 ++++---- reactos/dll/win32/mshtml/htmlnode.c | 14 +++-- reactos/dll/win32/mshtml/htmloption.c | 14 +++-- reactos/dll/win32/mshtml/htmlscreen.c | 14 +++-- reactos/dll/win32/mshtml/htmlscript.c | 14 +++-- reactos/dll/win32/mshtml/htmlselect.c | 14 +++-- reactos/dll/win32/mshtml/htmlstyle.c | 18 ++++--- reactos/dll/win32/mshtml/htmlstyle2.c | 16 +++--- reactos/dll/win32/mshtml/htmlstyle3.c | 16 +++--- reactos/dll/win32/mshtml/htmlstylesheet.c | 16 +++--- reactos/dll/win32/mshtml/htmltable.c | 14 +++-- reactos/dll/win32/mshtml/htmltablerow.c | 14 +++-- reactos/dll/win32/mshtml/htmltextarea.c | 14 +++-- reactos/dll/win32/mshtml/htmltextcont.c | 18 ++++--- reactos/dll/win32/mshtml/htmltextnode.c | 13 +++-- reactos/dll/win32/mshtml/htmlwindow.c | 18 ++++--- reactos/dll/win32/mshtml/install.c | 30 ++++++----- reactos/dll/win32/mshtml/loadopts.c | 20 ++++--- reactos/dll/win32/mshtml/main.c | 28 +++++----- reactos/dll/win32/mshtml/mshtml_private.h | 24 ++++----- reactos/dll/win32/mshtml/mutation.c | 20 ++++--- reactos/dll/win32/mshtml/navigate.c | 28 +++++----- reactos/dll/win32/mshtml/nsembed.c | 20 ++++--- reactos/dll/win32/mshtml/nsevents.c | 22 ++++---- reactos/dll/win32/mshtml/nsio.c | 26 +++++---- reactos/dll/win32/mshtml/nsservice.c | 20 ++++--- reactos/dll/win32/mshtml/olecmd.c | 24 +++++---- reactos/dll/win32/mshtml/oleobj.c | 24 +++++---- reactos/dll/win32/mshtml/olewnd.c | 20 ++++--- reactos/dll/win32/mshtml/omnavigator.c | 14 +++-- reactos/dll/win32/mshtml/persist.c | 22 ++++---- reactos/dll/win32/mshtml/protocol.c | 20 ++++--- reactos/dll/win32/mshtml/rsrc.rc | 10 ++-- reactos/dll/win32/mshtml/script.c | 22 ++++---- reactos/dll/win32/mshtml/secmgr.c | 22 ++++---- reactos/dll/win32/mshtml/selection.c | 16 +++--- reactos/dll/win32/mshtml/service.c | 18 ++++--- reactos/dll/win32/mshtml/task.c | 16 +++--- reactos/dll/win32/mshtml/txtrange.c | 18 ++++--- reactos/dll/win32/mshtml/view.c | 20 ++++--- reactos/dll/win32/msi/action.c | 38 +++++++------ reactos/dll/win32/msi/alter.c | 24 +++++---- reactos/dll/win32/msi/appsearch.c | 24 +++++---- reactos/dll/win32/msi/assembly.c | 16 +++--- reactos/dll/win32/msi/automation.c | 30 ++++++----- reactos/dll/win32/msi/classes.c | 20 ++++--- reactos/dll/win32/msi/cond.tab.c | 32 ++++++----- reactos/dll/win32/msi/create.c | 28 +++++----- reactos/dll/win32/msi/custom.c | 29 +++++----- reactos/dll/win32/msi/database.c | 30 ++++++----- reactos/dll/win32/msi/delete.c | 26 +++++---- reactos/dll/win32/msi/dialog.c | 36 +++++++------ reactos/dll/win32/msi/distinct.c | 26 +++++---- reactos/dll/win32/msi/drop.c | 24 +++++---- reactos/dll/win32/msi/events.c | 22 ++++---- reactos/dll/win32/msi/files.c | 28 +++++----- reactos/dll/win32/msi/font.c | 18 ++++--- reactos/dll/win32/msi/format.c | 26 +++++---- reactos/dll/win32/msi/handle.c | 20 ++++--- reactos/dll/win32/msi/insert.c | 28 +++++----- reactos/dll/win32/msi/install.c | 20 ++++--- reactos/dll/win32/msi/media.c | 24 +++++---- reactos/dll/win32/msi/msi.c | 46 ++++++++-------- reactos/dll/win32/msi/msi.rc | 4 +- reactos/dll/win32/msi/msi_main.c | 20 ++++--- reactos/dll/win32/msi/msipriv.h | 10 ++-- reactos/dll/win32/msi/msiquery.c | 32 ++++++----- reactos/dll/win32/msi/package.c | 46 ++++++++-------- reactos/dll/win32/msi/patch.c | 18 ++++--- reactos/dll/win32/msi/query.h | 16 +++--- reactos/dll/win32/msi/record.c | 34 ++++++------ reactos/dll/win32/msi/registry.c | 30 ++++++----- reactos/dll/win32/msi/script.c | 24 +++++---- reactos/dll/win32/msi/select.c | 26 +++++---- reactos/dll/win32/msi/source.c | 32 ++++++----- reactos/dll/win32/msi/sql.tab.c | 19 ++++--- reactos/dll/win32/msi/storages.c | 24 +++++---- reactos/dll/win32/msi/streams.c | 24 +++++---- reactos/dll/win32/msi/string.c | 30 ++++++----- reactos/dll/win32/msi/suminfo.c | 36 +++++++------ reactos/dll/win32/msi/table.c | 28 +++++----- reactos/dll/win32/msi/tokenize.c | 16 +++--- reactos/dll/win32/msi/update.c | 26 +++++---- reactos/dll/win32/msi/upgrade.c | 22 ++++---- reactos/dll/win32/msi/where.c | 28 +++++----- reactos/dll/win32/msimg32/msimg32_main.c | 12 +++-- reactos/dll/win32/msimtf/activeimmapp.c | 28 +++++----- reactos/dll/win32/msimtf/main.c | 24 +++++---- reactos/dll/win32/msisip/main.c | 20 ++++--- reactos/dll/win32/msisys.ocx/msisys.c | 18 ++++--- reactos/dll/win32/msports/msports.rc | 4 +- reactos/dll/win32/msports/precomp.h | 13 +++-- reactos/dll/win32/msports/resource.h | 1 + reactos/dll/win32/msrle32/msrle32.c | 6 +-- reactos/dll/win32/msrle32/msrle_private.h | 16 +++--- reactos/dll/win32/msrle32/rsrc.rc | 6 +-- reactos/dll/win32/mssign32/mssign32_main.c | 12 +++-- reactos/dll/win32/mssip32/main.c | 10 ++-- reactos/dll/win32/mstask/factory.c | 2 +- reactos/dll/win32/mstask/mstask_main.c | 8 +-- reactos/dll/win32/mstask/mstask_private.h | 14 +++-- reactos/dll/win32/mstask/task.c | 2 +- reactos/dll/win32/mstask/task_scheduler.c | 8 ++- reactos/dll/win32/mstask/task_trigger.c | 8 ++- reactos/dll/win32/msvcrt/dllmain.c | 2 +- reactos/dll/win32/msvcrt/precomp.h | 18 +++---- reactos/dll/win32/msvcrt20/msvcrt20.c | 12 +++-- reactos/dll/win32/msvcrt40/msvcrt40.c | 15 +++--- reactos/dll/win32/msvfw32/drawdib.c | 20 ++++--- reactos/dll/win32/msvfw32/mciwnd.c | 26 +++++---- reactos/dll/win32/msvfw32/msvideo_main.c | 28 +++++----- reactos/dll/win32/msvfw32/rsrc.rc | 6 +-- reactos/dll/win32/msvidc32/msvideo1.c | 20 ++++--- reactos/dll/win32/msvidc32/rsrc.rc | 4 +- reactos/dll/win32/mswsock/mswsock.rc | 2 - reactos/dll/win32/mswsock/precomp.h | 9 +++- reactos/dll/win32/msxml/main.c | 12 +++-- reactos/dll/win32/msxml2/main.c | 12 +++-- reactos/dll/win32/msxml3/attribute.c | 23 ++++---- reactos/dll/win32/msxml3/bsc.c | 29 +++++----- reactos/dll/win32/msxml3/cdata.c | 21 ++++---- reactos/dll/win32/msxml3/comment.c | 21 ++++---- reactos/dll/win32/msxml3/dispex.c | 35 ++++++------ reactos/dll/win32/msxml3/docfrag.c | 21 ++++---- reactos/dll/win32/msxml3/doctype.c | 23 ++++---- reactos/dll/win32/msxml3/domdoc.c | 37 +++++++------ reactos/dll/win32/msxml3/domimpl.c | 21 ++++---- reactos/dll/win32/msxml3/element.c | 23 ++++---- reactos/dll/win32/msxml3/entityref.c | 21 ++++---- reactos/dll/win32/msxml3/factory.c | 23 ++++---- reactos/dll/win32/msxml3/httprequest.c | 39 +++++++------- reactos/dll/win32/msxml3/main.c | 33 ++++++------ reactos/dll/win32/msxml3/msxml_private.h | 4 +- reactos/dll/win32/msxml3/mxnamespace.c | 25 +++++---- reactos/dll/win32/msxml3/mxwriter.c | 19 ++++--- reactos/dll/win32/msxml3/node.c | 25 +++++---- reactos/dll/win32/msxml3/nodelist.c | 23 ++++---- reactos/dll/win32/msxml3/nodemap.c | 25 +++++---- reactos/dll/win32/msxml3/parseerror.c | 22 ++++---- reactos/dll/win32/msxml3/pi.c | 21 ++++---- reactos/dll/win32/msxml3/saxreader.c | 37 +++++++------ reactos/dll/win32/msxml3/schema.c | 31 ++++++----- reactos/dll/win32/msxml3/selection.c | 27 +++++----- reactos/dll/win32/msxml3/stylesheet.c | 21 ++++---- reactos/dll/win32/msxml3/text.c | 21 ++++---- reactos/dll/win32/msxml3/uuid.c | 17 +++--- reactos/dll/win32/msxml3/xdr.c | 4 +- reactos/dll/win32/msxml3/xmldoc.c | 29 +++++----- reactos/dll/win32/msxml3/xmlelem.c | 23 ++++---- reactos/dll/win32/msxml3/xmlparser.c | 25 +++++---- reactos/dll/win32/msxml3/xmlview.c | 26 +++++---- reactos/dll/win32/msxml3/xslpattern.h | 4 +- reactos/dll/win32/msxml3/xslpattern.tab.c | 6 +-- reactos/dll/win32/msxml3/xslpattern.yy.c | 6 +-- reactos/dll/win32/msxml4/main.c | 11 ++-- reactos/dll/win32/msxml6/main.c | 11 ++-- reactos/dll/win32/nddeapi/nddeapi.c | 10 ++-- reactos/dll/win32/netapi32/nbcmdqueue.c | 4 +- reactos/dll/win32/netapi32/nbcmdqueue.h | 10 ++-- reactos/dll/win32/netapi32/nbnamecache.c | 4 +- reactos/dll/win32/netapi32/nbnamecache.h | 10 ++-- reactos/dll/win32/netapi32/nbt.c | 18 ++++--- reactos/dll/win32/netapi32/netapi32.c | 8 +-- reactos/dll/win32/netapi32/netapi32.h | 36 ++++++------- reactos/dll/win32/netapi32/netbios.c | 4 +- reactos/dll/win32/netapi32/netbios.h | 10 ++-- reactos/dll/win32/netapi32/share.c | 6 +-- reactos/dll/win32/netapi32/wksta.c | 34 ++++++------ reactos/dll/win32/netcfgx/netcfgx.rc | 7 ++- reactos/dll/win32/netcfgx/precomp.h | 14 +++-- reactos/dll/win32/netevent/netevt.rc | 4 +- reactos/dll/win32/netid/netid.c | 7 ++- reactos/dll/win32/netid/netid.rc | 4 +- reactos/dll/win32/netid/rsrc.rc | 3 -- reactos/dll/win32/netshell/classfactory.cpp | 2 +- reactos/dll/win32/netshell/connectmanager.cpp | 2 +- reactos/dll/win32/netshell/enumlist.cpp | 2 +- reactos/dll/win32/netshell/lanconnectui.cpp | 2 +- reactos/dll/win32/netshell/lanstatusui.cpp | 2 +- reactos/dll/win32/netshell/netshell.rc | 6 ++- reactos/dll/win32/netshell/precomp.h | 31 ++++------- reactos/dll/win32/netshell/resource.h | 2 +- .../dll/win32/netshell/shfldr_netconnect.cpp | 2 +- reactos/dll/win32/newdev/CMakeLists.txt | 2 +- reactos/dll/win32/newdev/newdev_private.h | 15 ++++-- reactos/dll/win32/newdev/rsrc.rc | 4 +- reactos/dll/win32/ntdsapi/ntdsapi.c | 16 +++--- reactos/dll/win32/ntlanman/ntlanman.c | 8 +-- reactos/dll/win32/ntlanman/ntlanman.rc | 2 - reactos/dll/win32/ntmarta/ntmarta.c | 2 +- reactos/dll/win32/ntmarta/ntmarta.h | 3 +- reactos/dll/win32/ntmarta/ntmarta.rc | 2 - reactos/dll/win32/ntprint/ntprint.c | 20 +++---- reactos/dll/win32/ntprint/ntprint.rc | 4 +- reactos/dll/win32/objsel/factory.c | 2 +- reactos/dll/win32/objsel/objsel.c | 4 +- reactos/dll/win32/objsel/objsel.rc | 6 +-- reactos/dll/win32/objsel/objsel_private.h | 34 ++++++------ reactos/dll/win32/odbc32/odbc32.rc | 2 - reactos/dll/win32/odbc32/proxyodbc.c | 32 +++++------ reactos/dll/win32/odbccp32/odbccp32.c | 14 ++--- reactos/dll/win32/ole32/antimoniker.c | 17 +++--- reactos/dll/win32/ole32/bindctx.c | 17 +++--- reactos/dll/win32/ole32/classmoniker.c | 21 ++++---- reactos/dll/win32/ole32/clipboard.c | 27 +++++----- reactos/dll/win32/ole32/comcat.c | 23 ++++---- reactos/dll/win32/ole32/compobj.c | 35 ++++++------ reactos/dll/win32/ole32/compobj_private.h | 6 +-- reactos/dll/win32/ole32/compositemoniker.c | 21 ++++---- reactos/dll/win32/ole32/datacache.c | 23 ++++---- reactos/dll/win32/ole32/defaulthandler.c | 21 ++++---- reactos/dll/win32/ole32/dictionary.c | 10 ++-- reactos/dll/win32/ole32/dictionary.h | 4 +- reactos/dll/win32/ole32/enumx.c | 13 +++-- reactos/dll/win32/ole32/errorinfo.c | 19 ++++--- reactos/dll/win32/ole32/filelockbytes.c | 28 +++++----- reactos/dll/win32/ole32/filemoniker.c | 23 ++++---- reactos/dll/win32/ole32/ftmarshal.c | 21 ++++---- reactos/dll/win32/ole32/git.c | 19 ++++--- reactos/dll/win32/ole32/hglobalstream.c | 29 +++++----- reactos/dll/win32/ole32/ifs.c | 25 +++++---- reactos/dll/win32/ole32/itemmoniker.c | 23 ++++---- reactos/dll/win32/ole32/marshal.c | 21 ++++---- reactos/dll/win32/ole32/memlockbytes.c | 23 ++++---- reactos/dll/win32/ole32/moniker.c | 31 ++++++----- reactos/dll/win32/ole32/ole2.c | 37 +++++++------ reactos/dll/win32/ole32/ole2impl.c | 19 ++++--- reactos/dll/win32/ole32/ole2stubs.c | 15 +++--- reactos/dll/win32/ole32/ole32_main.c | 25 +++++---- reactos/dll/win32/ole32/ole32res.rc | 10 ++-- reactos/dll/win32/ole32/oleobj.c | 18 ++++--- reactos/dll/win32/ole32/oleproxy.c | 25 +++++---- reactos/dll/win32/ole32/pointermoniker.c | 19 ++++--- reactos/dll/win32/ole32/rpc.c | 31 ++++++----- reactos/dll/win32/ole32/stg_prop.c | 26 ++++----- reactos/dll/win32/ole32/stg_stream.c | 18 +++---- reactos/dll/win32/ole32/storage32.c | 26 ++++----- reactos/dll/win32/ole32/storage32.h | 15 +++--- reactos/dll/win32/ole32/stubmanager.c | 17 +++--- reactos/dll/win32/ole32/usrmarshal.c | 27 +++++----- reactos/dll/win32/oleacc/main.c | 20 ++++--- reactos/dll/win32/oleacc/oleacc.rc | 4 +- reactos/dll/win32/oleaut32/connpt.c | 23 ++++---- reactos/dll/win32/oleaut32/dispatch.c | 25 +++++---- reactos/dll/win32/oleaut32/hash.c | 15 +++--- reactos/dll/win32/oleaut32/oleaut.c | 31 ++++++----- reactos/dll/win32/oleaut32/oleaut32.rc | 8 +-- reactos/dll/win32/oleaut32/olefont.c | 33 ++++++------ reactos/dll/win32/oleaut32/olepicture.c | 39 +++++++------- reactos/dll/win32/oleaut32/olepropframe.c | 17 +++--- reactos/dll/win32/oleaut32/recinfo.c | 17 +++--- reactos/dll/win32/oleaut32/safearray.c | 19 ++++--- reactos/dll/win32/oleaut32/tmarshal.c | 35 ++++++------ reactos/dll/win32/oleaut32/typelib.c | 37 +++++++------ reactos/dll/win32/oleaut32/typelib.h | 8 +-- reactos/dll/win32/oleaut32/typelib2.c | 35 ++++++------ reactos/dll/win32/oleaut32/usrmarshal.c | 25 +++++---- reactos/dll/win32/oleaut32/varformat.c | 23 ++++---- reactos/dll/win32/oleaut32/variant.c | 21 ++++---- reactos/dll/win32/oleaut32/variant.h | 8 +-- reactos/dll/win32/oleaut32/vartype.c | 13 +++-- reactos/dll/win32/olecli32/olecli_main.c | 20 +++---- reactos/dll/win32/oledlg/insobjdlg.c | 26 +++++---- reactos/dll/win32/oledlg/oledlg_main.c | 22 ++++---- reactos/dll/win32/oledlg/pastespl.c | 22 ++++---- reactos/dll/win32/oledlg/rsrc.rc | 16 +++--- reactos/dll/win32/olepro32/olepro32stubs.c | 12 ++--- reactos/dll/win32/olepro32/version.rc | 2 +- reactos/dll/win32/olesvr32/olesvr_main.c | 12 ++--- reactos/dll/win32/olethk32/main.c | 8 +-- reactos/dll/win32/pdh/pdh_main.c | 18 ++++--- reactos/dll/win32/pidgen/main.c | 10 ++-- reactos/dll/win32/powrprof/powrprof.c | 11 ++-- reactos/dll/win32/powrprof/powrprof.rc | 2 - reactos/dll/win32/printui/printui.c | 24 +++++---- reactos/dll/win32/printui/printui.rc | 4 +- reactos/dll/win32/psapi/precomp.h | 6 ++- reactos/dll/win32/psapi/psapi.rc | 2 - reactos/dll/win32/pstorec/pstorec.c | 16 +++--- reactos/dll/win32/pstorec/rsrc.rc | 8 +-- reactos/dll/win32/qmgr/enum_files.c | 2 +- reactos/dll/win32/qmgr/enum_jobs.c | 2 +- reactos/dll/win32/qmgr/factory.c | 2 +- reactos/dll/win32/qmgr/file.c | 20 ++++--- reactos/dll/win32/qmgr/job.c | 8 +-- reactos/dll/win32/qmgr/qmgr.c | 2 +- reactos/dll/win32/qmgr/qmgr.h | 17 ++++-- reactos/dll/win32/qmgr/qmgr_main.c | 24 +++++---- reactos/dll/win32/qmgr/service.c | 10 ++-- reactos/dll/win32/query/query_main.c | 23 ++++---- reactos/dll/win32/rasadhlp/precomp.h | 9 +++- reactos/dll/win32/rasapi32/rasapi.c | 14 ++--- reactos/dll/win32/rasdlg/rasdlg.c | 9 ++-- reactos/dll/win32/rasdlg/rasdlg.rc | 6 ++- reactos/dll/win32/rasman/rasman.c | 9 ++-- reactos/dll/win32/rasman/rasman.rc | 2 - reactos/dll/win32/resutils/resutils.c | 7 +-- reactos/dll/win32/riched20/editor.c | 8 +-- reactos/dll/win32/riched20/editor.h | 2 +- reactos/dll/win32/riched20/editstr.h | 20 ++++--- reactos/dll/win32/riched20/reader.c | 18 +++---- reactos/dll/win32/riched20/richole.c | 18 +++---- reactos/dll/win32/riched20/rtf.h | 14 ++--- reactos/dll/win32/riched20/txthost.c | 16 +++--- reactos/dll/win32/riched20/txtsrv.c | 18 +++---- reactos/dll/win32/riched20/writer.c | 4 +- reactos/dll/win32/riched32/richedit.c | 26 +++++---- reactos/dll/win32/rpcrt4/cproxy.c | 23 ++++---- reactos/dll/win32/rpcrt4/cpsf.c | 27 +++++----- reactos/dll/win32/rpcrt4/cstub.c | 23 ++++---- reactos/dll/win32/rpcrt4/epm_towers.h | 2 +- reactos/dll/win32/rpcrt4/ndr_clientserver.c | 19 ++++--- reactos/dll/win32/rpcrt4/ndr_contexthandle.c | 12 +++-- reactos/dll/win32/rpcrt4/ndr_es.c | 23 ++++---- reactos/dll/win32/rpcrt4/ndr_fullpointer.c | 13 +++-- reactos/dll/win32/rpcrt4/ndr_marshall.c | 24 ++++----- reactos/dll/win32/rpcrt4/ndr_misc.h | 11 ++-- reactos/dll/win32/rpcrt4/ndr_ole.c | 25 +++++---- reactos/dll/win32/rpcrt4/ndr_stubless.c | 29 +++++----- reactos/dll/win32/rpcrt4/ndr_stubless.h | 6 +-- reactos/dll/win32/rpcrt4/rpc_assoc.c | 17 +++--- reactos/dll/win32/rpcrt4/rpc_assoc.h | 2 +- reactos/dll/win32/rpcrt4/rpc_async.c | 17 +++--- reactos/dll/win32/rpcrt4/rpc_binding.c | 29 +++++----- reactos/dll/win32/rpcrt4/rpc_binding.h | 6 +-- reactos/dll/win32/rpcrt4/rpc_defs.h | 4 +- reactos/dll/win32/rpcrt4/rpc_epmap.c | 21 +++++--- reactos/dll/win32/rpcrt4/rpc_message.c | 24 +++++---- reactos/dll/win32/rpcrt4/rpc_message.h | 2 +- reactos/dll/win32/rpcrt4/rpc_server.c | 28 +++++----- reactos/dll/win32/rpcrt4/rpc_server.h | 2 +- reactos/dll/win32/rpcrt4/rpc_transport.c | 36 +++++++------ reactos/dll/win32/rpcrt4/rpcrt4.rc | 2 - reactos/dll/win32/rpcrt4/rpcrt4_main.c | 39 +++++++------- reactos/dll/win32/rpcrt4/unix_func.c | 6 +-- reactos/dll/win32/rsabase/version.rc | 2 +- reactos/dll/win32/rsaenh/handle.c | 11 ++-- reactos/dll/win32/rsaenh/handle.h | 2 +- reactos/dll/win32/rsaenh/implglue.c | 15 +++--- reactos/dll/win32/rsaenh/mpi.c | 4 +- reactos/dll/win32/rsaenh/rsaenh.c | 28 +++++----- reactos/dll/win32/rsaenh/sha2.c | 2 +- reactos/dll/win32/rsaenh/tomcrypt.h | 4 +- reactos/dll/win32/samlib/precomp.h | 10 ++-- reactos/dll/win32/samlib/samlib.rc | 2 - reactos/dll/win32/samsrv/samsrv.c | 2 +- reactos/dll/win32/samsrv/samsrv.h | 10 ++-- reactos/dll/win32/sccbase/main.c | 10 ++-- reactos/dll/win32/schannel/lsamode.c | 18 ++++--- reactos/dll/win32/schannel/schannel_main.c | 8 +-- reactos/dll/win32/schannel/usermode.c | 16 +++--- reactos/dll/win32/schannel/version.rc | 2 +- reactos/dll/win32/secur32/dllmain.c | 2 +- reactos/dll/win32/secur32/precomp.h | 10 ++-- reactos/dll/win32/secur32/secext.c | 2 +- reactos/dll/win32/secur32/secur32.rc | 2 - reactos/dll/win32/secur32/sspi.c | 2 +- reactos/dll/win32/secur32/stubs.c | 2 +- reactos/dll/win32/sensapi/sensapi.c | 26 ++++----- reactos/dll/win32/serialui/resource.h | 2 + reactos/dll/win32/serialui/serialui.c | 2 +- reactos/dll/win32/serialui/serialui.h | 11 +++- reactos/dll/win32/serialui/serialui.rc | 3 +- reactos/dll/win32/setupapi/queue.c | 2 + reactos/dll/win32/setupapi/resource.h | 3 +- reactos/dll/win32/setupapi/setupapi.rc | 4 +- reactos/dll/win32/setupapi/setupapi_private.h | 21 +++++--- reactos/dll/win32/sfc/precomp.h | 6 ++- reactos/dll/win32/sfc_os/precomp.h | 6 ++- reactos/dll/win32/sfc_os/sfc_os.c | 2 +- reactos/dll/win32/shdoclc/rsrc.rc | 8 +-- reactos/dll/win32/shdoclc/shdoclc.h | 4 +- reactos/dll/win32/shdocvw/classinfo.c | 10 ++-- reactos/dll/win32/shdocvw/client.c | 6 +-- reactos/dll/win32/shdocvw/dochost.c | 10 ++-- reactos/dll/win32/shdocvw/events.c | 4 +- reactos/dll/win32/shdocvw/factory.c | 12 ++--- reactos/dll/win32/shdocvw/frame.c | 2 +- reactos/dll/win32/shdocvw/ie.c | 2 +- reactos/dll/win32/shdocvw/iexplore.c | 30 +++++------ reactos/dll/win32/shdocvw/intshcut.c | 18 +++---- reactos/dll/win32/shdocvw/navigate.c | 14 ++--- reactos/dll/win32/shdocvw/oleobject.c | 10 ++-- reactos/dll/win32/shdocvw/persist.c | 2 +- reactos/dll/win32/shdocvw/resource.h | 2 +- reactos/dll/win32/shdocvw/shdocvw.h | 31 ++++++----- reactos/dll/win32/shdocvw/shdocvw_main.c | 18 +++---- reactos/dll/win32/shdocvw/shlinstobj.c | 16 +++--- reactos/dll/win32/shdocvw/taskbarlist.c | 6 +-- reactos/dll/win32/shdocvw/urlhist.c | 4 +- reactos/dll/win32/shdocvw/view.c | 2 +- reactos/dll/win32/shdocvw/webbrowser.c | 6 +-- reactos/dll/win32/shell32/CMakeLists.txt | 1 - reactos/dll/win32/shell32/autocomplete.cpp | 2 +- reactos/dll/win32/shell32/brsfolder.cpp | 2 +- reactos/dll/win32/shell32/changenotify.cpp | 2 +- reactos/dll/win32/shell32/classes.cpp | 2 +- reactos/dll/win32/shell32/clipboard.cpp | 2 +- reactos/dll/win32/shell32/control.cpp | 2 +- reactos/dll/win32/shell32/cpanel.h | 2 +- reactos/dll/win32/shell32/dataobject.cpp | 2 +- reactos/dll/win32/shell32/dde.cpp | 2 +- reactos/dll/win32/shell32/debughlp.cpp | 2 +- reactos/dll/win32/shell32/debughlp.h | 7 --- reactos/dll/win32/shell32/defcontextmenu.cpp | 2 +- reactos/dll/win32/shell32/desktop.cpp | 2 +- reactos/dll/win32/shell32/dialogs.cpp | 2 +- reactos/dll/win32/shell32/dragdrophelper.cpp | 2 +- reactos/dll/win32/shell32/drive.cpp | 2 +- reactos/dll/win32/shell32/drvdefext.cpp | 2 +- reactos/dll/win32/shell32/enumidlist.cpp | 2 +- reactos/dll/win32/shell32/enumidlist.h | 2 - reactos/dll/win32/shell32/extracticon.cpp | 2 +- reactos/dll/win32/shell32/filedefext.cpp | 2 +- reactos/dll/win32/shell32/folder_options.cpp | 2 +- reactos/dll/win32/shell32/folders.cpp | 2 +- reactos/dll/win32/shell32/fprop.cpp | 2 +- reactos/dll/win32/shell32/iconcache.cpp | 2 +- reactos/dll/win32/shell32/newmenu.cpp | 2 +- reactos/dll/win32/shell32/openwithmenu.cpp | 2 +- reactos/dll/win32/shell32/pidl.cpp | 2 +- reactos/dll/win32/shell32/pidl.h | 7 --- reactos/dll/win32/shell32/precomp.h | 44 ++++++--------- reactos/dll/win32/shell32/shell32.rc | 6 ++- reactos/dll/win32/shell32/shell32_main.cpp | 2 +- reactos/dll/win32/shell32/shell32_main.h | 19 +------ reactos/dll/win32/shell32/shellfolder.h | 8 --- reactos/dll/win32/shell32/shelllink.cpp | 2 +- reactos/dll/win32/shell32/shellole.cpp | 2 +- reactos/dll/win32/shell32/shellord.cpp | 2 +- reactos/dll/win32/shell32/shellpath.cpp | 2 +- reactos/dll/win32/shell32/shellreg.cpp | 2 +- reactos/dll/win32/shell32/shellstring.cpp | 2 +- reactos/dll/win32/shell32/shlexec.cpp | 3 +- reactos/dll/win32/shell32/shlfileop.cpp | 2 +- reactos/dll/win32/shell32/shlfolder.cpp | 2 +- reactos/dll/win32/shell32/shlfsbind.cpp | 2 +- reactos/dll/win32/shell32/shlmenu.cpp | 2 +- reactos/dll/win32/shell32/shlview.cpp | 2 +- reactos/dll/win32/shell32/shpolicy.cpp | 2 +- reactos/dll/win32/shell32/startmenu.cpp | 2 +- reactos/dll/win32/shell32/stubs.cpp | 2 +- reactos/dll/win32/shell32/systray.cpp | 2 +- reactos/dll/win32/shell32/undocshell.h | 8 --- reactos/dll/win32/shfolder/version.rc | 2 +- reactos/dll/win32/shimgvw/rsrc.rc | 3 -- reactos/dll/win32/shimgvw/shimgvw.c | 13 +++-- reactos/dll/win32/shimgvw/shimgvw.h | 2 - reactos/dll/win32/shimgvw/shimgvw.rc | 3 +- reactos/dll/win32/shlwapi/assoc.c | 28 +++++----- reactos/dll/win32/shlwapi/clist.c | 18 ++++--- reactos/dll/win32/shlwapi/istream.c | 18 ++++--- reactos/dll/win32/shlwapi/msgbox.c | 25 +++++---- reactos/dll/win32/shlwapi/ordinal.c | 52 +++++++++--------- reactos/dll/win32/shlwapi/path.c | 32 ++++++----- reactos/dll/win32/shlwapi/reg.c | 20 ++++--- reactos/dll/win32/shlwapi/regstream.c | 20 ++++--- reactos/dll/win32/shlwapi/resource.h | 2 +- reactos/dll/win32/shlwapi/shlwapi.rc | 8 +-- reactos/dll/win32/shlwapi/shlwapi_main.c | 12 +++-- reactos/dll/win32/shlwapi/stopwatch.c | 20 +++---- reactos/dll/win32/shlwapi/string.c | 32 ++++++----- reactos/dll/win32/shlwapi/thread.c | 20 ++++--- reactos/dll/win32/shlwapi/url.c | 34 ++++++------ reactos/dll/win32/shlwapi/wsprintf.c | 16 +++--- reactos/dll/win32/slbcsp/main.c | 10 ++-- reactos/dll/win32/smdll/dllmain.c | 2 +- reactos/dll/win32/smdll/precomp.h | 2 - reactos/dll/win32/smdll/query.c | 2 +- reactos/dll/win32/sndblst/sndblst.c | 12 ++++- reactos/dll/win32/snmpapi/main.c | 12 +++-- reactos/dll/win32/snmpapi/snmpapi.rc | 2 - reactos/dll/win32/spoolss/router.c | 18 ++++--- reactos/dll/win32/spoolss/spoolss.h | 4 +- reactos/dll/win32/spoolss/spoolss_main.c | 18 ++++--- reactos/dll/win32/srclient/srclient_main.c | 7 ++- reactos/dll/win32/stdole2.tlb/rsrc.rc | 10 ++-- reactos/dll/win32/stdole32.tlb/rsrc.rc | 10 ++-- reactos/dll/win32/sti/sti.c | 20 ++++--- reactos/dll/win32/sti/sti_main.c | 22 ++++---- reactos/dll/win32/sxs/cache.c | 20 ++++--- reactos/dll/win32/sxs/name.c | 16 +++--- reactos/dll/win32/sxs/sxs.c | 6 ++- reactos/dll/win32/syssetup/precomp.h | 24 +++++---- reactos/dll/win32/syssetup/syssetup.rc | 5 +- reactos/dll/win32/t2embed/t2embed.c | 8 ++- reactos/dll/win32/t2embed/t2embed.rc | 2 - reactos/dll/win32/tapi32/assisted.c | 24 +++++---- reactos/dll/win32/tapi32/internal.c | 26 ++++----- reactos/dll/win32/tapi32/line.c | 28 +++++----- reactos/dll/win32/tapi32/phone.c | 14 +++-- reactos/dll/win32/tapiui/tapiui.rc | 4 +- reactos/dll/win32/traffic/traffic_main.c | 10 ++-- reactos/dll/win32/twain_32/capability.c | 8 +-- reactos/dll/win32/twain_32/ds_audio.c | 6 +-- reactos/dll/win32/twain_32/ds_ctrl.c | 4 +- reactos/dll/win32/twain_32/ds_image.c | 16 +++--- reactos/dll/win32/twain_32/dsm_ctrl.c | 12 ++--- reactos/dll/win32/twain_32/twain32_main.c | 8 +-- reactos/dll/win32/twain_32/twain_32.rc | 2 - reactos/dll/win32/twain_32/twain_i.h | 4 +- reactos/dll/win32/uext2/uext2.c | 7 +-- reactos/dll/win32/ufat/ufat.c | 6 +-- reactos/dll/win32/untfs/untfs.c | 6 +-- reactos/dll/win32/updspapi/main.c | 14 ++--- reactos/dll/win32/url/url_main.c | 26 +++++---- reactos/dll/win32/urlmon/bindctx.c | 4 +- reactos/dll/win32/urlmon/binding.c | 6 +-- reactos/dll/win32/urlmon/bindprot.c | 2 +- reactos/dll/win32/urlmon/download.c | 2 +- reactos/dll/win32/urlmon/file.c | 6 +-- reactos/dll/win32/urlmon/format.c | 2 +- reactos/dll/win32/urlmon/ftp.c | 4 +- reactos/dll/win32/urlmon/gopher.c | 2 +- reactos/dll/win32/urlmon/http.c | 6 +-- reactos/dll/win32/urlmon/internet.c | 6 +-- reactos/dll/win32/urlmon/mimefilter.c | 2 +- reactos/dll/win32/urlmon/mk.c | 4 +- reactos/dll/win32/urlmon/protocol.c | 2 +- reactos/dll/win32/urlmon/protproxy.c | 2 +- reactos/dll/win32/urlmon/sec_mgr.c | 10 ++-- reactos/dll/win32/urlmon/session.c | 4 +- reactos/dll/win32/urlmon/umon.c | 10 ++-- reactos/dll/win32/urlmon/umstream.c | 10 ++-- reactos/dll/win32/urlmon/uri.c | 6 +-- reactos/dll/win32/urlmon/urlmon_main.c | 12 ++--- reactos/dll/win32/urlmon/urlmon_main.h | 22 +++++--- reactos/dll/win32/urlmon/usrmarshal.c | 2 +- reactos/dll/win32/userenv/desktop.c | 2 +- reactos/dll/win32/userenv/directory.c | 2 +- reactos/dll/win32/userenv/environment.c | 2 +- reactos/dll/win32/userenv/gpolicy.c | 2 +- reactos/dll/win32/userenv/misc.c | 2 +- reactos/dll/win32/userenv/precomp.h | 7 ++- reactos/dll/win32/userenv/profile.c | 2 +- reactos/dll/win32/userenv/registry.c | 2 +- reactos/dll/win32/userenv/resources.h | 2 + reactos/dll/win32/userenv/setup.c | 2 +- reactos/dll/win32/userenv/userenv.c | 2 +- reactos/dll/win32/userenv/userenv.rc | 3 +- reactos/dll/win32/usp10/bidi.c | 18 +++---- reactos/dll/win32/usp10/breaking.c | 22 ++++---- reactos/dll/win32/usp10/indic.c | 22 ++++---- reactos/dll/win32/usp10/indicsyllable.c | 2 +- reactos/dll/win32/usp10/linebreak.c | 2 +- reactos/dll/win32/usp10/mirror.c | 2 +- reactos/dll/win32/usp10/opentype.c | 16 +++--- reactos/dll/win32/usp10/shape.c | 18 +++---- reactos/dll/win32/usp10/shaping.c | 2 +- reactos/dll/win32/usp10/usp10.c | 20 +++---- reactos/dll/win32/uxtheme/buffer.c | 2 +- reactos/dll/win32/uxtheme/draw.c | 2 +- reactos/dll/win32/uxtheme/main.c | 2 +- reactos/dll/win32/uxtheme/metric.c | 2 +- reactos/dll/win32/uxtheme/msstyles.c | 4 +- reactos/dll/win32/uxtheme/ncscrollbar.c | 2 +- reactos/dll/win32/uxtheme/nonclient.c | 2 +- reactos/dll/win32/uxtheme/property.c | 2 +- reactos/dll/win32/uxtheme/stylemap.c | 2 +- reactos/dll/win32/uxtheme/system.c | 2 +- reactos/dll/win32/uxtheme/themehooks.c | 2 +- reactos/dll/win32/uxtheme/uxini.c | 2 +- reactos/dll/win32/uxtheme/uxthemep.h | 16 ++++-- reactos/dll/win32/vdmdbg/vdmdbg.c | 2 +- reactos/dll/win32/vdmdbg/vdmdbg.h | 4 +- reactos/dll/win32/version/info.c | 22 ++++---- reactos/dll/win32/version/install.c | 22 ++++---- reactos/dll/win32/version/resource.c | 24 ++++----- reactos/dll/win32/wdmaud.drv/wdmaud.h | 15 +++--- reactos/dll/win32/wdmaud.drv/wdmaud.rc | 2 - reactos/dll/win32/windowscodecs/bitmap.c | 16 +++--- reactos/dll/win32/windowscodecs/bmpdecode.c | 20 ++++--- reactos/dll/win32/windowscodecs/bmpencode.c | 20 ++++--- reactos/dll/win32/windowscodecs/clsfactory.c | 24 +++++---- .../dll/win32/windowscodecs/colorcontext.c | 18 ++++--- reactos/dll/win32/windowscodecs/converter.c | 16 +++--- reactos/dll/win32/windowscodecs/fliprotate.c | 18 ++++--- reactos/dll/win32/windowscodecs/gifformat.c | 19 ++++--- reactos/dll/win32/windowscodecs/icnsformat.c | 22 ++++---- reactos/dll/win32/windowscodecs/icoformat.c | 21 ++++---- reactos/dll/win32/windowscodecs/imgfactory.c | 22 ++++---- reactos/dll/win32/windowscodecs/info.c | 26 +++++---- reactos/dll/win32/windowscodecs/jpegformat.c | 26 +++++---- reactos/dll/win32/windowscodecs/main.c | 15 +++--- .../dll/win32/windowscodecs/metadatahandler.c | 22 ++++---- reactos/dll/win32/windowscodecs/palette.c | 20 ++++--- reactos/dll/win32/windowscodecs/pngformat.c | 24 +++++---- reactos/dll/win32/windowscodecs/propertybag.c | 18 ++++--- reactos/dll/win32/windowscodecs/proxy.c | 18 ++++--- reactos/dll/win32/windowscodecs/regsvr.c | 30 ++++++----- reactos/dll/win32/windowscodecs/scaler.c | 16 +++--- reactos/dll/win32/windowscodecs/stream.c | 20 ++++--- reactos/dll/win32/windowscodecs/tgaformat.c | 20 ++++--- reactos/dll/win32/windowscodecs/tiffformat.c | 22 ++++---- reactos/dll/win32/windowscodecs/ungif.c | 8 +-- reactos/dll/win32/winemp3.acm/mpegl3.c | 26 ++++----- reactos/dll/win32/winfax/precomp.h | 4 +- reactos/dll/win32/winfax/winfax.rc | 2 - reactos/dll/win32/wing32/wing32.c | 6 ++- reactos/dll/win32/winhttp/cookie.c | 18 ++++--- reactos/dll/win32/winhttp/handle.c | 18 ++++--- reactos/dll/win32/winhttp/main.c | 20 ++++--- reactos/dll/win32/winhttp/net.c | 30 ++++++----- reactos/dll/win32/winhttp/request.c | 22 ++++---- reactos/dll/win32/winhttp/session.c | 30 ++++++----- reactos/dll/win32/winhttp/url.c | 20 ++++--- reactos/dll/win32/winhttp/winhttp_private.h | 8 +-- reactos/dll/win32/wininet/cookie.c | 36 +++++++------ reactos/dll/win32/wininet/dialogs.c | 36 +++++++------ reactos/dll/win32/wininet/ftp.c | 48 +++++++++-------- reactos/dll/win32/wininet/gopher.c | 10 ++-- reactos/dll/win32/wininet/http.c | 47 ++++++++-------- reactos/dll/win32/wininet/internet.c | 50 +++++++++-------- reactos/dll/win32/wininet/netconnection.c | 40 +++++++------- reactos/dll/win32/wininet/resource.h | 4 +- reactos/dll/win32/wininet/rsrc.rc | 9 ++-- reactos/dll/win32/wininet/urlcache.c | 54 ++++++++++--------- reactos/dll/win32/wininet/utility.c | 30 ++++++----- reactos/dll/win32/wininet/wininet_main.c | 14 ++--- reactos/dll/win32/winmm/driver.c | 28 +++++----- reactos/dll/win32/winmm/joystick.c | 26 ++++----- reactos/dll/win32/winmm/lolvldrv.c | 20 +++---- reactos/dll/win32/winmm/mci.c | 32 +++++------ reactos/dll/win32/winmm/midimap/midimap.c | 22 ++++---- reactos/dll/win32/winmm/midimap/midimap.rc | 2 - reactos/dll/win32/winmm/mmio.c | 18 +++---- reactos/dll/win32/winmm/playsound.c | 20 +++---- reactos/dll/win32/winmm/registry.c | 5 +- reactos/dll/win32/winmm/time.c | 16 +++--- reactos/dll/win32/winmm/winemm.h | 6 +-- reactos/dll/win32/winmm/winmm.c | 18 +++---- reactos/dll/win32/winspool/info.c | 38 +++++++------ reactos/dll/win32/winspool/stubs.c | 8 ++- reactos/dll/win32/winspool/winspool.rc | 2 - reactos/dll/win32/winsta/logon.c | 2 +- reactos/dll/win32/winsta/main.c | 2 +- reactos/dll/win32/winsta/misc.c | 2 +- reactos/dll/win32/winsta/query.c | 2 +- reactos/dll/win32/winsta/security.c | 2 +- reactos/dll/win32/winsta/server.c | 2 +- reactos/dll/win32/winsta/winsta.h | 10 ++-- reactos/dll/win32/winsta/ws.c | 2 +- reactos/dll/win32/wintrust/asn.c | 24 ++++----- reactos/dll/win32/wintrust/crypt.c | 20 +++---- reactos/dll/win32/wintrust/register.c | 24 ++++----- reactos/dll/win32/wintrust/softpub.c | 14 ++--- reactos/dll/win32/wintrust/wintrust_main.c | 34 ++++++------ reactos/dll/win32/wlanapi/main.c | 10 ++-- reactos/dll/win32/wldap32/add.c | 16 +++--- reactos/dll/win32/wldap32/ber.c | 8 +-- reactos/dll/win32/wldap32/bind.c | 16 +++--- reactos/dll/win32/wldap32/compare.c | 16 +++--- reactos/dll/win32/wldap32/control.c | 16 +++--- reactos/dll/win32/wldap32/delete.c | 16 +++--- reactos/dll/win32/wldap32/dn.c | 16 +++--- reactos/dll/win32/wldap32/error.c | 18 +++---- reactos/dll/win32/wldap32/extended.c | 16 +++--- reactos/dll/win32/wldap32/init.c | 17 +++--- reactos/dll/win32/wldap32/main.c | 10 ++-- reactos/dll/win32/wldap32/misc.c | 14 ++--- reactos/dll/win32/wldap32/modify.c | 16 +++--- reactos/dll/win32/wldap32/modrdn.c | 16 +++--- reactos/dll/win32/wldap32/option.c | 16 +++--- reactos/dll/win32/wldap32/page.c | 16 +++--- reactos/dll/win32/wldap32/parse.c | 14 ++--- reactos/dll/win32/wldap32/rename.c | 16 +++--- reactos/dll/win32/wldap32/search.c | 16 +++--- reactos/dll/win32/wldap32/value.c | 14 ++--- reactos/dll/win32/wldap32/wldap32.rc | 6 +-- reactos/dll/win32/wmi/wmi.rc | 2 - reactos/dll/win32/ws2_32/include/handle.h | 2 +- reactos/dll/win32/ws2_32/include/ws2_32.h | 14 ++--- reactos/dll/win32/ws2_32/misc/async.c | 22 ++++---- reactos/dll/win32/ws2_32/ws2_32.rc | 2 - reactos/dll/win32/ws2_32_new/CMakeLists.txt | 2 +- reactos/dll/win32/ws2_32_new/inc/ws2_32.h | 14 +++-- reactos/dll/win32/ws2_32_new/src/addrconv.c | 2 +- reactos/dll/win32/ws2_32_new/src/addrinfo.c | 2 +- reactos/dll/win32/ws2_32_new/src/async.c | 2 +- reactos/dll/win32/ws2_32_new/src/bhook.c | 2 +- reactos/dll/win32/ws2_32_new/src/dcatalog.c | 2 +- reactos/dll/win32/ws2_32_new/src/dcatitem.c | 2 +- reactos/dll/win32/ws2_32_new/src/dllmain.c | 2 +- reactos/dll/win32/ws2_32_new/src/dprocess.c | 2 +- reactos/dll/win32/ws2_32_new/src/dprovide.c | 2 +- reactos/dll/win32/ws2_32_new/src/dsocket.c | 2 +- reactos/dll/win32/ws2_32_new/src/dthread.c | 2 +- reactos/dll/win32/ws2_32_new/src/dupsock.c | 2 +- reactos/dll/win32/ws2_32_new/src/enumprot.c | 2 +- reactos/dll/win32/ws2_32_new/src/event.c | 2 +- reactos/dll/win32/ws2_32_new/src/getproto.c | 2 +- reactos/dll/win32/ws2_32_new/src/getxbyxx.c | 2 +- reactos/dll/win32/ws2_32_new/src/ioctl.c | 2 +- reactos/dll/win32/ws2_32_new/src/nscatalo.c | 2 +- reactos/dll/win32/ws2_32_new/src/nscatent.c | 2 +- reactos/dll/win32/ws2_32_new/src/nspinstl.c | 2 +- reactos/dll/win32/ws2_32_new/src/nsprovid.c | 2 +- reactos/dll/win32/ws2_32_new/src/nsquery.c | 2 +- reactos/dll/win32/ws2_32_new/src/qos.c | 2 +- reactos/dll/win32/ws2_32_new/src/qshelpr.c | 2 +- reactos/dll/win32/ws2_32_new/src/rasdial.c | 2 +- reactos/dll/win32/ws2_32_new/src/recv.c | 2 +- reactos/dll/win32/ws2_32_new/src/rnr.c | 2 +- reactos/dll/win32/ws2_32_new/src/scihlpr.c | 2 +- reactos/dll/win32/ws2_32_new/src/select.c | 2 +- reactos/dll/win32/ws2_32_new/src/send.c | 2 +- reactos/dll/win32/ws2_32_new/src/sockctrl.c | 2 +- reactos/dll/win32/ws2_32_new/src/socklife.c | 2 +- reactos/dll/win32/ws2_32_new/src/spinstal.c | 2 +- reactos/dll/win32/ws2_32_new/src/sputil.c | 2 +- reactos/dll/win32/ws2_32_new/src/startup.c | 2 +- reactos/dll/win32/ws2_32_new/src/wsautil.c | 2 +- reactos/dll/win32/ws2_32_new/ws2_32.rc | 2 - reactos/dll/win32/ws2help/precomp.h | 8 +++ reactos/dll/win32/ws2help/ws2help.rc | 2 - reactos/dll/win32/wshirda/wshirda.c | 3 +- reactos/dll/win32/wshirda/wshirda.h | 7 ++- reactos/dll/win32/wshirda/wshirda.rc | 2 - reactos/dll/win32/wshtcpip/wshtcpip.c | 2 +- reactos/dll/win32/wshtcpip/wshtcpip.h | 7 +++ reactos/dll/win32/wshtcpip/wshtcpip.rc | 2 - reactos/dll/win32/wsock32/stubs.c | 4 +- reactos/dll/win32/wsock32/wsock32.rc | 2 - reactos/dll/win32/wtsapi32/wtsapi32.c | 12 ++--- reactos/dll/win32/wuapi/downloader.c | 19 ++++--- reactos/dll/win32/wuapi/installer.c | 17 +++--- reactos/dll/win32/wuapi/main.c | 20 ++++--- reactos/dll/win32/wuapi/searcher.c | 17 +++--- reactos/dll/win32/wuapi/session.c | 17 +++--- reactos/dll/win32/wuapi/systeminfo.c | 17 +++--- reactos/dll/win32/wuapi/updates.c | 17 +++--- reactos/dll/win32/xinput1_1/xinput1_1_main.c | 6 +-- reactos/dll/win32/xinput1_2/xinput1_2_main.c | 6 +-- reactos/dll/win32/xinput1_3/xinput1_3_main.c | 18 +++---- .../dll/win32/xinput9_1_0/xinput9_1_0_main.c | 6 +-- reactos/dll/win32/xmllite/reader.c | 20 ++++--- reactos/dll/win32/xmllite/writer.c | 14 +++-- reactos/dll/win32/xmllite/xmllite_main.c | 8 +-- reactos/include/GL/gl.h | 3 +- reactos/include/psdk/mmreg.h | 4 +- reactos/include/psdk/mmsystem.h | 2 + .../include/reactos/libs/audiosrv/audiosrv.h | 2 +- reactos/include/reactos/libs/libtiff/tiffio.h | 4 +- .../lib/3rdparty/adns/adns_win32/adns_win32.h | 9 +++- reactos/lib/3rdparty/cardlib/cardbitmaps.cpp | 10 +++- reactos/lib/3rdparty/cardlib/cardbutton.cpp | 11 ++-- reactos/lib/3rdparty/cardlib/cardbutton.h | 2 +- reactos/lib/3rdparty/cardlib/cardcolor.cpp | 6 ++- reactos/lib/3rdparty/cardlib/cardcount.h | 10 +++- reactos/lib/3rdparty/cardlib/cardlib.cpp | 8 ++- reactos/lib/3rdparty/cardlib/cardlib.h | 4 +- reactos/lib/3rdparty/cardlib/cardregion.cpp | 11 ++-- reactos/lib/3rdparty/cardlib/cardregion.h | 2 +- reactos/lib/3rdparty/cardlib/cardrgndraw.cpp | 12 +++-- reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp | 12 +++-- reactos/lib/3rdparty/cardlib/cardstack.cpp | 6 ++- reactos/lib/3rdparty/cardlib/cardwindow.cpp | 18 ++++--- reactos/lib/3rdparty/cardlib/cardwindow.h | 2 +- reactos/lib/3rdparty/cardlib/dropzone.cpp | 9 ++-- reactos/lib/3rdparty/libxml2/config.h | 8 ++- reactos/lib/3rdparty/libxml2/nanohttp.c | 4 +- reactos/lib/3rdparty/libxml2/threads.c | 2 +- reactos/lib/3rdparty/libxml2/xmlIO.c | 3 +- reactos/lib/3rdparty/libxml2/xmlmodule.c | 2 +- reactos/lib/atl/atlbase.cpp | 2 - reactos/lib/atl/atlcore.cpp | 2 - reactos/lib/atl/atlcore.h | 12 ++++- reactos/lib/epsapi/enum/precomp.h | 2 - reactos/lib/fslib/ext2lib/Mke2fs.h | 2 - reactos/lib/fslib/ntfslib/ntfslib.h | 2 - reactos/lib/fslib/vfatlib/vfatlib.h | 6 ++- reactos/lib/fslib/vfatxlib/vfatxlib.h | 2 - reactos/lib/inflib/builddep.h | 4 +- reactos/lib/recyclebin/recyclebin.h | 10 +++- reactos/lib/rossym/init.c | 2 +- reactos/lib/rossym/initum.c | 4 +- reactos/lib/rtl/rtl.h | 9 +++- reactos/lib/sdk/crt/except/i386/unwind.c | 1 - .../crt/include/internal/mingw-w64/internal.h | 4 +- .../crt/include/internal/mingw-w64/oscalls.h | 6 ++- reactos/lib/sdk/crt/precomp.h | 5 +- reactos/lib/sdk/crt/startup/atonexit.c | 2 +- reactos/lib/sdk/crt/startup/crt0_c.c | 4 +- reactos/lib/sdk/crt/startup/crt0_w.c | 3 +- reactos/lib/sdk/crt/startup/crt_handler.c | 4 +- reactos/lib/sdk/crt/startup/crtdll.c | 2 +- reactos/lib/sdk/crt/startup/gccmain.c | 2 +- reactos/lib/sdk/crt/startup/gs_support.c | 5 +- reactos/lib/sdk/crt/startup/pesect.c | 5 +- reactos/lib/sdk/crt/startup/pseudo-reloc.c | 2 +- reactos/lib/sdk/crt/startup/tlsmthread.c | 5 +- reactos/lib/sdk/crt/startup/tlssup.c | 8 ++- reactos/lib/sdk/crt/startup/tlsthrd.c | 7 ++- reactos/lib/sdk/crt/string/mbstowcs_nt.c | 2 - reactos/lib/sdk/crt/string/wcstombs_nt.c | 2 - reactos/lib/sdk/delayimp/delayimp.c | 4 +- reactos/lib/sdk/nt/entry_point.c | 2 +- reactos/lib/sdk/scrnsave/scrnsave.c | 6 ++- reactos/lib/smlib/precomp.h | 3 +- reactos/subsystems/ntvdm/ntvdm.c | 8 ++- reactos/subsystems/win32/csrss/csrsrv/srv.h | 18 +++++-- reactos/subsystems/win32/csrss/csrss.c | 8 ++- .../win32/csrss/include/csrplugin.h | 1 - reactos/tools/widl/header.c | 4 ++ reactos/tools/widl/proxy.c | 8 ++- reactos/tools/widl/widl.c | 12 +++++ reactos/win32ss/gdi/gdi32/CMakeLists.txt | 2 +- reactos/win32ss/gdi/gdi32/include/precomp.h | 7 ++- reactos/win32ss/gdi/gdi32/main/dllmain.c | 2 +- reactos/win32ss/gdi/gdi32/misc/gdientry.c | 2 +- reactos/win32ss/gdi/gdi32/misc/heap.c | 2 +- reactos/win32ss/gdi/gdi32/misc/historic.c | 2 +- reactos/win32ss/gdi/gdi32/misc/misc.c | 2 +- reactos/win32ss/gdi/gdi32/misc/stubs.c | 2 +- reactos/win32ss/gdi/gdi32/misc/stubsa.c | 2 +- reactos/win32ss/gdi/gdi32/misc/stubsw.c | 2 +- reactos/win32ss/gdi/gdi32/misc/wingl.c | 2 +- reactos/win32ss/gdi/gdi32/objects/arc.c | 2 +- reactos/win32ss/gdi/gdi32/objects/bitmap.c | 2 +- reactos/win32ss/gdi/gdi32/objects/brush.c | 2 +- reactos/win32ss/gdi/gdi32/objects/coord.c | 2 +- reactos/win32ss/gdi/gdi32/objects/dc.c | 2 +- reactos/win32ss/gdi/gdi32/objects/efloat.c | 2 +- reactos/win32ss/gdi/gdi32/objects/eng.c | 2 +- reactos/win32ss/gdi/gdi32/objects/enhmfile.c | 2 +- reactos/win32ss/gdi/gdi32/objects/font.c | 2 +- reactos/win32ss/gdi/gdi32/objects/icm.c | 2 +- reactos/win32ss/gdi/gdi32/objects/linedda.c | 2 +- reactos/win32ss/gdi/gdi32/objects/metafile.c | 2 +- reactos/win32ss/gdi/gdi32/objects/painting.c | 2 +- reactos/win32ss/gdi/gdi32/objects/palette.c | 2 +- reactos/win32ss/gdi/gdi32/objects/path.c | 2 +- reactos/win32ss/gdi/gdi32/objects/pen.c | 2 +- reactos/win32ss/gdi/gdi32/objects/printdrv.c | 2 +- reactos/win32ss/gdi/gdi32/objects/region.c | 2 +- reactos/win32ss/gdi/gdi32/objects/text.c | 2 +- reactos/win32ss/gdi/gdi32/objects/utils.c | 2 +- reactos/win32ss/user/user32/controls/edit.c | 2 + reactos/win32ss/user/user32/include/user32.h | 13 ++++- reactos/win32ss/user/user32/user32.rc | 3 +- reactos/win32ss/user/user32/windows/spy.c | 1 + reactos/win32ss/user/win32csr/rsrc.rc | 3 -- reactos/win32ss/user/win32csr/w32csr.h | 18 ++++++- reactos/win32ss/user/win32csr/win32csr.h | 3 +- reactos/win32ss/user/win32csr/win32csr.rc | 4 +- 2243 files changed, 12671 insertions(+), 9977 deletions(-) diff --git a/reactos/base/applications/atactl/atactl.cpp b/reactos/base/applications/atactl/atactl.cpp index c4cb428beab..0b0ca2f0f33 100644 --- a/reactos/base/applications/atactl/atactl.cpp +++ b/reactos/base/applications/atactl/atactl.cpp @@ -1,6 +1,9 @@ -#include +#include +#include +#include +#include #include -#include +#include //#include //#include #include diff --git a/reactos/base/applications/cacls/cacls.c b/reactos/base/applications/cacls/cacls.c index 0ad9789862a..4754d53ef1b 100644 --- a/reactos/base/applications/cacls/cacls.c +++ b/reactos/base/applications/cacls/cacls.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" static GENERIC_MAPPING FileGenericMapping = { diff --git a/reactos/base/applications/cacls/cacls.rc b/reactos/base/applications/cacls/cacls.rc index 84f0c2d32bf..bb4a46a8d56 100644 --- a/reactos/base/applications/cacls/cacls.rc +++ b/reactos/base/applications/cacls/cacls.rc @@ -1,4 +1,4 @@ -#include +#include #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control ACLs Program\0" diff --git a/reactos/base/applications/cacls/precomp.h b/reactos/base/applications/cacls/precomp.h index a005182de67..3337cc4d5e1 100644 --- a/reactos/base/applications/cacls/precomp.h +++ b/reactos/base/applications/cacls/precomp.h @@ -1,10 +1,13 @@ #ifndef _CACLS_PRECOMP_H #define _CACLS_PRECOMP_H -#include +#include +#include +#include +#include #include #include -#include + #include "resource.h" #endif /* _CACLS_PRECOMP_H */ diff --git a/reactos/base/applications/calc/calc.h b/reactos/base/applications/calc/calc.h index 3b36230b62a..8b0c0c39268 100644 --- a/reactos/base/applications/calc/calc.h +++ b/reactos/base/applications/calc/calc.h @@ -1,8 +1,12 @@ - -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +//#include +//#include #include #include #include diff --git a/reactos/base/applications/calc/resource.h b/reactos/base/applications/calc/resource.h index 8039671361e..e4ae9cd0165 100644 --- a/reactos/base/applications/calc/resource.h +++ b/reactos/base/applications/calc/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_STRING_LICENSE 1 #define IDS_MATH_ERROR 2 #define IDS_QUICKHELP 3 @@ -376,4 +378,3 @@ #define IDM_VIEW_BYTE 40018 #define IDM_VIEW_DWORD 40019 #define IDM_VIEW_CONVERSION 40020 - diff --git a/reactos/base/applications/calc/resource.rc b/reactos/base/applications/calc/resource.rc index ae7b1ea73e3..39b842e7423 100644 --- a/reactos/base/applications/calc/resource.rc +++ b/reactos/base/applications/calc/resource.rc @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include +#include #include "resource.h" diff --git a/reactos/base/applications/charmap/charmap.rc b/reactos/base/applications/charmap/charmap.rc index d6155095b4f..67d878a6b77 100644 --- a/reactos/base/applications/charmap/charmap.rc +++ b/reactos/base/applications/charmap/charmap.rc @@ -1,6 +1,8 @@ -#include -#include +#include +#include +//#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h index c2779ccec54..8ed87cd7f6f 100644 --- a/reactos/base/applications/charmap/precomp.h +++ b/reactos/base/applications/charmap/precomp.h @@ -1,14 +1,19 @@ #ifndef __CHARMAP_PRECOMP_H #define __CHARMAP_PRECOMP_H -#define WIN32_LEAN_AND_MEAN -#include +#include +#include +#include +#include +#include +#include #include #include -#include +//#include #include #include #include + #include "resource.h" #define SIZEOF(_v) (sizeof(_v) / sizeof(*_v)) diff --git a/reactos/base/applications/charmap/resource.h b/reactos/base/applications/charmap/resource.h index 07828054f69..8a90f44e520 100644 --- a/reactos/base/applications/charmap/resource.h +++ b/reactos/base/applications/charmap/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_STATIC -1 #define IDI_ICON 100 diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c index 372e84780fa..8699db6dfcd 100644 --- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c +++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c @@ -8,9 +8,11 @@ * Christoph von Wittich (Christoph_vW@ReactOS.org) */ -#include +#include +#include +#include #include -#include +//#include #include int _tmain(int argc, TCHAR ** argv) diff --git a/reactos/base/applications/cmdutils/doskey/doskey.c b/reactos/base/applications/cmdutils/doskey/doskey.c index b22cdd883ed..6960d2de2d3 100644 --- a/reactos/base/applications/cmdutils/doskey/doskey.c +++ b/reactos/base/applications/cmdutils/doskey/doskey.c @@ -1,8 +1,13 @@ -#include +#include +#include +#include +#include +#include #include #include #include #include + #include "doskey.h" #define MAX_STRING 2000 diff --git a/reactos/base/applications/cmdutils/doskey/doskey.h b/reactos/base/applications/cmdutils/doskey/doskey.h index 85a8b2f0624..06ea80a10fc 100644 --- a/reactos/base/applications/cmdutils/doskey/doskey.h +++ b/reactos/base/applications/cmdutils/doskey/doskey.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_HELP 0 #define IDS_INVALID_MACRO_DEF 1 diff --git a/reactos/base/applications/cmdutils/doskey/doskey.rc b/reactos/base/applications/cmdutils/doskey/doskey.rc index f6a7c6be214..ca48da26319 100644 --- a/reactos/base/applications/cmdutils/doskey/doskey.rc +++ b/reactos/base/applications/cmdutils/doskey/doskey.rc @@ -1,4 +1,5 @@ -#include +#include + #include "doskey.h" #define REACTOS_STR_FILE_DESCRIPTION "W32 doskey command\0" diff --git a/reactos/base/applications/cmdutils/find/find.c b/reactos/base/applications/cmdutils/find/find.c index 7b9ade46c92..55118d3279d 100644 --- a/reactos/base/applications/cmdutils/find/find.c +++ b/reactos/base/applications/cmdutils/find/find.c @@ -27,20 +27,21 @@ #include #include -#include -#include -#include +//#include +//#include -#include +#include +#include +#include + +//#include #include #include "resource.h" - /* Symbol definition */ #define MAX_STR 1024 - /* This function prints out all lines containing a substring. There are some * conditions that may be passed to the function. * @@ -251,5 +252,3 @@ main (int argc, char **argv) */ exit ( (ret ? 0 : 1) ); } - - diff --git a/reactos/base/applications/cmdutils/find/find.rc b/reactos/base/applications/cmdutils/find/find.rc index 35e38dedf9b..f11d216ddc8 100644 --- a/reactos/base/applications/cmdutils/find/find.rc +++ b/reactos/base/applications/cmdutils/find/find.rc @@ -1,3 +1,7 @@ +#include + +#include "resource.h" + #define REACTOS_STR_FILE_DESCRIPTION "W32 find command\0" #define REACTOS_STR_INTERNAL_NAME "find\0" #define REACTOS_STR_ORIGINAL_FILENAME "find.exe\0" diff --git a/reactos/base/applications/cmdutils/find/resource.h b/reactos/base/applications/cmdutils/find/resource.h index 444cd8cc457..4ba5689b66e 100644 --- a/reactos/base/applications/cmdutils/find/resource.h +++ b/reactos/base/applications/cmdutils/find/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 1000 #define IDS_NO_SUCH_FILE 1001 #define IDS_CANNOT_OPEN 1002 diff --git a/reactos/base/applications/cmdutils/find/rsrc.rc b/reactos/base/applications/cmdutils/find/rsrc.rc index d2d297f42ae..745747c127a 100644 --- a/reactos/base/applications/cmdutils/find/rsrc.rc +++ b/reactos/base/applications/cmdutils/find/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/base/applications/cmdutils/hostname/hostname.c b/reactos/base/applications/cmdutils/hostname/hostname.c index 949cb8d5db4..08f754ba943 100644 --- a/reactos/base/applications/cmdutils/hostname/hostname.c +++ b/reactos/base/applications/cmdutils/hostname/hostname.c @@ -23,10 +23,13 @@ * FILE : subsys/system/hostname/hostname.c * PROGRAMMER: Emanuele Aliberti (ea@reactos.com) */ -#include + #include #include -#include +//#include + +#include +#include int main (int argc, char ** argv) { diff --git a/reactos/base/applications/cmdutils/lodctr/lodctr_main.c b/reactos/base/applications/cmdutils/lodctr/lodctr_main.c index de5d242b4d9..610f5fc6205 100644 --- a/reactos/base/applications/cmdutils/lodctr/lodctr_main.c +++ b/reactos/base/applications/cmdutils/lodctr/lodctr_main.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include +#include +#include #include int wmain(int argc, WCHAR *argv[]) diff --git a/reactos/base/applications/cmdutils/more/more.c b/reactos/base/applications/cmdutils/more/more.c index d1f3b3c9a55..46ecdc5bfdc 100644 --- a/reactos/base/applications/cmdutils/more/more.c +++ b/reactos/base/applications/cmdutils/more/more.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * MORE.C - external command. * * clone from 4nt more command @@ -10,10 +9,15 @@ * use window size instead of buffer size. */ -#include +#include #include #include -#include + +#include +#include +#include +#include + #include "resource.h" static TCHAR szCont[128]; diff --git a/reactos/base/applications/cmdutils/more/more.rc b/reactos/base/applications/cmdutils/more/more.rc index b8491dc8c2a..bef74a14dbd 100644 --- a/reactos/base/applications/cmdutils/more/more.rc +++ b/reactos/base/applications/cmdutils/more/more.rc @@ -1,4 +1,4 @@ -#include +#include #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "W32 more command\0" diff --git a/reactos/base/applications/cmdutils/reg/reg.c b/reactos/base/applications/cmdutils/reg/reg.c index f65a3c8bc93..8e948672603 100644 --- a/reactos/base/applications/cmdutils/reg/reg.c +++ b/reactos/base/applications/cmdutils/reg/reg.c @@ -16,8 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include +#include +#include +#include +#include +#include #include + #include "reg.h" static int reg_printfW(const WCHAR *msg, ...) diff --git a/reactos/base/applications/cmdutils/reg/reg.h b/reactos/base/applications/cmdutils/reg/reg.h index 2221647168c..a321efa23db 100644 --- a/reactos/base/applications/cmdutils/reg/reg.h +++ b/reactos/base/applications/cmdutils/reg/reg.h @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#pragma once + +//#include /* Translation IDs. */ #define STRING_USAGE 101 diff --git a/reactos/base/applications/cmdutils/reg/reg.rc b/reactos/base/applications/cmdutils/reg/reg.rc index 0ba9b4d1d52..da1a1e4f2f2 100644 --- a/reactos/base/applications/cmdutils/reg/reg.rc +++ b/reactos/base/applications/cmdutils/reg/reg.rc @@ -1,6 +1,7 @@ -#include -#include -#include "reg.h" +#include +//#include + +//#include "reg.h" /* Define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/cmdutils/reg/rsrc.rc b/reactos/base/applications/cmdutils/reg/rsrc.rc index c8d3f846131..1543c1d9881 100644 --- a/reactos/base/applications/cmdutils/reg/rsrc.rc +++ b/reactos/base/applications/cmdutils/reg/rsrc.rc @@ -1,7 +1,3 @@ -#include -#include "reg.h" - -/* Include localised resources */ // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.c b/reactos/base/applications/cmdutils/xcopy/xcopy.c index 03eb8996936..8f02fbdbf3c 100644 --- a/reactos/base/applications/cmdutils/xcopy/xcopy.c +++ b/reactos/base/applications/cmdutils/xcopy/xcopy.c @@ -39,11 +39,19 @@ * 5 - Disk write error */ - #include -#include +#include +//#include +//#include + +#include +#include +#include +#include +#include #include -#include +//#include + #include "xcopy.h" WINE_DEFAULT_DEBUG_CHANNEL(xcopy); diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.h b/reactos/base/applications/cmdutils/xcopy/xcopy.h index 3e9644efe8c..d18f52ca66a 100644 --- a/reactos/base/applications/cmdutils/xcopy/xcopy.h +++ b/reactos/base/applications/cmdutils/xcopy/xcopy.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #include /* Local #defines */ diff --git a/reactos/base/applications/control/control.h b/reactos/base/applications/control/control.h index c6ed9c5724b..e82432bbf5b 100644 --- a/reactos/base/applications/control/control.h +++ b/reactos/base/applications/control/control.h @@ -6,8 +6,13 @@ * Colin Finck (mail@colinfinck.de) */ -#include #include +#include +#include +#include +#include +#include + #include "resource.h" #define CCH_UINT_MAX 11 diff --git a/reactos/base/applications/control/resource.h b/reactos/base/applications/control/resource.h index f6faa82d762..56f98e7d9a9 100644 --- a/reactos/base/applications/control/resource.h +++ b/reactos/base/applications/control/resource.h @@ -1 +1,3 @@ +#pragma once + #define IDI_MAINICON 100 diff --git a/reactos/base/applications/dxdiag/d3dtest7.c b/reactos/base/applications/dxdiag/d3dtest7.c index 5e8597029fc..3d61fd93c04 100644 --- a/reactos/base/applications/dxdiag/d3dtest7.c +++ b/reactos/base/applications/dxdiag/d3dtest7.c @@ -7,7 +7,7 @@ */ #include "precomp.h" -#include +//#include BOOL D3D7Test(HWND hWnd) { diff --git a/reactos/base/applications/dxdiag/d3dtest8.c b/reactos/base/applications/dxdiag/d3dtest8.c index 4a3dd05e106..def8200b4b0 100644 --- a/reactos/base/applications/dxdiag/d3dtest8.c +++ b/reactos/base/applications/dxdiag/d3dtest8.c @@ -7,7 +7,7 @@ */ #include "precomp.h" -#include +//#include BOOL D3D8Test(HWND hWnd) { diff --git a/reactos/base/applications/dxdiag/d3dtest9.c b/reactos/base/applications/dxdiag/d3dtest9.c index 770965dcd3b..c5c2cc994e6 100644 --- a/reactos/base/applications/dxdiag/d3dtest9.c +++ b/reactos/base/applications/dxdiag/d3dtest9.c @@ -7,7 +7,7 @@ */ #include "precomp.h" -#include +//#include BOOL D3D9Test(HWND hWnd) { diff --git a/reactos/base/applications/dxdiag/dxdiag.rc b/reactos/base/applications/dxdiag/dxdiag.rc index f82fd2375c4..ffb50053672 100644 --- a/reactos/base/applications/dxdiag/dxdiag.rc +++ b/reactos/base/applications/dxdiag/dxdiag.rc @@ -1,4 +1,5 @@ -#include +#include +#include #include #include "resource.h" diff --git a/reactos/base/applications/dxdiag/precomp.h b/reactos/base/applications/dxdiag/precomp.h index cbb999b1c18..35d0cb24d0c 100644 --- a/reactos/base/applications/dxdiag/precomp.h +++ b/reactos/base/applications/dxdiag/precomp.h @@ -6,18 +6,26 @@ #define D3D_OVERLOADS #include -#include -#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include #include -#include -#include -#include + #include "resource.h" typedef struct diff --git a/reactos/base/applications/extrac32/extrac32.c b/reactos/base/applications/extrac32/extrac32.c index fc1ae1c94ae..53f503259d0 100644 --- a/reactos/base/applications/extrac32/extrac32.c +++ b/reactos/base/applications/extrac32/extrac32.c @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN #include #include #include #include - -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(extrac32); diff --git a/reactos/base/applications/findstr/findstr.c b/reactos/base/applications/findstr/findstr.c index 681bff7ee53..0e726351bb2 100644 --- a/reactos/base/applications/findstr/findstr.c +++ b/reactos/base/applications/findstr/findstr.c @@ -27,16 +27,16 @@ #include #include -#include -#include -#include - -#include +//#include +//#include +#include +#include +#include +//#include #include #include "resource.h" - /* Symbol definition */ #define MAX_STR 1024 diff --git a/reactos/base/applications/findstr/findstr.rc b/reactos/base/applications/findstr/findstr.rc index 8d50fbaa345..52a4ae86522 100644 --- a/reactos/base/applications/findstr/findstr.rc +++ b/reactos/base/applications/findstr/findstr.rc @@ -1,3 +1,7 @@ +#include + +#include "resource.h" + #define REACTOS_STR_FILE_DESCRIPTION "W32 findstr command\0" #define REACTOS_STR_INTERNAL_NAME "findstr\0" #define REACTOS_STR_ORIGINAL_FILENAME "findstr.exe\0" diff --git a/reactos/base/applications/findstr/resource.h b/reactos/base/applications/findstr/resource.h index 444cd8cc457..4ba5689b66e 100644 --- a/reactos/base/applications/findstr/resource.h +++ b/reactos/base/applications/findstr/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 1000 #define IDS_NO_SUCH_FILE 1001 #define IDS_CANNOT_OPEN 1002 diff --git a/reactos/base/applications/findstr/rsrc.rc b/reactos/base/applications/findstr/rsrc.rc index 9adbb55304a..e162c357bcb 100644 --- a/reactos/base/applications/findstr/rsrc.rc +++ b/reactos/base/applications/findstr/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/base/applications/fontview/display.c b/reactos/base/applications/fontview/display.c index 25c404334fc..924d6106b5b 100644 --- a/reactos/base/applications/fontview/display.c +++ b/reactos/base/applications/fontview/display.c @@ -20,9 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include - #include "display.h" #define SPACING1 8 diff --git a/reactos/base/applications/fontview/display.h b/reactos/base/applications/fontview/display.h index 37b0fc01056..4a13f8199ff 100644 --- a/reactos/base/applications/fontview/display.h +++ b/reactos/base/applications/fontview/display.h @@ -1,5 +1,13 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include + /* Messages for the display class */ #define FVM_SETTYPEFACE WM_USER #define FVM_SETSTRING (WM_USER + 1) diff --git a/reactos/base/applications/fontview/fontview.h b/reactos/base/applications/fontview/fontview.h index 4085d15cb99..9dd5ac7dc17 100644 --- a/reactos/base/applications/fontview/fontview.h +++ b/reactos/base/applications/fontview/fontview.h @@ -1,4 +1,7 @@ -#include +#include +#include +#include +#include #include "resource.h" #include "display.h" diff --git a/reactos/base/applications/fontview/fontview.rc b/reactos/base/applications/fontview/fontview.rc index d358c89ba15..797e3cef18e 100644 --- a/reactos/base/applications/fontview/fontview.rc +++ b/reactos/base/applications/fontview/fontview.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/fontview/resource.h b/reactos/base/applications/fontview/resource.h index 47d4ca25fcc..fa42675b115 100644 --- a/reactos/base/applications/fontview/resource.h +++ b/reactos/base/applications/fontview/resource.h @@ -1,3 +1,4 @@ +#pragma once #define IDS_ERROR 100 #define IDS_ERROR_NOMEM 101 @@ -12,4 +13,3 @@ #define IDS_CHARSLOWER 700 #define IDS_CHARSUPPER 701 #define IDS_SPECIALCHARS 702 - diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h index 8ac199af752..1433e60e26b 100644 --- a/reactos/base/applications/games/solitaire/resource.h +++ b/reactos/base/applications/games/solitaire/resource.h @@ -1,3 +1,4 @@ +#pragma once /* Icon */ #define IDI_SOLITAIRE 100 diff --git a/reactos/base/applications/games/solitaire/rsrc.rc b/reactos/base/applications/games/solitaire/rsrc.rc index 054b51bd5b2..e82509fa55c 100644 --- a/reactos/base/applications/games/solitaire/rsrc.rc +++ b/reactos/base/applications/games/solitaire/rsrc.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/games/solitaire/solitaire.h b/reactos/base/applications/games/solitaire/solitaire.h index ddd00ad5bf3..afb44814914 100644 --- a/reactos/base/applications/games/solitaire/solitaire.h +++ b/reactos/base/applications/games/solitaire/solitaire.h @@ -1,11 +1,14 @@ - -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include #include -#include -#include +#include + #include "resource.h" -#include "cardlib.h" extern CardWindow SolWnd; extern TCHAR szAppName[]; diff --git a/reactos/base/applications/games/spider/resource.h b/reactos/base/applications/games/spider/resource.h index fd7056f14b5..26162f2ee6b 100644 --- a/reactos/base/applications/games/spider/resource.h +++ b/reactos/base/applications/games/spider/resource.h @@ -1,3 +1,5 @@ +#pragma once + /* Icon */ #define IDI_SPIDER 100 @@ -37,4 +39,3 @@ #define IDS_SPI_QUIT 1302 #define IDS_SPI_WIN 1303 #define IDS_SPI_DEAL 1304 - diff --git a/reactos/base/applications/games/spider/rsrc.rc b/reactos/base/applications/games/spider/rsrc.rc index 7dd6f343af3..f07991458fe 100644 --- a/reactos/base/applications/games/spider/rsrc.rc +++ b/reactos/base/applications/games/spider/rsrc.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/games/spider/spider.h b/reactos/base/applications/games/spider/spider.h index f71d6e384dc..a6bb2ac354a 100644 --- a/reactos/base/applications/games/spider/spider.h +++ b/reactos/base/applications/games/spider/spider.h @@ -1,12 +1,13 @@ - -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include #include -#include -#include -#include "resource.h" -#include "cardlib.h" +#include +#include "resource.h" #define DIFFICULTY_ONE_COLOR 1 #define DIFFICULTY_TWO_COLORS 2 diff --git a/reactos/base/applications/games/winmine/dialog.c b/reactos/base/applications/games/winmine/dialog.c index dc4ab349fd6..2e685336a5a 100644 --- a/reactos/base/applications/games/winmine/dialog.c +++ b/reactos/base/applications/games/winmine/dialog.c @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#include +#include -#include #include "main.h" #include "resource.h" diff --git a/reactos/base/applications/games/winmine/main.c b/reactos/base/applications/games/winmine/main.c index b25cb13a17f..9aa0dd25ca8 100644 --- a/reactos/base/applications/games/winmine/main.c +++ b/reactos/base/applications/games/winmine/main.c @@ -18,13 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include -#include #include #include + #include "main.h" #include "resource.h" diff --git a/reactos/base/applications/games/winmine/main.h b/reactos/base/applications/games/winmine/main.h index 396f19e0eb7..ae29dc23cf1 100644 --- a/reactos/base/applications/games/winmine/main.h +++ b/reactos/base/applications/games/winmine/main.h @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#pragma once + +#include #define BEGINNER_MINES 10 #define BEGINNER_COLS 9 diff --git a/reactos/base/applications/games/winmine/resource.h b/reactos/base/applications/games/winmine/resource.h index c3272a29d7d..719a97d3c0f 100644 --- a/reactos/base/applications/games/winmine/resource.h +++ b/reactos/base/applications/games/winmine/resource.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#pragma once #define ID_TIMER 1000 diff --git a/reactos/base/applications/games/winmine/rsrc.rc b/reactos/base/applications/games/winmine/rsrc.rc index 501f8e5fc0c..acfbcb3f369 100644 --- a/reactos/base/applications/games/winmine/rsrc.rc +++ b/reactos/base/applications/games/winmine/rsrc.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL diff --git a/reactos/base/applications/hh/hh.rc b/reactos/base/applications/hh/hh.rc index c85696c0970..5cbabc08d54 100644 --- a/reactos/base/applications/hh/hh.rc +++ b/reactos/base/applications/hh/hh.rc @@ -1,4 +1,4 @@ -#include +//#include #define REACTOS_STR_FILE_DESCRIPTION "ReactOS HTML Help Executable\0" #define REACTOS_STR_INTERNAL_NAME "hh\0" @@ -6,4 +6,3 @@ #include 2 ICON DISCARDABLE hh.ico - diff --git a/reactos/base/applications/hh/main.c b/reactos/base/applications/hh/main.c index c20d6d37df4..3d06156167b 100644 --- a/reactos/base/applications/hh/main.c +++ b/reactos/base/applications/hh/main.c @@ -1,4 +1,6 @@ -#include +#include +#include +#include typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline); diff --git a/reactos/base/applications/iexplore/main.c b/reactos/base/applications/iexplore/main.c index 0ecf0d94f7c..21f0c71897f 100644 --- a/reactos/base/applications/iexplore/main.c +++ b/reactos/base/applications/iexplore/main.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include extern DWORD WINAPI IEWinMain(LPSTR, int); diff --git a/reactos/base/applications/kbswitch/kbswitch.h b/reactos/base/applications/kbswitch/kbswitch.h index 53db33733e1..d50b1fdc5d1 100644 --- a/reactos/base/applications/kbswitch/kbswitch.h +++ b/reactos/base/applications/kbswitch/kbswitch.h @@ -1,7 +1,11 @@ -#include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include #include #include "resource.h" diff --git a/reactos/base/applications/kbswitch/kbswitch.rc b/reactos/base/applications/kbswitch/kbswitch.rc index 8d45e25507f..5aaf77795d4 100644 --- a/reactos/base/applications/kbswitch/kbswitch.rc +++ b/reactos/base/applications/kbswitch/kbswitch.rc @@ -1,5 +1,6 @@ +#include + #include "resource.h" -#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/kbswitch/resource.h b/reactos/base/applications/kbswitch/resource.h index 460f6bd624b..2b2954d7441 100644 --- a/reactos/base/applications/kbswitch/resource.h +++ b/reactos/base/applications/kbswitch/resource.h @@ -1,3 +1,5 @@ +#pragma once + /* Icons */ #define IDI_MAIN 100 diff --git a/reactos/base/applications/logoff/logoff.rc b/reactos/base/applications/logoff/logoff.rc index 1ff19aa5ef8..fc5a5aa5faf 100644 --- a/reactos/base/applications/logoff/logoff.rc +++ b/reactos/base/applications/logoff/logoff.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logoff Utility\0" diff --git a/reactos/base/applications/logoff/precomp.h b/reactos/base/applications/logoff/precomp.h index 24e122baefc..3d287f86301 100644 --- a/reactos/base/applications/logoff/precomp.h +++ b/reactos/base/applications/logoff/precomp.h @@ -1,11 +1,16 @@ #ifndef __SHUTDOWN_PRECOMP_H #define __SHUTDOWN_PRECOMP_H +#include +#include +#include +#include + #include -#include -#include +//#include #include -#include //shutdown codes +//#include //shutdown codes + #include "resource.h" // misc.c diff --git a/reactos/base/applications/logoff/resource.h b/reactos/base/applications/logoff/resource.h index a04334117e1..358d39f0acd 100644 --- a/reactos/base/applications/logoff/resource.h +++ b/reactos/base/applications/logoff/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 1000 #define IDS_LOGOFF_REMOTE 1001 #define IDS_LOGOFF_LOCAL 1002 diff --git a/reactos/base/applications/magnify/magnifier.h b/reactos/base/applications/magnify/magnifier.h index 1181c9c4882..6deb5c11dd1 100644 --- a/reactos/base/applications/magnify/magnifier.h +++ b/reactos/base/applications/magnify/magnifier.h @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -////////////////////////////////////////////////////////////////// - -#include -#include +#include +#include +#include +#include +#include +#include #include -#include + #include "resource.h" extern int iZoom; diff --git a/reactos/base/applications/magnify/magnify.rc b/reactos/base/applications/magnify/magnify.rc index f9f04ee5753..28d81b1826b 100644 --- a/reactos/base/applications/magnify/magnify.rc +++ b/reactos/base/applications/magnify/magnify.rc @@ -1,5 +1,7 @@ +#include +#include -#include "magnifier.h" +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/magnify/resource.h b/reactos/base/applications/magnify/resource.h index 4e640ce4f8a..2097dc4a7f2 100644 --- a/reactos/base/applications/magnify/resource.h +++ b/reactos/base/applications/magnify/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_STATIC -1 #define IDI_ICON 101 diff --git a/reactos/base/applications/magnify/rsrc.rc b/reactos/base/applications/magnify/rsrc.rc index ae68d0a985b..fa009b52be7 100644 --- a/reactos/base/applications/magnify/rsrc.rc +++ b/reactos/base/applications/magnify/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) diff --git a/reactos/base/applications/mmc/mmc.rc b/reactos/base/applications/mmc/mmc.rc index 89eaea21fbf..7e240ca8fd0 100644 --- a/reactos/base/applications/mmc/mmc.rc +++ b/reactos/base/applications/mmc/mmc.rc @@ -1,6 +1,5 @@ -/* $Id: sndvol32.rc 23239 2006-07-23 09:59:30Z janderwald $ */ +#include -#include #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Management Console\0" diff --git a/reactos/base/applications/mmc/precomp.h b/reactos/base/applications/mmc/precomp.h index 7bc0abc0755..0d08e9fa1df 100644 --- a/reactos/base/applications/mmc/precomp.h +++ b/reactos/base/applications/mmc/precomp.h @@ -1,8 +1,10 @@ - -#include +#include +#include +#include +#include #include -#include #include + #include "resource.h" /* console.c */ diff --git a/reactos/base/applications/mmc/rsrc.rc b/reactos/base/applications/mmc/rsrc.rc index 4025359c64a..35e6cf55416 100644 --- a/reactos/base/applications/mmc/rsrc.rc +++ b/reactos/base/applications/mmc/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) diff --git a/reactos/base/applications/mplay32/mplay32.h b/reactos/base/applications/mplay32/mplay32.h index c6e5307faa5..2e5cc51327e 100644 --- a/reactos/base/applications/mplay32/mplay32.h +++ b/reactos/base/applications/mplay32/mplay32.h @@ -1,4 +1,11 @@ -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/reactos/base/applications/mplay32/mplay32.rc b/reactos/base/applications/mplay32/mplay32.rc index 9b4597a7ab2..ad14ef202e4 100644 --- a/reactos/base/applications/mplay32/mplay32.rc +++ b/reactos/base/applications/mplay32/mplay32.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Multimedia Player\0" diff --git a/reactos/base/applications/mplay32/rsrc.rc b/reactos/base/applications/mplay32/rsrc.rc index ecfcb5cad6a..1f05683a0cb 100644 --- a/reactos/base/applications/mplay32/rsrc.rc +++ b/reactos/base/applications/mplay32/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/base/applications/msconfig/freeldrpage.c b/reactos/base/applications/msconfig/freeldrpage.c index 4a681777be3..d1ed529d3fc 100644 --- a/reactos/base/applications/msconfig/freeldrpage.c +++ b/reactos/base/applications/msconfig/freeldrpage.c @@ -7,7 +7,7 @@ * 2011 Gregor Schneider */ -#include +#include "precomp.h" HWND hFreeLdrPage; HWND hFreeLdrDialog; diff --git a/reactos/base/applications/msconfig/generalpage.c b/reactos/base/applications/msconfig/generalpage.c index 6af48d7d5d0..468f68eee63 100644 --- a/reactos/base/applications/msconfig/generalpage.c +++ b/reactos/base/applications/msconfig/generalpage.c @@ -7,7 +7,7 @@ * */ -#include +#include "precomp.h" HWND hGeneralPage; HWND hGeneralDialog; diff --git a/reactos/base/applications/msconfig/msconfig.c b/reactos/base/applications/msconfig/msconfig.c index 7440d03f65c..ceb8249a1d8 100644 --- a/reactos/base/applications/msconfig/msconfig.c +++ b/reactos/base/applications/msconfig/msconfig.c @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich * */ -#include +#include "precomp.h" HINSTANCE hInst = 0; diff --git a/reactos/base/applications/msconfig/msconfig.h b/reactos/base/applications/msconfig/msconfig.h index 4a4554668a2..9acfadda02f 100644 --- a/reactos/base/applications/msconfig/msconfig.h +++ b/reactos/base/applications/msconfig/msconfig.h @@ -1,2 +1 @@ extern HINSTANCE hInst; - diff --git a/reactos/base/applications/msconfig/msconfig.rc b/reactos/base/applications/msconfig/msconfig.rc index c1485cc7b42..599fe3ce30e 100644 --- a/reactos/base/applications/msconfig/msconfig.rc +++ b/reactos/base/applications/msconfig/msconfig.rc @@ -1,9 +1,9 @@ -#include +#include +#include #include #include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL @@ -15,5 +15,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_APPICON ICON "res/msconfig.ico" #include "rsrc.rc" - - diff --git a/reactos/base/applications/msconfig/precomp.h b/reactos/base/applications/msconfig/precomp.h index 38e23f79e1c..7fb5e8582b6 100644 --- a/reactos/base/applications/msconfig/precomp.h +++ b/reactos/base/applications/msconfig/precomp.h @@ -1,7 +1,13 @@ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define NTOS_MODE_USER -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -18,5 +24,3 @@ #define MAX_KEY_LENGTH 255 #define MAX_VALUE_NAME 16383 - - diff --git a/reactos/base/applications/msconfig/resource.h b/reactos/base/applications/msconfig/resource.h index 744c7823eb6..b94e99492db 100644 --- a/reactos/base/applications/msconfig/resource.h +++ b/reactos/base/applications/msconfig/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDD_MSCONFIG_DIALOG 101 #define IDD_TOOLS_PAGE 102 #define IDD_SERVICES_PAGE 103 diff --git a/reactos/base/applications/msconfig/rsrc.rc b/reactos/base/applications/msconfig/rsrc.rc index 96ea0cadf37..a32fd208184 100644 --- a/reactos/base/applications/msconfig/rsrc.rc +++ b/reactos/base/applications/msconfig/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - /* define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/msconfig/srvpage.c b/reactos/base/applications/msconfig/srvpage.c index 4b13ee3f0a7..dfd9ee47585 100644 --- a/reactos/base/applications/msconfig/srvpage.c +++ b/reactos/base/applications/msconfig/srvpage.c @@ -7,7 +7,7 @@ * */ -#include +#include "precomp.h" HWND hServicesPage; HWND hServicesListCtrl; diff --git a/reactos/base/applications/msconfig/startuppage.c b/reactos/base/applications/msconfig/startuppage.c index 8325e1c4232..557bd86c35e 100644 --- a/reactos/base/applications/msconfig/startuppage.c +++ b/reactos/base/applications/msconfig/startuppage.c @@ -7,7 +7,7 @@ * */ -#include +#include "precomp.h" HWND hStartupPage; HWND hStartupListCtrl; diff --git a/reactos/base/applications/msconfig/systempage.c b/reactos/base/applications/msconfig/systempage.c index 1cf17ab14c2..248edfbcea0 100644 --- a/reactos/base/applications/msconfig/systempage.c +++ b/reactos/base/applications/msconfig/systempage.c @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich * 2011 Gregor Schneider */ -#include +#include "precomp.h" HWND hSystemPage; HWND hSystemDialog; diff --git a/reactos/base/applications/msconfig/toolspage.c b/reactos/base/applications/msconfig/toolspage.c index 505eb96ea6c..ab84b34274a 100644 --- a/reactos/base/applications/msconfig/toolspage.c +++ b/reactos/base/applications/msconfig/toolspage.c @@ -7,7 +7,7 @@ * */ -#include +#include "precomp.h" HWND hToolsPage; HWND hToolsListCtrl; diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc index 7a2ef49eec2..4c763675edd 100644 --- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc +++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc @@ -1,5 +1,6 @@ -#include -#include +#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager\0" diff --git a/reactos/base/applications/mscutils/devmgmt/precomp.h b/reactos/base/applications/mscutils/devmgmt/precomp.h index 5a4a908a93d..0454af851d7 100644 --- a/reactos/base/applications/mscutils/devmgmt/precomp.h +++ b/reactos/base/applications/mscutils/devmgmt/precomp.h @@ -1,18 +1,20 @@ #ifndef __DEVMGMT_PRECOMP_H #define __DEVMGMT_PRECOMP_H -#define WIN32_LEAN_AND_MEAN -#include +#include +#include +#include +#include +#include +#include #include -#include #include #include #include -#include #include #include -#include #include + #include "resource.h" #ifdef _MSC_VER diff --git a/reactos/base/applications/mscutils/devmgmt/resource.h b/reactos/base/applications/mscutils/devmgmt/resource.h index 65b756ba8dd..d8749977c29 100644 --- a/reactos/base/applications/mscutils/devmgmt/resource.h +++ b/reactos/base/applications/mscutils/devmgmt/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_STATIC -1 #define IDI_MAIN_ICON 50 diff --git a/reactos/base/applications/mscutils/devmgmt/rsrc.rc b/reactos/base/applications/mscutils/devmgmt/rsrc.rc index d4d805d8fa2..4148809f4db 100644 --- a/reactos/base/applications/mscutils/devmgmt/rsrc.rc +++ b/reactos/base/applications/mscutils/devmgmt/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN_ICON ICON "res/computer.ico" diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.c b/reactos/base/applications/mscutils/eventvwr/eventvwr.c index 7fd0b8d7660..628eac0c505 100644 --- a/reactos/base/applications/mscutils/eventvwr/eventvwr.c +++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.c @@ -23,11 +23,16 @@ * PROGRAMMER: Marc Piulachs (marc.piulachs at codexchange [dot] net) */ -#include "eventvwr.h" -#include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" #if _MSC_VER #pragma warning(disable: 4996) /* 'strdup' was declared deprecated */ diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.rc b/reactos/base/applications/mscutils/eventvwr/eventvwr.rc index e1ec24d24fc..07357fad765 100644 --- a/reactos/base/applications/mscutils/eventvwr/eventvwr.rc +++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.rc @@ -1,7 +1,7 @@ -#include -#include -#include "resource.h" +#include +#include +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Event Log Viewer\0" #define REACTOS_STR_INTERNAL_NAME "eventvwr\0" @@ -9,5 +9,3 @@ #include #include "rsrc.rc" - - diff --git a/reactos/base/applications/mscutils/eventvwr/resource.h b/reactos/base/applications/mscutils/eventvwr/resource.h index 93f2a868264..f2a5a9ed8c4 100644 --- a/reactos/base/applications/mscutils/eventvwr/resource.h +++ b/reactos/base/applications/mscutils/eventvwr/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_MYICON 2 #define IDNEXT 3 #define IDD_EVENTVWR_DIALOG 102 @@ -66,4 +68,3 @@ #define IDS_NONE 320 #define IDS_NOT_AVAILABLE 321 - diff --git a/reactos/base/applications/mscutils/eventvwr/rsrc.rc b/reactos/base/applications/mscutils/eventvwr/rsrc.rc index 2902327ed35..91c07185c8e 100644 --- a/reactos/base/applications/mscutils/eventvwr/rsrc.rc +++ b/reactos/base/applications/mscutils/eventvwr/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Shared icons diff --git a/reactos/base/applications/mscutils/servman/control.c b/reactos/base/applications/mscutils/servman/control.c index d6fcbbacfcd..b90727ced5c 100644 --- a/reactos/base/applications/mscutils/servman/control.c +++ b/reactos/base/applications/mscutils/servman/control.c @@ -133,7 +133,6 @@ DoControl(PMAIN_WND_INFO Info, return bRet; } - BOOL DoPause(PMAIN_WND_INFO Info) { @@ -158,7 +157,6 @@ DoPause(PMAIN_WND_INFO Info) return bRet; } - BOOL DoResume(PMAIN_WND_INFO Info) { diff --git a/reactos/base/applications/mscutils/servman/create.c b/reactos/base/applications/mscutils/servman/create.c index 16c50141d9e..3f4ed747e15 100644 --- a/reactos/base/applications/mscutils/servman/create.c +++ b/reactos/base/applications/mscutils/servman/create.c @@ -80,7 +80,6 @@ DoCreate(PCREATE_DATA Data) return bRet; } - static LPTSTR GetStringFromDialog(PCREATE_DATA Data, UINT id) @@ -111,7 +110,6 @@ GetStringFromDialog(PCREATE_DATA Data, return lpString; } - static BOOL GetDataFromDialog(PCREATE_DATA Data) { @@ -163,7 +161,6 @@ FreeMemory(PCREATE_DATA Data) Data); } - INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, @@ -220,7 +217,6 @@ CreateHelpDialogProc(HWND hDlg, return FALSE; } - INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, diff --git a/reactos/base/applications/mscutils/servman/delete.c b/reactos/base/applications/mscutils/servman/delete.c index 8f6e27c9877..c17a49d7a47 100644 --- a/reactos/base/applications/mscutils/servman/delete.c +++ b/reactos/base/applications/mscutils/servman/delete.c @@ -55,7 +55,6 @@ DoDeleteService(PMAIN_WND_INFO Info, return bRet; } - INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, diff --git a/reactos/base/applications/mscutils/servman/dependencies_tv1.c b/reactos/base/applications/mscutils/servman/dependencies_tv1.c index c4753c18569..9c686e252b1 100644 --- a/reactos/base/applications/mscutils/servman/dependencies_tv1.c +++ b/reactos/base/applications/mscutils/servman/dependencies_tv1.c @@ -9,7 +9,6 @@ #include "precomp.h" - LPTSTR TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService) @@ -180,7 +179,6 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, } } - BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName) diff --git a/reactos/base/applications/mscutils/servman/dependencies_tv2.c b/reactos/base/applications/mscutils/servman/dependencies_tv2.c index 65a1e758528..d8ddc0e5783 100644 --- a/reactos/base/applications/mscutils/servman/dependencies_tv2.c +++ b/reactos/base/applications/mscutils/servman/dependencies_tv2.c @@ -9,7 +9,6 @@ #include "precomp.h" - BOOL TV2_HasDependantServices(LPWSTR lpServiceName) { @@ -50,7 +49,6 @@ TV2_HasDependantServices(LPWSTR lpServiceName) return bRet; } - LPENUM_SERVICE_STATUS TV2_GetDependants(LPWSTR lpServiceName, LPDWORD lpdwCount) @@ -117,7 +115,6 @@ TV2_GetDependants(LPWSTR lpServiceName, return lpDependencies; } - VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, diff --git a/reactos/base/applications/mscutils/servman/export.c b/reactos/base/applications/mscutils/servman/export.c index f2907d83a80..07bc857a76c 100644 --- a/reactos/base/applications/mscutils/servman/export.c +++ b/reactos/base/applications/mscutils/servman/export.c @@ -31,7 +31,6 @@ GetTextFromListView(PMAIN_WND_INFO Info, return NumChars; } - static BOOL SaveServicesToFile(PMAIN_WND_INFO Info, LPCTSTR pszFileName) @@ -95,7 +94,6 @@ SaveServicesToFile(PMAIN_WND_INFO Info, return bSuccess; } - VOID ExportFile(PMAIN_WND_INFO Info) { OPENFILENAME ofn; diff --git a/reactos/base/applications/mscutils/servman/listview.c b/reactos/base/applications/mscutils/servman/listview.c index 127d23eb867..14523d8f788 100644 --- a/reactos/base/applications/mscutils/servman/listview.c +++ b/reactos/base/applications/mscutils/servman/listview.c @@ -9,7 +9,6 @@ #include "precomp.h" - VOID SetListViewStyle(HWND hListView, DWORD View) @@ -24,7 +23,6 @@ SetListViewStyle(HWND hListView, } } - VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv) @@ -82,7 +80,6 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info, (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } - VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, @@ -227,7 +224,6 @@ ChangeListViewText(PMAIN_WND_INFO Info, } } - BOOL RefreshServiceList(PMAIN_WND_INFO Info) { @@ -281,7 +277,6 @@ RefreshServiceList(PMAIN_WND_INFO Info) return TRUE; } - static VOID InitListViewImage(PMAIN_WND_INFO Info) { @@ -338,7 +333,6 @@ InitListViewImage(PMAIN_WND_INFO Info) } } - BOOL CreateListView(PMAIN_WND_INFO Info) { diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h index bf4d63d5e0d..fa94a159387 100644 --- a/reactos/base/applications/mscutils/servman/precomp.h +++ b/reactos/base/applications/mscutils/servman/precomp.h @@ -1,13 +1,21 @@ #ifndef __SERVMAN_PRECOMP_H #define __SERVMAN_PRECOMP_H -//#define WIN32_LEAN_AND_MEAN -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include #include /* GET_X/Y_LPARAM */ -#include #include -#include +#include +#include #include + #include "resource.h" #ifdef _MSC_VER diff --git a/reactos/base/applications/mscutils/servman/propsheet.c b/reactos/base/applications/mscutils/servman/propsheet.c index 17193cb4899..2510599c106 100644 --- a/reactos/base/applications/mscutils/servman/propsheet.c +++ b/reactos/base/applications/mscutils/servman/propsheet.c @@ -9,7 +9,6 @@ #include "precomp.h" - static VOID InitPropSheetPage(PROPSHEETPAGE *psp, PSERVICEPROPSHEET dlgInfo, @@ -25,7 +24,6 @@ InitPropSheetPage(PROPSHEETPAGE *psp, psp->lParam = (LPARAM)dlgInfo; } - LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info) { @@ -69,4 +67,3 @@ OpenPropSheet(PMAIN_WND_INFO Info) return Ret; } - diff --git a/reactos/base/applications/mscutils/servman/propsheet_depends.c b/reactos/base/applications/mscutils/servman/propsheet_depends.c index fd5a5d3658d..01ebd0dca05 100644 --- a/reactos/base/applications/mscutils/servman/propsheet_depends.c +++ b/reactos/base/applications/mscutils/servman/propsheet_depends.c @@ -9,7 +9,6 @@ #include "precomp.h" - HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hParent, @@ -176,7 +175,6 @@ InitDependPage(PSERVICEPROPSHEET pDlgInfo) TV2_Initialize(pDlgInfo, pDlgInfo->pService->lpServiceName); } - /* * Dependancies Property dialog callback. * Controls messages to the Dependancies dialog diff --git a/reactos/base/applications/mscutils/servman/propsheet_general.c b/reactos/base/applications/mscutils/servman/propsheet_general.c index f03272f5da9..9c33a97171d 100644 --- a/reactos/base/applications/mscutils/servman/propsheet_general.c +++ b/reactos/base/applications/mscutils/servman/propsheet_general.c @@ -9,8 +9,6 @@ #include "precomp.h" - - static VOID SetButtonStates(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) @@ -55,7 +53,6 @@ SetButtonStates(PSERVICEPROPSHEET dlgInfo, SetMenuAndButtonStates(dlgInfo->Info); } - static VOID SetServiceStatusText(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) @@ -137,7 +134,6 @@ SetStartupType(LPTSTR lpServiceName, } } - /* * Populates the General Properties dialog with * the relevant service information @@ -206,7 +202,6 @@ InitGeneralPage(PSERVICEPROPSHEET dlgInfo, } } - VOID SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) @@ -250,7 +245,6 @@ SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, } } - static VOID OnStart(HWND hwndDlg, @@ -271,7 +265,6 @@ OnStart(HWND hwndDlg, } } - /* * General Property dialog callback. * Controls messages to the General dialog diff --git a/reactos/base/applications/mscutils/servman/query.c b/reactos/base/applications/mscutils/servman/query.c index a06ef58be22..69f0343ca0e 100644 --- a/reactos/base/applications/mscutils/servman/query.c +++ b/reactos/base/applications/mscutils/servman/query.c @@ -9,7 +9,6 @@ #include "precomp.h" - ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info) { @@ -26,7 +25,6 @@ GetSelectedService(PMAIN_WND_INFO Info) return (ENUM_SERVICE_STATUS_PROCESS *)lvItem.lParam; } - LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName) { @@ -80,7 +78,6 @@ GetServiceConfig(LPTSTR lpServiceName) return lpServiceConfig; } - BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPTSTR lpServiceName, @@ -134,7 +131,6 @@ SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, return bRet; } - LPTSTR GetServiceDescription(LPTSTR lpServiceName) { @@ -210,7 +206,6 @@ cleanup: return lpDescription; } - BOOL SetServiceDescription(LPTSTR lpServiceName, LPTSTR lpDescription) @@ -258,7 +253,6 @@ SetServiceDescription(LPTSTR lpServiceName, return bRet; } - BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices) @@ -335,7 +329,6 @@ GetServiceList(PMAIN_WND_INFO Info, return bRet; } - BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService) { diff --git a/reactos/base/applications/mscutils/servman/resource.h b/reactos/base/applications/mscutils/servman/resource.h index e8d3cb65645..41ff7c02d0a 100644 --- a/reactos/base/applications/mscutils/servman/resource.h +++ b/reactos/base/applications/mscutils/servman/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_STATIC -1 /* about box info */ diff --git a/reactos/base/applications/mscutils/servman/rsrc.rc b/reactos/base/applications/mscutils/servman/rsrc.rc index 2a18ee445c0..315d9b30e28 100644 --- a/reactos/base/applications/mscutils/servman/rsrc.rc +++ b/reactos/base/applications/mscutils/servman/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_SM_ICON ICON "res/system.ico" diff --git a/reactos/base/applications/mscutils/servman/servman.rc b/reactos/base/applications/mscutils/servman/servman.rc index 45e5b876698..c51f8601540 100644 --- a/reactos/base/applications/mscutils/servman/servman.rc +++ b/reactos/base/applications/mscutils/servman/servman.rc @@ -1,7 +1,8 @@ -#include +#include +#include #include -#include "resource.h" +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Service Manager\0" #define REACTOS_STR_INTERNAL_NAME "services\0" @@ -11,5 +12,3 @@ 1 24 DISCARDABLE "manifest.xml" #include "rsrc.rc" - - diff --git a/reactos/base/applications/mscutils/servman/start.c b/reactos/base/applications/mscutils/servman/start.c index abdecad430a..504483f7154 100644 --- a/reactos/base/applications/mscutils/servman/start.c +++ b/reactos/base/applications/mscutils/servman/start.c @@ -211,4 +211,3 @@ DoStart(PMAIN_WND_INFO Info, LPWSTR lpStartParams) return bRet; } - diff --git a/reactos/base/applications/mscutils/servman/stop.c b/reactos/base/applications/mscutils/servman/stop.c index da36ac536e1..980150958b6 100644 --- a/reactos/base/applications/mscutils/servman/stop.c +++ b/reactos/base/applications/mscutils/servman/stop.c @@ -9,7 +9,6 @@ #include "precomp.h" - static BOOL StopService(PMAIN_WND_INFO pInfo, LPWSTR lpServiceName, @@ -146,7 +145,6 @@ StopDependantServices(PMAIN_WND_INFO pInfo, return bRet; } - BOOL DoStop(PMAIN_WND_INFO pInfo) { diff --git a/reactos/base/applications/mscutils/servman/stop_dependencies.c b/reactos/base/applications/mscutils/servman/stop_dependencies.c index a29d43cb4de..941b0ad9c83 100644 --- a/reactos/base/applications/mscutils/servman/stop_dependencies.c +++ b/reactos/base/applications/mscutils/servman/stop_dependencies.c @@ -9,7 +9,6 @@ #include "precomp.h" - static LPWSTR AddServiceToList(LPWSTR *lpServiceList, LPWSTR lpServiceToAdd) @@ -134,7 +133,6 @@ GetListOfServicesToStop(LPWSTR lpServiceName) return NULL; } - static VOID AddServiceNamesToStop(HWND hServiceListBox, LPWSTR lpServiceList) @@ -258,7 +256,6 @@ DoInitDependsDialog(PMAIN_WND_INFO pInfo, return bRet; } - INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, diff --git a/reactos/base/applications/mspaint/globalvar.h b/reactos/base/applications/mspaint/globalvar.h index d716dd994f3..1c0c49bc176 100644 --- a/reactos/base/applications/mspaint/globalvar.h +++ b/reactos/base/applications/mspaint/globalvar.h @@ -8,8 +8,8 @@ /* INCLUDES *********************************************************/ -#include -#include "definitions.h" +//#include +//#include "definitions.h" /* VARIABLES declared in main.c *************************************/ diff --git a/reactos/base/applications/mspaint/precomp.h b/reactos/base/applications/mspaint/precomp.h index cce714ad707..7fce478ae92 100644 --- a/reactos/base/applications/mspaint/precomp.h +++ b/reactos/base/applications/mspaint/precomp.h @@ -1,9 +1,16 @@ - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include #include "definitions.h" #include "drawing.h" @@ -17,4 +24,4 @@ #include "selection.h" #include "sizebox.h" #include "dialogs.h" -#include "registry.h" \ No newline at end of file +#include "registry.h" diff --git a/reactos/base/applications/mspaint/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc index 4a752e020af..07a069d5d7d 100644 --- a/reactos/base/applications/mspaint/rsrc.rc +++ b/reactos/base/applications/mspaint/rsrc.rc @@ -8,7 +8,9 @@ /* INCLUDES *********************************************************/ -#include +#include +#include + #include "definitions.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Paint\0" diff --git a/reactos/base/applications/mstsc/bitmap.c b/reactos/base/applications/mstsc/bitmap.c index ebdc1e77fea..97dec34af41 100644 --- a/reactos/base/applications/mstsc/bitmap.c +++ b/reactos/base/applications/mstsc/bitmap.c @@ -28,7 +28,7 @@ /* indent is confused by this file */ /* *INDENT-OFF* */ -#include +#include "precomp.h" #define CVAL(p) (*(p++)) #ifdef NEED_ALIGN diff --git a/reactos/base/applications/mstsc/bsops.c b/reactos/base/applications/mstsc/bsops.c index 52050e563a7..8c222703579 100644 --- a/reactos/base/applications/mstsc/bsops.c +++ b/reactos/base/applications/mstsc/bsops.c @@ -21,7 +21,7 @@ //#include //#include //#include "bsops.h" -#include +#include "precomp.h" /* globals */ static char * g_bs = 0; @@ -836,4 +836,3 @@ bs_copy_box(char * dst, int x, int y, int cx, int cy, int line_size) } } } - diff --git a/reactos/base/applications/mstsc/cache.c b/reactos/base/applications/mstsc/cache.c index 6e47c96257b..47e74af47d0 100644 --- a/reactos/base/applications/mstsc/cache.c +++ b/reactos/base/applications/mstsc/cache.c @@ -19,7 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" /* BITMAP CACHE */ extern int g_pstcache_fd[]; diff --git a/reactos/base/applications/mstsc/channels.c b/reactos/base/applications/mstsc/channels.c index 31a8763c784..477cfc5d6b6 100644 --- a/reactos/base/applications/mstsc/channels.c +++ b/reactos/base/applications/mstsc/channels.c @@ -19,7 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" #define MAX_CHANNELS 6 #define CHANNEL_CHUNK_LENGTH 1600 diff --git a/reactos/base/applications/mstsc/connectdialog.c b/reactos/base/applications/mstsc/connectdialog.c index 755fa4fa942..a10716ad912 100644 --- a/reactos/base/applications/mstsc/connectdialog.c +++ b/reactos/base/applications/mstsc/connectdialog.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" #define MAX_KEY_NAME 255 diff --git a/reactos/base/applications/mstsc/iso.c b/reactos/base/applications/mstsc/iso.c index 0753be5bc58..2561792f773 100644 --- a/reactos/base/applications/mstsc/iso.c +++ b/reactos/base/applications/mstsc/iso.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" /* Send a self-contained ISO PDU */ static void diff --git a/reactos/base/applications/mstsc/licence.c b/reactos/base/applications/mstsc/licence.c index c816ef4b7c1..f753f9b1c64 100644 --- a/reactos/base/applications/mstsc/licence.c +++ b/reactos/base/applications/mstsc/licence.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" //#include void * diff --git a/reactos/base/applications/mstsc/mcs.c b/reactos/base/applications/mstsc/mcs.c index b235c65a483..ccd177f9546 100644 --- a/reactos/base/applications/mstsc/mcs.c +++ b/reactos/base/applications/mstsc/mcs.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" uint16 g_mcs_userid; extern VCHANNEL g_channels[]; diff --git a/reactos/base/applications/mstsc/mppc.c b/reactos/base/applications/mstsc/mppc.c index 7363f0f70dc..4ab91e7a2ee 100644 --- a/reactos/base/applications/mstsc/mppc.c +++ b/reactos/base/applications/mstsc/mppc.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" /* mppc decompression */ /* http://www.faqs.org/rfcs/rfc2118.html */ diff --git a/reactos/base/applications/mstsc/orders.c b/reactos/base/applications/mstsc/orders.c index 029dd5274c4..35919301361 100644 --- a/reactos/base/applications/mstsc/orders.c +++ b/reactos/base/applications/mstsc/orders.c @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include - +#include "precomp.h" extern uint8 *g_next_packet; static RDP_ORDER_STATE g_order_state; diff --git a/reactos/base/applications/mstsc/precomp.h b/reactos/base/applications/mstsc/precomp.h index e3efff16379..8f1601ce3c8 100644 --- a/reactos/base/applications/mstsc/precomp.h +++ b/reactos/base/applications/mstsc/precomp.h @@ -1,15 +1,22 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include #include + #include "uimain.h" #include "rdesktop.h" #include "bsops.h" #include "orders.h" #include "resource.h" -//#include - #ifndef __TODO_MSTSC_H #define __TODO_MSTSC_H @@ -101,5 +108,4 @@ BOOL SetIntegerToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, INT Value); BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue); VOID SaveAllSettings(PINFO pInfo); - #endif /* __TODO_MSTSC_H */ diff --git a/reactos/base/applications/mstsc/pstcache.c b/reactos/base/applications/mstsc/pstcache.c index c1b59ada15c..4db31ec1971 100644 --- a/reactos/base/applications/mstsc/pstcache.c +++ b/reactos/base/applications/mstsc/pstcache.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" #define MAX_CELL_SIZE 0x1000 /* pixels */ diff --git a/reactos/base/applications/mstsc/rdc.rc b/reactos/base/applications/mstsc/rdc.rc index f618084bf79..3d73a23b776 100644 --- a/reactos/base/applications/mstsc/rdc.rc +++ b/reactos/base/applications/mstsc/rdc.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Remote Desktop Client\0" diff --git a/reactos/base/applications/mstsc/rdesktop.h b/reactos/base/applications/mstsc/rdesktop.h index f61a94b14df..42f69f0b8c7 100644 --- a/reactos/base/applications/mstsc/rdesktop.h +++ b/reactos/base/applications/mstsc/rdesktop.h @@ -20,13 +20,9 @@ #pragma once -#include -#include -#include #ifdef _WIN32 -//#include /* winsock2.h first */ -#include -#include +#include /* winsock2.h first */ +#include #else /* WIN32 */ #include #include @@ -38,7 +34,7 @@ #include #endif /* HAVE_SYS_SELECT_H */ #endif /* WIN32 */ -#include /* PATH_MAX */ +//#include /* PATH_MAX */ #define VERSION "1.4.1" diff --git a/reactos/base/applications/mstsc/rdp.c b/reactos/base/applications/mstsc/rdp.c index 4f448a1f7c8..b64ce9c4643 100644 --- a/reactos/base/applications/mstsc/rdp.c +++ b/reactos/base/applications/mstsc/rdp.c @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include - +#include "precomp.h" extern uint16 g_mcs_userid; extern char g_username[]; diff --git a/reactos/base/applications/mstsc/rdp5.c b/reactos/base/applications/mstsc/rdp5.c index 5baa7f842d2..f6e04db4313 100644 --- a/reactos/base/applications/mstsc/rdp5.c +++ b/reactos/base/applications/mstsc/rdp5.c @@ -19,7 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" extern uint8 *g_next_packet; diff --git a/reactos/base/applications/mstsc/resource.h b/reactos/base/applications/mstsc/resource.h index a62ab5c68ed..fd5ef062e3f 100644 --- a/reactos/base/applications/mstsc/resource.h +++ b/reactos/base/applications/mstsc/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDC_STATIC -1 #define IDS_256COLORS 8 diff --git a/reactos/base/applications/mstsc/rsrc.rc b/reactos/base/applications/mstsc/rsrc.rc index 70c4e236aa8..6b800b9efa2 100644 --- a/reactos/base/applications/mstsc/rsrc.rc +++ b/reactos/base/applications/mstsc/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MSTSC ICON "res/mstsc.ico" diff --git a/reactos/base/applications/mstsc/secure.c b/reactos/base/applications/mstsc/secure.c index c58eb184fc1..04ae91b3bc5 100644 --- a/reactos/base/applications/mstsc/secure.c +++ b/reactos/base/applications/mstsc/secure.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" //#include //#include diff --git a/reactos/base/applications/mstsc/settings.c b/reactos/base/applications/mstsc/settings.c index 70ffa734a97..22b2d28c1a6 100644 --- a/reactos/base/applications/mstsc/settings.c +++ b/reactos/base/applications/mstsc/settings.c @@ -1,5 +1,5 @@ -#include +#include "precomp.h" /* update NUM_SETTINGS in precomp.h */ LPWSTR lpSettings[NUM_SETTINGS] = diff --git a/reactos/base/applications/mstsc/ssl_calls.c b/reactos/base/applications/mstsc/ssl_calls.c index 1b8b22c7342..61c1da9e973 100644 --- a/reactos/base/applications/mstsc/ssl_calls.c +++ b/reactos/base/applications/mstsc/ssl_calls.c @@ -20,7 +20,7 @@ */ -#include +#include "precomp.h" #define APP_CC diff --git a/reactos/base/applications/mstsc/tcp.c b/reactos/base/applications/mstsc/tcp.c index 98043dd62d1..2f8a135515b 100644 --- a/reactos/base/applications/mstsc/tcp.c +++ b/reactos/base/applications/mstsc/tcp.c @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#include +#include "precomp.h" #ifdef _WIN32 #define socklen_t int diff --git a/reactos/base/applications/mstsc/uimain.c b/reactos/base/applications/mstsc/uimain.c index 4b8afbe5ec5..c2b13864bd9 100644 --- a/reactos/base/applications/mstsc/uimain.c +++ b/reactos/base/applications/mstsc/uimain.c @@ -18,7 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" char g_username[256] = ""; char g_hostname[256] = ""; diff --git a/reactos/base/applications/mstsc/win32.c b/reactos/base/applications/mstsc/win32.c index 653ddbeb85a..18c8ed3ebe0 100644 --- a/reactos/base/applications/mstsc/win32.c +++ b/reactos/base/applications/mstsc/win32.c @@ -18,8 +18,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include /* winsock2.h first */ -#include +//#include /* winsock2.h first */ +#include "precomp.h" extern char g_username[]; extern char g_hostname[]; diff --git a/reactos/base/applications/network/arp/arp.c b/reactos/base/applications/network/arp/arp.c index 3014b5823e0..830a9be0cfc 100644 --- a/reactos/base/applications/network/arp/arp.c +++ b/reactos/base/applications/network/arp/arp.c @@ -28,13 +28,14 @@ * */ -#define WIN32_LEAN_AND_MEAN -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #include #include -#include -#include +#define _INC_WINDOWS #include #include @@ -47,7 +48,6 @@ const char SEPERATOR = '-'; int _CRT_glob = 0; // stop * from listing dir files in arp -d * - /* * function declerations */ @@ -58,7 +58,6 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); VOID Usage(VOID); - /* * convert error code into meaningful message */ @@ -94,8 +93,6 @@ DWORD DoFormatMessage(VOID) return 0; } - - /* * * Takes an ARP entry and prints the IP address, @@ -136,7 +133,6 @@ INT PrintEntries(PMIB_IPNETROW pIpAddRow) return EXIT_SUCCESS; } - /* * * Takes optional parameters of an internet address and interface address. @@ -253,7 +249,6 @@ cleanup: return EXIT_FAILURE; } - /* * * Takes an internet address, a MAC address and an optional interface @@ -394,7 +389,6 @@ cleanup: return EXIT_FAILURE; } - /* * * Takes an internet address and an optional interface address as @@ -510,8 +504,6 @@ cleanup: return EXIT_FAILURE; } - - /* * * print program usage to screen @@ -550,8 +542,6 @@ VOID Usage(VOID) " > arp -a .... Displays the arp table.\n\n")); } - - /* * * Program entry. diff --git a/reactos/base/applications/network/dwnl/dwnl.c b/reactos/base/applications/network/dwnl/dwnl.c index 087c3b32998..8d30828beeb 100644 --- a/reactos/base/applications/network/dwnl/dwnl.c +++ b/reactos/base/applications/network/dwnl/dwnl.c @@ -1,4 +1,3 @@ -#include #define COBJMACROS #include #include diff --git a/reactos/base/applications/network/finger/finger.rc b/reactos/base/applications/network/finger/finger.rc index b1250a44bd4..cf6b91cd0cb 100644 --- a/reactos/base/applications/network/finger/finger.rc +++ b/reactos/base/applications/network/finger/finger.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 finger\0" #define REACTOS_STR_INTERNAL_NAME "finger\0" #define REACTOS_STR_ORIGINAL_FILENAME "finger.exe\0" diff --git a/reactos/base/applications/network/finger/precomp.h b/reactos/base/applications/network/finger/precomp.h index 53de144bbed..a6a907d0996 100644 --- a/reactos/base/applications/network/finger/precomp.h +++ b/reactos/base/applications/network/finger/precomp.h @@ -1,19 +1,11 @@ - +#define WIN32_NO_STATUS +#include +#define _INC_WINDOWS #include -#include "err.h" -#include -#include #include #include -#include #include -#include -#ifdef __STDC__ -#include -#else -#include -#endif - -#include "various.h" +#include "err.h" #include "getopt.h" +#include "various.h" diff --git a/reactos/base/applications/network/ftp/ftp.rc b/reactos/base/applications/network/ftp/ftp.rc index 505a9fe9d25..06bcb6c1b02 100644 --- a/reactos/base/applications/network/ftp/ftp.rc +++ b/reactos/base/applications/network/ftp/ftp.rc @@ -1,5 +1,3 @@ -/* $Id: route.rc 11816 2004-11-26 06:51:47Z arty $ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 FTP Client\0" #define REACTOS_STR_INTERNAL_NAME "ftp\0" #define REACTOS_STR_ORIGINAL_FILENAME "ftp.exe\0" diff --git a/reactos/base/applications/network/ftp/ftp_var.h b/reactos/base/applications/network/ftp/ftp_var.h index 69bfcfe0484..a1db804b4b2 100644 --- a/reactos/base/applications/network/ftp/ftp_var.h +++ b/reactos/base/applications/network/ftp/ftp_var.h @@ -1,9 +1,10 @@ -#include -#include "fake.h" -#include "prototypes.h" +//#include #include #include +#include "fake.h" +#include "prototypes.h" + //typedef void (*Sig_t)(int); /* The following defines are from ftp.h and telnet.h from bsd.h */ diff --git a/reactos/base/applications/network/ftp/precomp.h b/reactos/base/applications/network/ftp/precomp.h index df38d0a10a4..fadeb09a4dc 100644 --- a/reactos/base/applications/network/ftp/precomp.h +++ b/reactos/base/applications/network/ftp/precomp.h @@ -1,6 +1,5 @@ - #include -#include +//#include #ifndef _WIN32 #include @@ -15,22 +14,23 @@ #include #include #else +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#define _INC_WINDOWS #include #endif #include -#include #include #include #include -#include -#include -#include +#include #include "ftp_var.h" #include "pathnames.h" -#include "prototypes.h" - -#include "fake.h" - -#include +//#include "prototypes.h" +//#include "fake.h" diff --git a/reactos/base/applications/network/ftp/prototypes.h b/reactos/base/applications/network/ftp/prototypes.h index fb00fdcb4ab..661118b79c5 100644 --- a/reactos/base/applications/network/ftp/prototypes.h +++ b/reactos/base/applications/network/ftp/prototypes.h @@ -1,3 +1,4 @@ +#pragma once int fgetcSocket(int s); const char *fputsSocket(const char *format, int s); diff --git a/reactos/base/applications/network/ipconfig/ipconfig.c b/reactos/base/applications/network/ipconfig/ipconfig.c index 2561b3601a9..43c73901eda 100644 --- a/reactos/base/applications/network/ipconfig/ipconfig.c +++ b/reactos/base/applications/network/ipconfig/ipconfig.c @@ -12,12 +12,16 @@ * allow globbing on adapter names */ -#define WIN32_LEAN_AND_MEAN -#include +#include +#include +#include +#include +#include #include #include #include #include + #include "resource.h" #define GUID_LEN 40 @@ -821,4 +825,3 @@ int main(int argc, char *argv[]) return 0; } - diff --git a/reactos/base/applications/network/ipconfig/ipconfig.rc b/reactos/base/applications/network/ipconfig/ipconfig.rc index f6d855206ec..61bd3168e1f 100644 --- a/reactos/base/applications/network/ipconfig/ipconfig.rc +++ b/reactos/base/applications/network/ipconfig/ipconfig.rc @@ -1,5 +1,5 @@ -#include -#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "IP Configuration utility\0" diff --git a/reactos/base/applications/network/ipconfig/resource.h b/reactos/base/applications/network/ipconfig/resource.h index d6a5c19d763..da49680fc48 100644 --- a/reactos/base/applications/network/ipconfig/resource.h +++ b/reactos/base/applications/network/ipconfig/resource.h @@ -1,3 +1,4 @@ +#pragma once #define IDS_USAGE 100 diff --git a/reactos/base/applications/network/net/cmdStop.c b/reactos/base/applications/network/net/cmdStop.c index 4c5801a7909..3f395219424 100644 --- a/reactos/base/applications/network/net/cmdStop.c +++ b/reactos/base/applications/network/net/cmdStop.c @@ -66,5 +66,3 @@ done: return nError; } - - diff --git a/reactos/base/applications/network/net/cmdstart.c b/reactos/base/applications/network/net/cmdstart.c index 2016bb7c609..adec439cee6 100644 --- a/reactos/base/applications/network/net/cmdstart.c +++ b/reactos/base/applications/network/net/cmdstart.c @@ -85,7 +85,6 @@ done: return nError; } - /* Start the service argv[2] */ static INT @@ -160,7 +159,6 @@ done: return nError; } - INT cmdStart(INT argc, WCHAR **argv) { diff --git a/reactos/base/applications/network/net/help.c b/reactos/base/applications/network/net/help.c index 5b9d0c521ef..4e33cc2b1bf 100644 --- a/reactos/base/applications/network/net/help.c +++ b/reactos/base/applications/network/net/help.c @@ -167,7 +167,6 @@ INT cmdHelp(INT argc, WCHAR **argv) return 0; } - VOID help(VOID) { puts("NET ACCOUNTS"); diff --git a/reactos/base/applications/network/net/main.c b/reactos/base/applications/network/net/main.c index 4fe37563cac..638a21f3d33 100644 --- a/reactos/base/applications/network/net/main.c +++ b/reactos/base/applications/network/net/main.c @@ -42,7 +42,6 @@ COMMAND cmds[] = }; - int wmain(int argc, WCHAR **argv) { PCOMMAND cmdptr; @@ -67,28 +66,8 @@ int wmain(int argc, WCHAR **argv) return 1; } - INT unimplemented(INT argc, WCHAR **argv) { puts("This command is not implemented yet"); return 1; } - - - - - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/network/net/net.h b/reactos/base/applications/network/net/net.h index 4120d9a90c1..f7c11239520 100644 --- a/reactos/base/applications/network/net/net.h +++ b/reactos/base/applications/network/net/net.h @@ -7,16 +7,15 @@ * PROGRAMMERS: Magnus Olsen (greatlord@reactos.org) */ -#include -#include -#include -#include +#include +#include +#include #include +#include VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); - INT cmdHelp(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); diff --git a/reactos/base/applications/network/netsh/netsh.c b/reactos/base/applications/network/netsh/netsh.c index 1ea3ecf231c..bf938698d3c 100644 --- a/reactos/base/applications/network/netsh/netsh.c +++ b/reactos/base/applications/network/netsh/netsh.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(netsh); diff --git a/reactos/base/applications/network/netstat/netstat.c b/reactos/base/applications/network/netstat/netstat.c index d491d081813..999b3018070 100644 --- a/reactos/base/applications/network/netstat/netstat.c +++ b/reactos/base/applications/network/netstat/netstat.c @@ -13,14 +13,18 @@ * command line parser needs more work */ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#define _INC_WINDOWS #include #include #include #include #include -#include "netstat.h" +#include "netstat.h" enum ProtoType {IP, TCP, UDP, ICMP} Protocol; DWORD Interval; /* time to pause between printing output */ @@ -42,7 +46,6 @@ TCHAR TcpState[][32] = { _T("DELETE_TCB") }; - /* * format message string and display output */ @@ -73,7 +76,6 @@ DWORD DoFormatMessage(DWORD ErrorCode) return 0; } - /* * * Parse command line parameters and set any options @@ -163,7 +165,6 @@ BOOL ParseCmdline(int argc, char* argv[]) return EXIT_SUCCESS; } - /* * Simulate Microsofts netstat utility output */ @@ -248,9 +249,6 @@ BOOL DisplayOutput() return EXIT_SUCCESS; } - - - VOID ShowIpStatistics() { PMIB_IPSTATS pIpStats; @@ -467,7 +465,6 @@ VOID ShowTcpTable() HeapFree(GetProcessHeap(), 0, tcpTable); } - VOID ShowUdpTable() { PMIB_UDPTABLE udpTable; @@ -511,7 +508,6 @@ VOID ShowUdpTable() HeapFree(GetProcessHeap(), 0, udpTable); } - /* * Translate port numbers into their text equivalent if there is one */ @@ -533,7 +529,6 @@ GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen) return Name; } - /* * convert addresses into dotted decimal or hostname */ @@ -607,8 +602,6 @@ VOID Usage() " print the current information only once.\n")); } - - /* * * Parse command line parameters and set any options diff --git a/reactos/base/applications/network/netstat/netstat.h b/reactos/base/applications/network/netstat/netstat.h index 43b48240475..3a5d820aec8 100644 --- a/reactos/base/applications/network/netstat/netstat.h +++ b/reactos/base/applications/network/netstat/netstat.h @@ -16,7 +16,6 @@ BOOL bDoShowProtoStats = FALSE; // -s BOOL bDoDispSeqComp = FALSE; // -v BOOL bLoopOutput = FALSE; // interval - /* Undocumented extended information structures available only on XP and higher */ typedef struct { DWORD dwState; // state of the connection @@ -43,7 +42,6 @@ typedef struct { MIB_UDPEXROW table; } MIB_UDPEXTABLE, *PMIB_UDPEXTABLE; - /* function declerations */ BOOL ParseCmdline(int argc, char* argv[]); BOOL DisplayOutput(VOID); @@ -58,4 +56,3 @@ VOID ShowUdpTable(VOID); PCHAR GetPortName(UINT Port, PCSTR Proto, CHAR Name[PORTNAMELEN], INT NameLen); PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen); VOID Usage(VOID); - diff --git a/reactos/base/applications/network/netstat/netstat.rc b/reactos/base/applications/network/netstat/netstat.rc index f544d0216df..bb9daa73e69 100644 --- a/reactos/base/applications/network/netstat/netstat.rc +++ b/reactos/base/applications/network/netstat/netstat.rc @@ -3,5 +3,3 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netstat.exe\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy@gmail.com)\0" #include - - diff --git a/reactos/base/applications/network/nslookup/nslookup.h b/reactos/base/applications/network/nslookup/nslookup.h index 06cd69cc7f5..242e9da2972 100644 --- a/reactos/base/applications/network/nslookup/nslookup.h +++ b/reactos/base/applications/network/nslookup/nslookup.h @@ -1,9 +1,11 @@ -#include -#include +#define WIN32_NO_STATUS +#include +#include +#include +#define _INC_WINDOWS #include #include #include -#include #include #define TypeA "A" diff --git a/reactos/base/applications/network/ping/ping.c b/reactos/base/applications/network/ping/ping.c index 7d04e83ed18..8aaf3b3776a 100644 --- a/reactos/base/applications/network/ping/ping.c +++ b/reactos/base/applications/network/ping/ping.c @@ -6,12 +6,18 @@ * PROGRAMMERS: */ -#include -#include -#include +#define WIN32_NO_STATUS #include -#include +#include +#include +#include +#include +#include +#define _INC_WINDOWS +#include #include +#include + #include "resource.h" #define NDEBUG diff --git a/reactos/base/applications/network/ping/ping.rc b/reactos/base/applications/network/ping/ping.rc index 6e2dab4b75c..04f89f257b7 100644 --- a/reactos/base/applications/network/ping/ping.rc +++ b/reactos/base/applications/network/ping/ping.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Ping\0" diff --git a/reactos/base/applications/network/ping/resource.h b/reactos/base/applications/network/ping/resource.h index c5733252ba0..8114c78e2ba 100644 --- a/reactos/base/applications/network/ping/resource.h +++ b/reactos/base/applications/network/ping/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 0 #define IDS_PING_WITH_BYTES 1 #define IDS_PING_STATISTICS 2 @@ -21,4 +23,3 @@ #define IDS_REQUEST_TIMEOUT 20 #define IDS_MS 21 #define IDS_1MS 22 - diff --git a/reactos/base/applications/network/route/route.c b/reactos/base/applications/network/route/route.c index 8d4a8e22b1f..b1212bde33a 100644 --- a/reactos/base/applications/network/route/route.c +++ b/reactos/base/applications/network/route/route.c @@ -11,9 +11,14 @@ * Flexible, simple */ +#define WIN32_NO_STATUS +#include +#include +#include #include +#include +#define _INC_WINDOWS #include -#include #include #include diff --git a/reactos/base/applications/network/route/route.rc b/reactos/base/applications/network/route/route.rc index 09b910758c6..f8da1df6219 100644 --- a/reactos/base/applications/network/route/route.rc +++ b/reactos/base/applications/network/route/route.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Route\0" #define REACTOS_STR_INTERNAL_NAME "route\0" #define REACTOS_STR_ORIGINAL_FILENAME "route.exe\0" diff --git a/reactos/base/applications/network/telnet/src/ansiprsr.h b/reactos/base/applications/network/telnet/src/ansiprsr.h index bd2ccc4dd19..858ad6e3e49 100644 --- a/reactos/base/applications/network/telnet/src/ansiprsr.h +++ b/reactos/base/applications/network/telnet/src/ansiprsr.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include "tnconfig.h" #include "tparser.h" diff --git a/reactos/base/applications/network/telnet/src/precomp.h b/reactos/base/applications/network/telnet/src/precomp.h index 373e06f5c44..8691fbb04f3 100644 --- a/reactos/base/applications/network/telnet/src/precomp.h +++ b/reactos/base/applications/network/telnet/src/precomp.h @@ -2,46 +2,46 @@ #if defined(__BORLANDC__) && (__BORLANDC < 0x0500) #include -#else -#include +//#else +//#include #endif #ifdef __BORLANDC__ #include #else -#include +//#include #include #endif -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include +//#include #include #include -#include -#include +//#include +//#include #include -#include "keytrans.h" -#include "tnerror.h" -#include "tcharmap.h" -#include "tnconfig.h" -#include "tconsole.h" -#include "tkeydef.h" -#include "tkeymap.h" +//#include "keytrans.h" +//#include "tnerror.h" +//#include "tcharmap.h" +//#include "tnconfig.h" +//#include "tconsole.h" +//#include "tkeydef.h" +//#include "tkeymap.h" #include "tmapldr.h" -#include "tmouse.h" +//#include "tmouse.h" #include "tnclass.h" #include "tnmisc.h" -#include "tnclip.h" +//#include "tnclip.h" #include "tncon.h" -#include "ttelhndl.h" -#include "tnetwork.h" +//#include "ttelhndl.h" +//#include "tnetwork.h" #include "tnmain.h" #include "tscript.h" -#include "tscroll.h" +//#include "tscroll.h" #include "telnet.h" -#include "tparams.h" +//#include "tparams.h" diff --git a/reactos/base/applications/network/telnet/src/stl_bids.h b/reactos/base/applications/network/telnet/src/stl_bids.h index a11c555b036..6bd3d602f67 100644 --- a/reactos/base/applications/network/telnet/src/stl_bids.h +++ b/reactos/base/applications/network/telnet/src/stl_bids.h @@ -11,7 +11,7 @@ // #include #include #include -#include +//#include using namespace std; template diff --git a/reactos/base/applications/network/telnet/src/tconsole.h b/reactos/base/applications/network/telnet/src/tconsole.h index b90cb304aa8..32ce59228b2 100644 --- a/reactos/base/applications/network/telnet/src/tconsole.h +++ b/reactos/base/applications/network/telnet/src/tconsole.h @@ -1,6 +1,6 @@ #pragma once -#include "tnconfig.h" +//#include "tnconfig.h" /* A diagram of the following values: * diff --git a/reactos/base/applications/network/telnet/src/tkeydef.h b/reactos/base/applications/network/telnet/src/tkeydef.h index 49f7648e1f6..132a0d71f1b 100644 --- a/reactos/base/applications/network/telnet/src/tkeydef.h +++ b/reactos/base/applications/network/telnet/src/tkeydef.h @@ -5,7 +5,7 @@ #pragma once -#include +//#include #ifndef __BORLANDC__ // Ioannou Dec. 8, 1998 // We need these for MSVC6 (Sam Robertson Oct. 8, 1998) diff --git a/reactos/base/applications/network/telnet/src/tkeymap.h b/reactos/base/applications/network/telnet/src/tkeymap.h index 82b70c9b898..3f313caed85 100644 --- a/reactos/base/applications/network/telnet/src/tkeymap.h +++ b/reactos/base/applications/network/telnet/src/tkeymap.h @@ -1,6 +1,6 @@ #pragma once -#include "tkeydef.h" +//#include "tkeydef.h" #ifdef __BORLANDC__ #include diff --git a/reactos/base/applications/network/telnet/src/tmapldr.h b/reactos/base/applications/network/telnet/src/tmapldr.h index 03b650da7ec..83f8893060f 100644 --- a/reactos/base/applications/network/telnet/src/tmapldr.h +++ b/reactos/base/applications/network/telnet/src/tmapldr.h @@ -70,8 +70,8 @@ #pragma once -#include "keytrans.h" -#include "tcharmap.h" +//#include "keytrans.h" +//#include "tcharmap.h" // AVS typedef TArrayAsVector stringArray; diff --git a/reactos/base/applications/network/telnet/src/tmouse.h b/reactos/base/applications/network/telnet/src/tmouse.h index 3bb9d1f7981..d7762f8bf46 100644 --- a/reactos/base/applications/network/telnet/src/tmouse.h +++ b/reactos/base/applications/network/telnet/src/tmouse.h @@ -1,7 +1,7 @@ #pragma once #include "tnclip.h" -#include +//#include class TMouse { private: diff --git a/reactos/base/applications/network/telnet/src/tnclass.h b/reactos/base/applications/network/telnet/src/tnclass.h index da204acd19f..1fb1a728d9a 100644 --- a/reactos/base/applications/network/telnet/src/tnclass.h +++ b/reactos/base/applications/network/telnet/src/tnclass.h @@ -1,17 +1,17 @@ #pragma once -#include -#include "tnconfig.h" +//#include +//#include "tnconfig.h" #include "ttelhndl.h" -#include "tncon.h" -#include "tnerror.h" +//#include "tncon.h" +//#include "tnerror.h" #include "tparams.h" -#include "keytrans.h" -#include "ansiprsr.h" -#include "tcharmap.h" -#include "tnclip.h" -#include "tmouse.h" -#include "tmapldr.h" +//#include "keytrans.h" +//#include "ansiprsr.h" +//#include "tcharmap.h" +//#include "tnclip.h" +//#include "tmouse.h" +//#include "tmapldr.h" class Telnet { public: diff --git a/reactos/base/applications/network/telnet/src/tnclip.h b/reactos/base/applications/network/telnet/src/tnclip.h index bca147f2b59..1fc010e1765 100644 --- a/reactos/base/applications/network/telnet/src/tnclip.h +++ b/reactos/base/applications/network/telnet/src/tnclip.h @@ -1,6 +1,6 @@ #pragma once -#include +//#include #include "tnetwork.h" class Tnclip { diff --git a/reactos/base/applications/network/telnet/src/tncon.h b/reactos/base/applications/network/telnet/src/tncon.h index 42d75db5dbc..dc1817e39cd 100644 --- a/reactos/base/applications/network/telnet/src/tncon.h +++ b/reactos/base/applications/network/telnet/src/tncon.h @@ -1,8 +1,8 @@ #pragma once #include "tparams.h" -#include "tnclip.h" -#include "ttelhndl.h" +//#include "tnclip.h" +//#include "ttelhndl.h" enum { SC_UP, diff --git a/reactos/base/applications/network/telnet/src/tnerror.h b/reactos/base/applications/network/telnet/src/tnerror.h index 1432df5db89..6302e7c87d6 100644 --- a/reactos/base/applications/network/telnet/src/tnerror.h +++ b/reactos/base/applications/network/telnet/src/tnerror.h @@ -1,7 +1,14 @@ #pragma once #ifndef __WINDOWS_H -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#define _INC_WINDOWS +#include #endif #include "tnmsg.h" diff --git a/reactos/base/applications/network/telnet/src/tnetwork.h b/reactos/base/applications/network/telnet/src/tnetwork.h index 317ec2d11b9..bd6c770f4f8 100644 --- a/reactos/base/applications/network/telnet/src/tnetwork.h +++ b/reactos/base/applications/network/telnet/src/tnetwork.h @@ -3,7 +3,7 @@ #pragma once -#include +//#include enum NetworkType {TN_NETSOCKET, TN_NETPIPE}; diff --git a/reactos/base/applications/network/telnet/src/tnmain.h b/reactos/base/applications/network/telnet/src/tnmain.h index 930b9b123ad..3cbb69f7fe4 100644 --- a/reactos/base/applications/network/telnet/src/tnmain.h +++ b/reactos/base/applications/network/telnet/src/tnmain.h @@ -1,13 +1,14 @@ #pragma once -#include -#include -#include "tncon.h" -#include "tnclass.h" -#include "ttelhndl.h" -#include "tnerror.h" +//#include +//#include + +//#include "tncon.h" +//#include "tnclass.h" +//#include "ttelhndl.h" +//#include "tnerror.h" // Paul Brannan 5/25/98 -#include "tnconfig.h" +//#include "tnconfig.h" struct cmdHistory { char cmd[80]; diff --git a/reactos/base/applications/network/telnet/src/tparams.h b/reactos/base/applications/network/telnet/src/tparams.h index efa088599ba..e39981d3282 100644 --- a/reactos/base/applications/network/telnet/src/tparams.h +++ b/reactos/base/applications/network/telnet/src/tparams.h @@ -1,6 +1,6 @@ #pragma once -#include "ttelhndl.h" +//#include "ttelhndl.h" typedef struct { HANDLE hExit; diff --git a/reactos/base/applications/network/telnet/src/tparser.h b/reactos/base/applications/network/telnet/src/tparser.h index 7356d4b198c..7322f77b872 100644 --- a/reactos/base/applications/network/telnet/src/tparser.h +++ b/reactos/base/applications/network/telnet/src/tparser.h @@ -15,7 +15,7 @@ #include "tconsole.h" #include "keytrans.h" #include "tscroll.h" -#include "tnetwork.h" +//#include "tnetwork.h" #include "tcharmap.h" class TParser { diff --git a/reactos/base/applications/network/telnet/src/tscript.h b/reactos/base/applications/network/telnet/src/tscript.h index 1015b1f3ad8..ebc130e13b0 100644 --- a/reactos/base/applications/network/telnet/src/tscript.h +++ b/reactos/base/applications/network/telnet/src/tscript.h @@ -1,7 +1,8 @@ #pragma once -#include -#include +//#include +//#include + #include "tnetwork.h" class TScript { diff --git a/reactos/base/applications/network/telnet/src/tscroll.h b/reactos/base/applications/network/telnet/src/tscroll.h index 8a982b29da6..117e30519cd 100644 --- a/reactos/base/applications/network/telnet/src/tscroll.h +++ b/reactos/base/applications/network/telnet/src/tscroll.h @@ -1,6 +1,6 @@ #pragma once -#include "tconsole.h" +//#include "tconsole.h" #include "tmouse.h" typedef int(stripfunc)(char *, char *, int); diff --git a/reactos/base/applications/network/telnet/src/ttelhndl.h b/reactos/base/applications/network/telnet/src/ttelhndl.h index 9879435f01e..6903660378b 100644 --- a/reactos/base/applications/network/telnet/src/ttelhndl.h +++ b/reactos/base/applications/network/telnet/src/ttelhndl.h @@ -1,7 +1,7 @@ #pragma once -#include "tparser.h" -#include "tnetwork.h" +//#include "tparser.h" +//#include "tnetwork.h" DWORD WINAPI telProcessNetwork(LPVOID lpParameter); diff --git a/reactos/base/applications/network/telnet/telnet.rc b/reactos/base/applications/network/telnet/telnet.rc index a909476b47a..33814fe015c 100644 --- a/reactos/base/applications/network/telnet/telnet.rc +++ b/reactos/base/applications/network/telnet/telnet.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "Console Telnet for Win32\0" #define REACTOS_STR_INTERNAL_NAME "telnet\0" #define REACTOS_STR_ORIGINAL_FILENAME "telnet.exe\0" diff --git a/reactos/base/applications/network/tracert/tracert.c b/reactos/base/applications/network/tracert/tracert.c index e3c1048f7be..4654ee1d195 100644 --- a/reactos/base/applications/network/tracert/tracert.c +++ b/reactos/base/applications/network/tracert/tracert.c @@ -14,7 +14,6 @@ CHAR cHostname[256]; // target hostname CHAR cDestIP[18]; // target IP - static VOID DebugPrint(LPTSTR lpString, ...) { @@ -28,7 +27,6 @@ DebugPrint(LPTSTR lpString, ...) #endif } - static VOID Usage(VOID) { @@ -47,7 +45,6 @@ Usage(VOID) "- For testing purposes, all should work as normal in a Windows environment\n\n")); } - static BOOL ParseCmdline(int argc, LPCTSTR argv[], @@ -101,7 +98,6 @@ ParseCmdline(int argc, return TRUE; } - static WORD CheckSum(PUSHORT data, UINT size) @@ -123,7 +119,6 @@ CheckSum(PUSHORT data, return (USHORT)(~dwSum); } - static VOID SetupTimingMethod(PAPPINFO pInfo) { @@ -148,7 +143,6 @@ SetupTimingMethod(PAPPINFO pInfo) } } - static BOOL ResolveHostname(PAPPINFO pInfo) { @@ -183,7 +177,6 @@ ResolveHostname(PAPPINFO pInfo) return TRUE; } - static LONGLONG GetTime(PAPPINFO pInfo) { @@ -205,7 +198,6 @@ GetTime(PAPPINFO pInfo) return (LONGLONG)Time.u.LowPart; } - static BOOL SetTTL(SOCKET sock, INT iTTL) @@ -223,7 +215,6 @@ SetTTL(SOCKET sock, return TRUE; } - static BOOL CreateSocket(PAPPINFO pInfo) { @@ -250,7 +241,6 @@ CreateSocket(PAPPINFO pInfo) return TRUE; } - static VOID PreparePacket(PAPPINFO pInfo, USHORT iSeqNum) @@ -267,7 +257,6 @@ PreparePacket(PAPPINFO pInfo, sizeof(ICMP_HEADER) + PACKET_SIZE); } - static INT SendPacket(PAPPINFO pInfo) { @@ -308,7 +297,6 @@ SendPacket(PAPPINFO pInfo) return iSockRet; } - static BOOL ReceivePacket(PAPPINFO pInfo) { @@ -369,7 +357,6 @@ ReceivePacket(PAPPINFO pInfo) return bRet; } - static INT DecodeResponse(PAPPINFO pInfo) { @@ -410,7 +397,6 @@ DecodeResponse(PAPPINFO pInfo) return -3; } - static BOOL AllocateBuffers(PAPPINFO pInfo) { @@ -435,7 +421,6 @@ AllocateBuffers(PAPPINFO pInfo) return TRUE; } - static INT Driver(PAPPINFO pInfo) { @@ -575,7 +560,6 @@ Driver(PAPPINFO pInfo) return ret; } - static VOID Cleanup(PAPPINFO pInfo) { @@ -595,7 +579,6 @@ Cleanup(PAPPINFO pInfo) pInfo->RecvPacket); } - #if defined(_UNICODE) && defined(__GNUC__) static #endif @@ -635,7 +618,6 @@ int _tmain(int argc, LPCTSTR argv[]) return ret; } - #if defined(_UNICODE) && defined(__GNUC__) /* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ int main( int argc, char **argv ) diff --git a/reactos/base/applications/network/tracert/tracert.h b/reactos/base/applications/network/tracert/tracert.h index 02a40c23cac..0c49fb34e09 100644 --- a/reactos/base/applications/network/tracert/tracert.h +++ b/reactos/base/applications/network/tracert/tracert.h @@ -1,11 +1,13 @@ -#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#include +#include +#include +#define _INC_WINDOWS #include #include #include #include #include -#include -#include #define ECHO_REPLY 0 #define DEST_UNREACHABLE 3 diff --git a/reactos/base/applications/network/whois/whois.c b/reactos/base/applications/network/whois/whois.c index 2b25af66533..8835b75c852 100644 --- a/reactos/base/applications/network/whois/whois.c +++ b/reactos/base/applications/network/whois/whois.c @@ -36,7 +36,10 @@ * more convenient fdopen()/fprintf() to send()/recv(). */ -#include +//#include +#define WIN32_NO_STATUS +#include +#define _INC_WINDOWS #include /* #include */ /* #include */ diff --git a/reactos/base/applications/network/whois/whois.rc b/reactos/base/applications/network/whois/whois.rc index e706ac8d0d8..c1a5081ea77 100644 --- a/reactos/base/applications/network/whois/whois.rc +++ b/reactos/base/applications/network/whois/whois.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Whois\0" #define REACTOS_STR_INTERNAL_NAME "whois\0" #define REACTOS_STR_ORIGINAL_FILENAME "whois.exe\0" diff --git a/reactos/base/applications/network/wlanconf/resource.h b/reactos/base/applications/network/wlanconf/resource.h index 87d1537f68b..fbda1815ce8 100644 --- a/reactos/base/applications/network/wlanconf/resource.h +++ b/reactos/base/applications/network/wlanconf/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_USAGE 0 #define IDS_NO_NETWORK 1 #define IDS_NO_WLAN_ADAPTER 2 diff --git a/reactos/base/applications/network/wlanconf/wlanconf.c b/reactos/base/applications/network/wlanconf/wlanconf.c index 83013df82c1..0333017fdd2 100644 --- a/reactos/base/applications/network/wlanconf/wlanconf.c +++ b/reactos/base/applications/network/wlanconf/wlanconf.c @@ -6,10 +6,13 @@ * COPYRIGHT: Copyright 2012 Cameron Gutman (cameron.gutman@reactos.org) */ -#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include diff --git a/reactos/base/applications/network/wlanconf/wlanconf.rc b/reactos/base/applications/network/wlanconf/wlanconf.rc index 4e768aae62e..f8ebcca9b6f 100644 --- a/reactos/base/applications/network/wlanconf/wlanconf.rc +++ b/reactos/base/applications/network/wlanconf/wlanconf.rc @@ -1,6 +1,6 @@ -#include "resource.h" +#include -#include +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c index cf6a4c78760..adb77b79601 100644 --- a/reactos/base/applications/notepad/dialog.c +++ b/reactos/base/applications/notepad/dialog.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "notepad.h" LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/reactos/base/applications/notepad/license.c b/reactos/base/applications/notepad/license.c index 0e9b5565978..53f5d323e53 100644 --- a/reactos/base/applications/notepad/license.c +++ b/reactos/base/applications/notepad/license.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "notepad.h" VOID WineLicense(HWND Wnd) { @@ -36,4 +36,3 @@ VOID WineWarranty(HWND Wnd) MessageBoxA(Wnd, License->Warranty, License->WarrantyCaption, MB_ICONEXCLAMATION | MB_OK); } - diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c index 36b17bf6de6..30a1aa34b31 100644 --- a/reactos/base/applications/notepad/main.c +++ b/reactos/base/applications/notepad/main.c @@ -22,7 +22,7 @@ * */ -#include +#include "notepad.h" NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; diff --git a/reactos/base/applications/notepad/notepad.h b/reactos/base/applications/notepad/notepad.h index 909eca20b56..490eb64b3f5 100644 --- a/reactos/base/applications/notepad/notepad.h +++ b/reactos/base/applications/notepad/notepad.h @@ -4,14 +4,18 @@ #include #include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include #include #include "main.h" #include "dialog.h" - diff --git a/reactos/base/applications/notepad/notepad_res.h b/reactos/base/applications/notepad/notepad_res.h index d40004bdacb..fd028af662f 100644 --- a/reactos/base/applications/notepad/notepad_res.h +++ b/reactos/base/applications/notepad/notepad_res.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#pragma once + #define MAIN_MENU 0x201 #define DIALOG_PAGESETUP 0x202 #define ID_ACCEL 0x203 diff --git a/reactos/base/applications/notepad/rsrc.rc b/reactos/base/applications/notepad/rsrc.rc index 336e66079f6..7798102b7ca 100644 --- a/reactos/base/applications/notepad/rsrc.rc +++ b/reactos/base/applications/notepad/rsrc.rc @@ -17,12 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "main.h" -#include "winnls.h" -#include "commctrl.h" +#include +#include + #include "notepad_res.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Editor\0" diff --git a/reactos/base/applications/notepad/settings.c b/reactos/base/applications/notepad/settings.c index c0a12491694..4780140e88f 100644 --- a/reactos/base/applications/notepad/settings.c +++ b/reactos/base/applications/notepad/settings.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "notepad.h" static LPCTSTR s_szRegistryKey = _T("Software\\Microsoft\\Notepad"); diff --git a/reactos/base/applications/notepad/text.c b/reactos/base/applications/notepad/text.c index ed1015d04e9..db964e674e0 100644 --- a/reactos/base/applications/notepad/text.c +++ b/reactos/base/applications/notepad/text.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "notepad.h" static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { @@ -383,4 +383,3 @@ BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, in return TRUE; } - diff --git a/reactos/base/applications/rapps/aboutdlg.c b/reactos/base/applications/rapps/aboutdlg.c index b0da5d69956..932faa4619d 100644 --- a/reactos/base/applications/rapps/aboutdlg.c +++ b/reactos/base/applications/rapps/aboutdlg.c @@ -8,7 +8,6 @@ #include "rapps.h" - static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/reactos/base/applications/rapps/available.c b/reactos/base/applications/rapps/available.c index 016e5800291..ec43a8b1b24 100644 --- a/reactos/base/applications/rapps/available.c +++ b/reactos/base/applications/rapps/available.c @@ -8,7 +8,6 @@ #include "rapps.h" - BOOL ShowAvailableAppInfo(INT Index) { diff --git a/reactos/base/applications/rapps/installed.c b/reactos/base/applications/rapps/installed.c index 8c8cb33f172..57adbb6604f 100644 --- a/reactos/base/applications/rapps/installed.c +++ b/reactos/base/applications/rapps/installed.c @@ -8,7 +8,6 @@ #include "rapps.h" - BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString) { diff --git a/reactos/base/applications/rapps/rapps.h b/reactos/base/applications/rapps/rapps.h index b56c65d9e47..dd216ce3f0b 100644 --- a/reactos/base/applications/rapps/rapps.h +++ b/reactos/base/applications/rapps/rapps.h @@ -1,10 +1,18 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include +#include #include #include -#include -#include +#include #include diff --git a/reactos/base/applications/rapps/rapps.rc b/reactos/base/applications/rapps/rapps.rc index 7c0aeb5ca3b..838afe0c064 100644 --- a/reactos/base/applications/rapps/rapps.rc +++ b/reactos/base/applications/rapps/rapps.rc @@ -1,4 +1,8 @@ -#include "rapps.h" +#include +#include +#include + +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Applications Manager\0" #define REACTOS_STR_INTERNAL_NAME "rapps\0" diff --git a/reactos/base/applications/regedit/about.c b/reactos/base/applications/regedit/about.c index a503c86d1f5..5ac50c4999c 100644 --- a/reactos/base/applications/regedit/about.c +++ b/reactos/base/applications/regedit/about.c @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - +#include "regedit.h" void ShowAboutBox(HWND hWnd) { diff --git a/reactos/base/applications/regedit/childwnd.c b/reactos/base/applications/regedit/childwnd.c index a55310a95b1..b5135cb94ce 100644 --- a/reactos/base/applications/regedit/childwnd.c +++ b/reactos/base/applications/regedit/childwnd.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" ChildWnd* g_pChildWnd; static int last_split; diff --git a/reactos/base/applications/regedit/edit.c b/reactos/base/applications/regedit/edit.c index 3ec9e1448bc..5d45843192c 100644 --- a/reactos/base/applications/regedit/edit.c +++ b/reactos/base/applications/regedit/edit.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" typedef enum _EDIT_MODE { diff --git a/reactos/base/applications/regedit/error.c b/reactos/base/applications/regedit/error.c index 1999ac6b2b1..ac32517ad1e 100644 --- a/reactos/base/applications/regedit/error.c +++ b/reactos/base/applications/regedit/error.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" int ErrorMessageBox(HWND hWnd, LPCWSTR lpTitle, DWORD dwErrorCode, ...) { diff --git a/reactos/base/applications/regedit/find.c b/reactos/base/applications/regedit/find.c index 3c3e7d4cc0c..4b9e4cda621 100644 --- a/reactos/base/applications/regedit/find.c +++ b/reactos/base/applications/regedit/find.c @@ -16,8 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - -#include +#include "regedit.h" #define RSF_WHOLESTRING 0x00000001 #define RSF_LOOKATKEYS 0x00000002 @@ -823,4 +822,3 @@ void FindDialog(HWND hWnd) } } } - diff --git a/reactos/base/applications/regedit/framewnd.c b/reactos/base/applications/regedit/framewnd.c index d94534abb0a..af3afb31d1a 100644 --- a/reactos/base/applications/regedit/framewnd.c +++ b/reactos/base/applications/regedit/framewnd.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" /******************************************************************************** * Global and Local Variables: diff --git a/reactos/base/applications/regedit/hexedit.c b/reactos/base/applications/regedit/hexedit.c index 209287ab20c..65fada64395 100644 --- a/reactos/base/applications/regedit/hexedit.c +++ b/reactos/base/applications/regedit/hexedit.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" typedef struct { HWND hWndSelf; @@ -1551,4 +1551,3 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DefWindowProcW(hWnd, uMsg, wParam, lParam); } - diff --git a/reactos/base/applications/regedit/listview.c b/reactos/base/applications/regedit/listview.c index 958c50f1550..04eb4c1328d 100644 --- a/reactos/base/applications/regedit/listview.c +++ b/reactos/base/applications/regedit/listview.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" #define CX_ICON 16 diff --git a/reactos/base/applications/regedit/main.c b/reactos/base/applications/regedit/main.c index ea37f8ab3ae..bb27a5713a7 100644 --- a/reactos/base/applications/regedit/main.c +++ b/reactos/base/applications/regedit/main.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" BOOL ProcessCmdLine(LPWSTR lpCmdLine); diff --git a/reactos/base/applications/regedit/regedit.c b/reactos/base/applications/regedit/regedit.c index af456d8b7fd..a879a22867b 100644 --- a/reactos/base/applications/regedit/regedit.c +++ b/reactos/base/applications/regedit/regedit.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" static const LPCWSTR usage = diff --git a/reactos/base/applications/regedit/regedit.h b/reactos/base/applications/regedit/regedit.h index 29494757162..40262b72698 100644 --- a/reactos/base/applications/regedit/regedit.h +++ b/reactos/base/applications/regedit/regedit.h @@ -11,19 +11,13 @@ #include #include #include -#include -#include #include -#include -#include -#include #include #include #include -#include -#include #include #include + #include "main.h" #include "regproc.h" #include "hexedit.h" diff --git a/reactos/base/applications/regedit/regedit.rc b/reactos/base/applications/regedit/regedit.rc index 43ebf5af55c..456ff4d1759 100644 --- a/reactos/base/applications/regedit/regedit.rc +++ b/reactos/base/applications/regedit/regedit.rc @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Regedit resources * * Copyright 2002 Robert Dickenson @@ -19,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include +#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" diff --git a/reactos/base/applications/regedit/resource.h b/reactos/base/applications/regedit/resource.h index 688ef509beb..b586a561b20 100644 --- a/reactos/base/applications/regedit/resource.h +++ b/reactos/base/applications/regedit/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#pragma once + #define ID_REGISTRY_MENU 0 #define ID_EDIT_MENU 1 #define ID_VIEW_MENU 2 diff --git a/reactos/base/applications/regedit/security.c b/reactos/base/applications/regedit/security.c index 69c4ca246ac..41e3ffa049f 100644 --- a/reactos/base/applications/regedit/security.c +++ b/reactos/base/applications/regedit/security.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" #define INITGUID #include diff --git a/reactos/base/applications/regedit/settings.c b/reactos/base/applications/regedit/settings.c index 10a1e552ab1..b9165e47cb2 100644 --- a/reactos/base/applications/regedit/settings.c +++ b/reactos/base/applications/regedit/settings.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; diff --git a/reactos/base/applications/regedit/treeview.c b/reactos/base/applications/regedit/treeview.c index f27299c9671..fbd05d75898 100644 --- a/reactos/base/applications/regedit/treeview.c +++ b/reactos/base/applications/regedit/treeview.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "regedit.h" /* Global variables and constants */ /* Image_Open, Image_Closed, and Image_Root - integer variables for indexes of the images. */ diff --git a/reactos/base/applications/regedt32/regedt32.c b/reactos/base/applications/regedt32/regedt32.c index 74a3c06cd49..5967b3e5d23 100644 --- a/reactos/base/applications/regedt32/regedt32.c +++ b/reactos/base/applications/regedt32/regedt32.c @@ -1,3 +1,5 @@ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/reactos/base/applications/regedt32/resource.rc b/reactos/base/applications/regedt32/resource.rc index 6acaf6e5fe3..a9604fcd83e 100644 --- a/reactos/base/applications/regedt32/resource.rc +++ b/reactos/base/applications/regedt32/resource.rc @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include + #include "resource.h" // Common resources diff --git a/reactos/base/applications/sc/create.c b/reactos/base/applications/sc/create.c index 00ae3325c41..f44f5fefcf5 100644 --- a/reactos/base/applications/sc/create.c +++ b/reactos/base/applications/sc/create.c @@ -10,7 +10,6 @@ #include "sc.h" - typedef struct { LPCTSTR lpOption; diff --git a/reactos/base/applications/sc/print.c b/reactos/base/applications/sc/print.c index 359fb2003f8..ea2c84d5338 100644 --- a/reactos/base/applications/sc/print.c +++ b/reactos/base/applications/sc/print.c @@ -9,7 +9,6 @@ #include "sc.h" - VOID PrintService(LPCTSTR lpServiceName, LPSERVICE_STATUS_PROCESS pStatus, diff --git a/reactos/base/applications/sc/sc.h b/reactos/base/applications/sc/sc.h index 52d939ea24f..fe7cdef4b78 100644 --- a/reactos/base/applications/sc/sc.h +++ b/reactos/base/applications/sc/sc.h @@ -1,6 +1,8 @@ -#include +#include +#include +#include +#include #include -#include #include #define SCDBG diff --git a/reactos/base/applications/sc/sc.rc b/reactos/base/applications/sc/sc.rc index 52c5935e447..cb1d7c0e06b 100644 --- a/reactos/base/applications/sc/sc.rc +++ b/reactos/base/applications/sc/sc.rc @@ -1,6 +1,3 @@ -#include -#include - #define REACTOS_STR_FILE_DESCRIPTION "Services control application\0" #define REACTOS_STR_INTERNAL_NAME "sc\0" #define REACTOS_STR_ORIGINAL_FILENAME "sc.exe\0" diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.h b/reactos/base/applications/screensavers/3dtext/3dtext.h index d3e4b5f048e..277616966fd 100644 --- a/reactos/base/applications/screensavers/3dtext/3dtext.h +++ b/reactos/base/applications/screensavers/3dtext/3dtext.h @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -////////////////////////////////////////////////////////////////// - -#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include diff --git a/reactos/base/applications/screensavers/3dtext/resource.h b/reactos/base/applications/screensavers/3dtext/resource.h index 61e79f8f4a8..e3571f946f2 100644 --- a/reactos/base/applications/screensavers/3dtext/resource.h +++ b/reactos/base/applications/screensavers/3dtext/resource.h @@ -1,2 +1,4 @@ +#pragma once + #define IDC_STATIC -1 #define IDC_MESSAGE_TEXT 1001 diff --git a/reactos/base/applications/screensavers/3dtext/rsrc.rc b/reactos/base/applications/screensavers/3dtext/rsrc.rc index 06f38c1fc67..43b660b6aae 100644 --- a/reactos/base/applications/screensavers/3dtext/rsrc.rc +++ b/reactos/base/applications/screensavers/3dtext/rsrc.rc @@ -1,5 +1,7 @@ -#include +#include +#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/screensavers/logon/logon.c b/reactos/base/applications/screensavers/logon/logon.c index 8a68226c2bd..0ea846fcc16 100644 --- a/reactos/base/applications/screensavers/logon/logon.c +++ b/reactos/base/applications/screensavers/logon/logon.c @@ -18,9 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include +#include +#include +#include +#include #include +#include #include + #include "resource.h" #define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) diff --git a/reactos/base/applications/screensavers/logon/logon.rc b/reactos/base/applications/screensavers/logon/logon.rc index 016bec90d33..256019886a4 100644 --- a/reactos/base/applications/screensavers/logon/logon.rc +++ b/reactos/base/applications/screensavers/logon/logon.rc @@ -1,5 +1,6 @@ -#include +#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/screensavers/logon/resource.h b/reactos/base/applications/screensavers/logon/resource.h index bc82e80e9e9..e02a2ddc7fb 100644 --- a/reactos/base/applications/screensavers/logon/resource.h +++ b/reactos/base/applications/screensavers/logon/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_TEXT 3 #define IDB_WORKSTATION 0x100 #define IDB_SERVER 0x200 diff --git a/reactos/base/applications/setup16/main.c b/reactos/base/applications/setup16/main.c index 2c505578764..639cd98518e 100644 --- a/reactos/base/applications/setup16/main.c +++ b/reactos/base/applications/setup16/main.c @@ -1,4 +1,7 @@ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include +#include #include #include diff --git a/reactos/base/applications/shutdown/precomp.h b/reactos/base/applications/shutdown/precomp.h index db8280cfd38..95080b61bf4 100644 --- a/reactos/base/applications/shutdown/precomp.h +++ b/reactos/base/applications/shutdown/precomp.h @@ -2,13 +2,17 @@ #define __SHUTDOWN_PRECOMP_H /* INCLUDES ******************************************************************/ +#include +#include +#include +#include +#include #include #include -#include -#include #include #include // #include // Shutdown codes + #include "resource.h" /* DEFINES *******************************************************************/ diff --git a/reactos/base/applications/shutdown/rsrc.rc b/reactos/base/applications/shutdown/rsrc.rc index 5da4bae5913..4c187b4c0dc 100644 --- a/reactos/base/applications/shutdown/rsrc.rc +++ b/reactos/base/applications/shutdown/rsrc.rc @@ -1,7 +1,3 @@ -#include -#include "resource.h" - -/* Include localised resources */ // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/base/applications/shutdown/shutdown.rc b/reactos/base/applications/shutdown/shutdown.rc index 434ef0585f0..c6b93f48019 100644 --- a/reactos/base/applications/shutdown/shutdown.rc +++ b/reactos/base/applications/shutdown/shutdown.rc @@ -1,5 +1,6 @@ -#include -#include +#include +#include + #include "resource.h" /* Define language neutral resources */ diff --git a/reactos/base/applications/sndrec32/audio_api.hpp b/reactos/base/applications/sndrec32/audio_api.hpp index bb20f3651a7..5ea4d32c686 100644 --- a/reactos/base/applications/sndrec32/audio_api.hpp +++ b/reactos/base/applications/sndrec32/audio_api.hpp @@ -1,15 +1,13 @@ #ifndef __AUDIO_API__ #define __AUDIO_API__ -#include "audio_def.hpp" - -#include "audio_format.hpp" +//#include "audio_def.hpp" +//#include "audio_format.hpp" #include "audio_membuffer.hpp" -#include "audio_producer.hpp" -#include "audio_receiver.hpp" -#include "audio_resampler_acm.hpp" +//#include "audio_producer.hpp" +//#include "audio_receiver.hpp" +//#include "audio_resampler_acm.hpp" #include "audio_wavein.hpp" #include "audio_waveout.hpp" - #endif diff --git a/reactos/base/applications/sndrec32/audio_def.hpp b/reactos/base/applications/sndrec32/audio_def.hpp index 95b6f43a1f9..4f408be0f72 100644 --- a/reactos/base/applications/sndrec32/audio_def.hpp +++ b/reactos/base/applications/sndrec32/audio_def.hpp @@ -11,7 +11,7 @@ #define _AUDIO_DEF__H_ -#include +//#include @@ -48,7 +48,7 @@ // Platform depend stuff // -#include +//#include #include //Windows MultiMedia (WINMM) audio apis #include //codecs stuff #include //codecs stuff diff --git a/reactos/base/applications/sndrec32/audio_membuffer.hpp b/reactos/base/applications/sndrec32/audio_membuffer.hpp index 342c26edb57..046fc581a2e 100644 --- a/reactos/base/applications/sndrec32/audio_membuffer.hpp +++ b/reactos/base/applications/sndrec32/audio_membuffer.hpp @@ -11,7 +11,7 @@ -#include "audio_def.hpp" +//#include "audio_def.hpp" #include "audio_receiver.hpp" #include "audio_format.hpp" #include "audio_producer.hpp" diff --git a/reactos/base/applications/sndrec32/audio_producer.hpp b/reactos/base/applications/sndrec32/audio_producer.hpp index 678dad71d22..5490e27eeb3 100644 --- a/reactos/base/applications/sndrec32/audio_producer.hpp +++ b/reactos/base/applications/sndrec32/audio_producer.hpp @@ -11,7 +11,7 @@ #include "audio_def.hpp" -#include "audio_producer.hpp" +//#include "audio_producer.hpp" diff --git a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp index e1c3bc89644..c7f585963e2 100644 --- a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp +++ b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp @@ -8,7 +8,7 @@ #include "stdafx.h" #include "audio_resampler_acm.hpp" -#include +//#include diff --git a/reactos/base/applications/sndrec32/audio_resampler_acm.hpp b/reactos/base/applications/sndrec32/audio_resampler_acm.hpp index 0f957364e12..d68d1e29d64 100644 --- a/reactos/base/applications/sndrec32/audio_resampler_acm.hpp +++ b/reactos/base/applications/sndrec32/audio_resampler_acm.hpp @@ -11,7 +11,7 @@ -#include "audio_def.hpp" +//#include "audio_def.hpp" #include "audio_receiver.hpp" #include "audio_format.hpp" diff --git a/reactos/base/applications/sndrec32/audio_wavein.hpp b/reactos/base/applications/sndrec32/audio_wavein.hpp index 7f9285b6b65..53f7fb070b7 100644 --- a/reactos/base/applications/sndrec32/audio_wavein.hpp +++ b/reactos/base/applications/sndrec32/audio_wavein.hpp @@ -11,7 +11,7 @@ -#include "audio_def.hpp" +//#include "audio_def.hpp" #include "audio_format.hpp" #include "audio_receiver.hpp" diff --git a/reactos/base/applications/sndrec32/audio_waveout.hpp b/reactos/base/applications/sndrec32/audio_waveout.hpp index 0e22afdad7e..932bde75e89 100644 --- a/reactos/base/applications/sndrec32/audio_waveout.hpp +++ b/reactos/base/applications/sndrec32/audio_waveout.hpp @@ -12,7 +12,7 @@ #define _AUDIOWAVEOUT__H_ -#include "audio_def.hpp" +//#include "audio_def.hpp" #include "audio_format.hpp" diff --git a/reactos/base/applications/sndrec32/kkaudio.hpp b/reactos/base/applications/sndrec32/kkaudio.hpp index 285b1d399c4..6638590056c 100644 --- a/reactos/base/applications/sndrec32/kkaudio.hpp +++ b/reactos/base/applications/sndrec32/kkaudio.hpp @@ -1,7 +1,6 @@ #ifndef _AUDIO__H_ #define _AUDIO__H_ - #include "audio_def.hpp" #include "audio_wavein.hpp" #include "audio_waveout.hpp" @@ -11,8 +10,4 @@ #include "audio_producer.hpp" #include "audio_receiver.hpp" - - - #endif //ifdef _KKAUDIO__H_ - diff --git a/reactos/base/applications/sndrec32/resource.h b/reactos/base/applications/sndrec32/resource.h index 016f603a536..bb31b8a96d6 100644 --- a/reactos/base/applications/sndrec32/resource.h +++ b/reactos/base/applications/sndrec32/resource.h @@ -1,3 +1,5 @@ +#pragma once + //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by rsrc.rc diff --git a/reactos/base/applications/sndrec32/rsrc.rc b/reactos/base/applications/sndrec32/rsrc.rc index abe0229cf12..1a7a23a0e1a 100644 --- a/reactos/base/applications/sndrec32/rsrc.rc +++ b/reactos/base/applications/sndrec32/rsrc.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/sndrec32/sndrec32.cpp b/reactos/base/applications/sndrec32/sndrec32.cpp index 8408de873bb..24b71d97087 100644 --- a/reactos/base/applications/sndrec32/sndrec32.cpp +++ b/reactos/base/applications/sndrec32/sndrec32.cpp @@ -14,13 +14,9 @@ #include "stdafx.h" #include "sndrec32.h" - - - - -HINSTANCE hInst; -TCHAR szTitle[MAX_LOADSTRING]; -TCHAR szWindowClass[MAX_LOADSTRING]; +HINSTANCE hInst; +TCHAR szTitle[MAX_LOADSTRING]; +TCHAR szWindowClass[MAX_LOADSTRING]; ATOM MyRegisterClass( HINSTANCE hInstance ); diff --git a/reactos/base/applications/sndrec32/sndrec32.h b/reactos/base/applications/sndrec32/sndrec32.h index 2f3dfa46de8..d48d67de17d 100644 --- a/reactos/base/applications/sndrec32/sndrec32.h +++ b/reactos/base/applications/sndrec32/sndrec32.h @@ -5,26 +5,20 @@ * PROGRAMMERS: Marco Pagliaricci (irc: rendar) */ - - #pragma once #include "resource.h" #include "audio_api.hpp" - - #define MAX_LOADSTRING 100 #define MAINWINDOW_W 350 #define MAINWINDOW_H 190 - #define CONTROLS_CX 10 #define INITIAL_BUFREC_SECONDS 30.0f - #define BUTSTART_ID 0 #define BUTEND_ID 1 #define BUTPLAY_ID 2 diff --git a/reactos/base/applications/sndrec32/stdafx.h b/reactos/base/applications/sndrec32/stdafx.h index 89eb838f464..4e622e48811 100644 --- a/reactos/base/applications/sndrec32/stdafx.h +++ b/reactos/base/applications/sndrec32/stdafx.h @@ -1,9 +1,6 @@ #pragma once -#include "targetver.h" - -#define WIN32_LEAN_AND_MEAN - +//#include "targetver.h" #ifdef _UNICODE #define _sntprintf_s _snwprintf_s @@ -11,13 +8,12 @@ #define _sntprintf_s _snprintf_s #endif - +#define WIN32_NO_STATUS #include -#include #include -#include - - -#include +#include +#include +#include +#include #include #include diff --git a/reactos/base/applications/sndrec32/targetver.h b/reactos/base/applications/sndrec32/targetver.h index 400af640339..1b8dc073f01 100644 --- a/reactos/base/applications/sndrec32/targetver.h +++ b/reactos/base/applications/sndrec32/targetver.h @@ -5,11 +5,8 @@ * PROGRAMMERS: Marco Pagliaricci (irc: rendar) */ - - #pragma once - #ifndef WINVER #define WINVER 0x0600 #endif diff --git a/reactos/base/applications/sndvol32/dialog.c b/reactos/base/applications/sndvol32/dialog.c index a46b4a365a0..59d3fd99d0b 100644 --- a/reactos/base/applications/sndvol32/dialog.c +++ b/reactos/base/applications/sndvol32/dialog.c @@ -1,12 +1,11 @@ -/* $Id: misc.c 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Sound Volume Control * FILE: subsys/system/sndvol32/dialog.c * PROGRAMMERS: Johannes Anderwald */ -#include "sndvol32.h" +#include "sndvol32.h" #define XLEFT (30) #define XTOP (20) @@ -563,4 +562,3 @@ UpdateDialogLineSliderControl( } } } - diff --git a/reactos/base/applications/sndvol32/misc.c b/reactos/base/applications/sndvol32/misc.c index 2eabfc9ed2c..596cd2fafdc 100644 --- a/reactos/base/applications/sndvol32/misc.c +++ b/reactos/base/applications/sndvol32/misc.c @@ -23,8 +23,8 @@ * FILE: subsys/system/sndvol32/misc.c * PROGRAMMERS: Thomas Weidenmueller */ -#include "sndvol32.h" +#include "sndvol32.h" static INT LengthOfStrResource(IN HINSTANCE hInst, diff --git a/reactos/base/applications/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c index 0fbc172fcec..bafee13dd73 100644 --- a/reactos/base/applications/sndvol32/mixer.c +++ b/reactos/base/applications/sndvol32/mixer.c @@ -609,4 +609,3 @@ SndMixerIsDisplayControl(PSND_MIXER Mixer, return FALSE; } - diff --git a/reactos/base/applications/sndvol32/rsrc.rc b/reactos/base/applications/sndvol32/rsrc.rc index 448af197aac..961d56ed2b3 100644 --- a/reactos/base/applications/sndvol32/rsrc.rc +++ b/reactos/base/applications/sndvol32/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resources.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico diff --git a/reactos/base/applications/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c index ec16547f4af..a31f7d04ba6 100644 --- a/reactos/base/applications/sndvol32/sndvol32.c +++ b/reactos/base/applications/sndvol32/sndvol32.c @@ -1209,4 +1209,3 @@ _tWinMain(HINSTANCE hInstance, return Ret; } - diff --git a/reactos/base/applications/sndvol32/sndvol32.h b/reactos/base/applications/sndvol32/sndvol32.h index b9a3ab43d2d..bab57c7cf01 100644 --- a/reactos/base/applications/sndvol32/sndvol32.h +++ b/reactos/base/applications/sndvol32/sndvol32.h @@ -1,16 +1,20 @@ #ifndef __SNDVOL32_H #define __SNDVOL32_H -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include -#include -#include "resources.h" #include +#include "resources.h" + typedef struct _MIXER_WINDOW { HWND hWnd; diff --git a/reactos/base/applications/sndvol32/sndvol32.rc b/reactos/base/applications/sndvol32/sndvol32.rc index 59ba21e97d6..7efb803190c 100644 --- a/reactos/base/applications/sndvol32/sndvol32.rc +++ b/reactos/base/applications/sndvol32/sndvol32.rc @@ -1,6 +1,7 @@ -/* $Id$ */ +#include +#include +#include -#include #include "resources.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sound Volume Control\0" @@ -9,4 +10,3 @@ #include #include "rsrc.rc" - diff --git a/reactos/base/applications/taskmgr/about.c b/reactos/base/applications/taskmgr/about.c index 7ae7a66f1c4..ec8e5c12407 100644 --- a/reactos/base/applications/taskmgr/about.c +++ b/reactos/base/applications/taskmgr/about.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" void OnAbout(void) { diff --git a/reactos/base/applications/taskmgr/affinity.c b/reactos/base/applications/taskmgr/affinity.c index 1302835fa21..6172a79753d 100644 --- a/reactos/base/applications/taskmgr/affinity.c +++ b/reactos/base/applications/taskmgr/affinity.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" HANDLE hProcessAffinityHandle; diff --git a/reactos/base/applications/taskmgr/applpage.c b/reactos/base/applications/taskmgr/applpage.c index 0bcaf104d60..f9c2949603e 100644 --- a/reactos/base/applications/taskmgr/applpage.c +++ b/reactos/base/applications/taskmgr/applpage.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" typedef struct { diff --git a/reactos/base/applications/taskmgr/column.c b/reactos/base/applications/taskmgr/column.c index 27fb191ba13..961287b8f49 100644 --- a/reactos/base/applications/taskmgr/column.c +++ b/reactos/base/applications/taskmgr/column.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" UINT ColumnDataHints[COLUMN_NMAX]; diff --git a/reactos/base/applications/taskmgr/dbgchnl.c b/reactos/base/applications/taskmgr/dbgchnl.c index 2d1a64aefee..2473abdb597 100644 --- a/reactos/base/applications/taskmgr/dbgchnl.c +++ b/reactos/base/applications/taskmgr/dbgchnl.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /* TODO: * - the dialog box could be non modal diff --git a/reactos/base/applications/taskmgr/debug.c b/reactos/base/applications/taskmgr/debug.c index f72ba26a03d..17e43ae583a 100644 --- a/reactos/base/applications/taskmgr/debug.c +++ b/reactos/base/applications/taskmgr/debug.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" void ProcessPage_OnDebug(void) { diff --git a/reactos/base/applications/taskmgr/endproc.c b/reactos/base/applications/taskmgr/endproc.c index 4e92a4e0fae..a26fd764c62 100644 --- a/reactos/base/applications/taskmgr/endproc.c +++ b/reactos/base/applications/taskmgr/endproc.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" void ProcessPage_OnEndProcess(void) { diff --git a/reactos/base/applications/taskmgr/graph.c b/reactos/base/applications/taskmgr/graph.c index ffc72177d68..668bc8e38f0 100644 --- a/reactos/base/applications/taskmgr/graph.c +++ b/reactos/base/applications/taskmgr/graph.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" int nlastBarsUsed = 0; diff --git a/reactos/base/applications/taskmgr/graphctl.c b/reactos/base/applications/taskmgr/graphctl.c index f303aa9418a..0725d3b6b9d 100644 --- a/reactos/base/applications/taskmgr/graphctl.c +++ b/reactos/base/applications/taskmgr/graphctl.c @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" WNDPROC OldGraphCtrlWndProc; diff --git a/reactos/base/applications/taskmgr/optnmenu.c b/reactos/base/applications/taskmgr/optnmenu.c index 4ba1fa60336..bb34fed2fd3 100644 --- a/reactos/base/applications/taskmgr/optnmenu.c +++ b/reactos/base/applications/taskmgr/optnmenu.c @@ -26,7 +26,7 @@ * Menu item handlers for the options menu. */ -#include +#include "precomp.h" void TaskManager_OnOptionsAlwaysOnTop(void) { diff --git a/reactos/base/applications/taskmgr/perfdata.c b/reactos/base/applications/taskmgr/perfdata.c index 8e98a6ee714..f8ed0f19a25 100644 --- a/reactos/base/applications/taskmgr/perfdata.c +++ b/reactos/base/applications/taskmgr/perfdata.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ diff --git a/reactos/base/applications/taskmgr/perfpage.c b/reactos/base/applications/taskmgr/perfpage.c index 959b60145fb..3359c2e56d3 100644 --- a/reactos/base/applications/taskmgr/perfpage.c +++ b/reactos/base/applications/taskmgr/perfpage.c @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "precomp.h" TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; diff --git a/reactos/base/applications/taskmgr/precomp.h b/reactos/base/applications/taskmgr/precomp.h index e066d2ce929..2ed0c2a0fe7 100644 --- a/reactos/base/applications/taskmgr/precomp.h +++ b/reactos/base/applications/taskmgr/precomp.h @@ -5,13 +5,15 @@ #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled! #endif -#include #include #include #include #define WIN32_NO_STATUS -#include +#define WIN32_LEAN_AND_MEAN + +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/base/applications/taskmgr/priority.c b/reactos/base/applications/taskmgr/priority.c index 358d45063ed..6364d161ecf 100644 --- a/reactos/base/applications/taskmgr/priority.c +++ b/reactos/base/applications/taskmgr/priority.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" void DoSetPriority(DWORD priority) { diff --git a/reactos/base/applications/taskmgr/proclist.c b/reactos/base/applications/taskmgr/proclist.c index 6f11aee48a6..bc8f1e58baa 100644 --- a/reactos/base/applications/taskmgr/proclist.c +++ b/reactos/base/applications/taskmgr/proclist.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/reactos/base/applications/taskmgr/procpage.c b/reactos/base/applications/taskmgr/procpage.c index 153c1dc89f3..99e9af1068b 100644 --- a/reactos/base/applications/taskmgr/procpage.c +++ b/reactos/base/applications/taskmgr/procpage.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" #define CMP(x1, x2)\ (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0)) diff --git a/reactos/base/applications/taskmgr/run.c b/reactos/base/applications/taskmgr/run.c index 9dd1f16a97e..2646a66076a 100644 --- a/reactos/base/applications/taskmgr/run.c +++ b/reactos/base/applications/taskmgr/run.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" void TaskManager_OnFileNew(void) { diff --git a/reactos/base/applications/taskmgr/taskmgr.c b/reactos/base/applications/taskmgr/taskmgr.c index c8de00099a3..f497e0c1195 100644 --- a/reactos/base/applications/taskmgr/taskmgr.c +++ b/reactos/base/applications/taskmgr/taskmgr.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" #define STATUS_WINDOW 2001 diff --git a/reactos/base/applications/taskmgr/taskmgr.rc b/reactos/base/applications/taskmgr/taskmgr.rc index cbcb4f75926..487439814d7 100644 --- a/reactos/base/applications/taskmgr/taskmgr.rc +++ b/reactos/base/applications/taskmgr/taskmgr.rc @@ -1,5 +1,8 @@ +#include +#include +#include + #include "resource.h" -#include IDI_TASKMANAGER ICON DISCARDABLE "res/taskmgr.ico" IDI_WINDOW ICON DISCARDABLE "res/window.ico" diff --git a/reactos/base/applications/taskmgr/trayicon.c b/reactos/base/applications/taskmgr/trayicon.c index 42d27822772..e34e4578743 100644 --- a/reactos/base/applications/taskmgr/trayicon.c +++ b/reactos/base/applications/taskmgr/trayicon.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" HICON TrayIcon_GetProcessorUsageIcon(void) { diff --git a/reactos/base/applications/winhlp32/callback.c b/reactos/base/applications/winhlp32/callback.c index 51938617f37..69f0d900ded 100644 --- a/reactos/base/applications/winhlp32/callback.c +++ b/reactos/base/applications/winhlp32/callback.c @@ -18,15 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN +#include +#include +#include +#include +#include -#include - -#include "windows.h" #include "winhelp.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhelp); static WORD CALLBACK WHD_GetFSError(void) diff --git a/reactos/base/applications/winhlp32/hlpfile.c b/reactos/base/applications/winhlp32/hlpfile.c index 5146c38ec41..52672bf5e02 100644 --- a/reactos/base/applications/winhlp32/hlpfile.c +++ b/reactos/base/applications/winhlp32/hlpfile.c @@ -20,18 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include -#include +//#include +#include +//#include +#include +#include +#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "winhelp.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhelp); static inline unsigned short GET_USHORT(const BYTE* buffer, unsigned i) diff --git a/reactos/base/applications/winhlp32/macro.c b/reactos/base/applications/winhlp32/macro.c index 3151e0dac14..d75eaf64e74 100644 --- a/reactos/base/applications/winhlp32/macro.c +++ b/reactos/base/applications/winhlp32/macro.c @@ -19,17 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN +#include +#include +#include +#include +#include +#include +#include +#include -#include - -#include "windows.h" -#include "commdlg.h" -#include "shellapi.h" #include "winhelp.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhelp); /**************************************************/ diff --git a/reactos/base/applications/winhlp32/macro.h b/reactos/base/applications/winhlp32/macro.h index 910782db60c..e4f2a31cfde 100644 --- a/reactos/base/applications/winhlp32/macro.h +++ b/reactos/base/applications/winhlp32/macro.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +#include struct lexret { LPCSTR proto; diff --git a/reactos/base/applications/winhlp32/rsrc.rc b/reactos/base/applications/winhlp32/rsrc.rc index aecb5988426..30338a59f46 100644 --- a/reactos/base/applications/winhlp32/rsrc.rc +++ b/reactos/base/applications/winhlp32/rsrc.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #include "winhelp_res.h" /* @makedep: winhelp.ico */ diff --git a/reactos/base/applications/winhlp32/winhelp.c b/reactos/base/applications/winhlp32/winhelp.c index 5e4bce4c4cf..64c11070f7a 100644 --- a/reactos/base/applications/winhlp32/winhelp.c +++ b/reactos/base/applications/winhlp32/winhelp.c @@ -24,25 +24,25 @@ #include #include -#include -#include -#include +//#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" +#include +//#include "winbase.h" +#include +#include +#include #include "winhelp.h" -#include "winhelp_res.h" -#include "shellapi.h" -#include "richedit.h" -#include "commctrl.h" +//#include "winhelp_res.h" +//#include "shellapi.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winhelp); diff --git a/reactos/base/applications/winhlp32/winhelp.h b/reactos/base/applications/winhlp32/winhelp.h index 519dec215a9..ac3da225f92 100644 --- a/reactos/base/applications/winhlp32/winhelp.h +++ b/reactos/base/applications/winhlp32/winhelp.h @@ -32,11 +32,11 @@ #ifndef RC_INVOKED -#include +//#include #include "hlpfile.h" -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" #include "macro.h" #include "winhelp_res.h" diff --git a/reactos/base/applications/winhlp32/winhelp_res.h b/reactos/base/applications/winhlp32/winhelp_res.h index a6d183096de..09c42913e21 100644 --- a/reactos/base/applications/winhlp32/winhelp_res.h +++ b/reactos/base/applications/winhlp32/winhelp_res.h @@ -1,5 +1,4 @@ -#include -#include +#pragma once #define MNID_FILE_OPEN 0x101 #define MNID_FILE_PRINT 0x104 diff --git a/reactos/base/applications/winver/winver.c b/reactos/base/applications/winver/winver.c index 3514b26514c..1065b515d3a 100644 --- a/reactos/base/applications/winver/winver.c +++ b/reactos/base/applications/winver/winver.c @@ -1,4 +1,7 @@ -#include +#include +#include +#include +#include #include int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { diff --git a/reactos/base/applications/wordpad/olecallback.c b/reactos/base/applications/wordpad/olecallback.c index 8b279ada89d..a2dca91f1cd 100644 --- a/reactos/base/applications/wordpad/olecallback.c +++ b/reactos/base/applications/wordpad/olecallback.c @@ -20,12 +20,13 @@ #define COBJMACROS +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include #include -#include #include +#include -#include "wine/debug.h" #include "wordpad.h" WINE_DEFAULT_DEBUG_CHANNEL(wordpad); diff --git a/reactos/base/applications/wordpad/print.c b/reactos/base/applications/wordpad/print.c index 7761c32379a..11428c006a9 100644 --- a/reactos/base/applications/wordpad/print.c +++ b/reactos/base/applications/wordpad/print.c @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include +#include +#include +#include +#include +#include #include #include +#include #include "wordpad.h" diff --git a/reactos/base/applications/wordpad/registry.c b/reactos/base/applications/wordpad/registry.c index 472ed4da9be..46bece70e84 100644 --- a/reactos/base/applications/wordpad/registry.c +++ b/reactos/base/applications/wordpad/registry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/reactos/base/applications/wordpad/rsrc.rc b/reactos/base/applications/wordpad/rsrc.rc index f018a3ae70d..d4357bfe1fe 100644 --- a/reactos/base/applications/wordpad/rsrc.rc +++ b/reactos/base/applications/wordpad/rsrc.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #include "wordpad.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS WordPad\0" diff --git a/reactos/base/applications/wordpad/wordpad.c b/reactos/base/applications/wordpad/wordpad.c index db7546bfb1a..5902ae85c36 100644 --- a/reactos/base/applications/wordpad/wordpad.c +++ b/reactos/base/applications/wordpad/wordpad.c @@ -22,21 +22,18 @@ #define WIN32_LEAN_AND_MEAN #define _WIN32_IE 0x0400 -#include -#include -#include #include #include - -#include +#include +#include +#include +#include #include #include #include #include -#include -#include +#include -#include "wine/unicode.h" #include "wordpad.h" #ifdef NONAMELESSUNION diff --git a/reactos/base/applications/wordpad/wordpad.h b/reactos/base/applications/wordpad/wordpad.h index 0cde557117c..c9f560b4bf2 100644 --- a/reactos/base/applications/wordpad/wordpad.h +++ b/reactos/base/applications/wordpad/wordpad.h @@ -17,8 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#pragma once #define MAX_STRING_LEN 255 diff --git a/reactos/base/applications/write/resources.h b/reactos/base/applications/write/resources.h index 73ef91aa40f..0aac99e176f 100644 --- a/reactos/base/applications/write/resources.h +++ b/reactos/base/applications/write/resources.h @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#pragma once #define IDS_FAILED 101 diff --git a/reactos/base/applications/write/rsrc.rc b/reactos/base/applications/write/rsrc.rc index 738241ff10c..ec3e0649318 100644 --- a/reactos/base/applications/write/rsrc.rc +++ b/reactos/base/applications/write/rsrc.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/base/applications/write/write.c b/reactos/base/applications/write/write.c index da145c208e5..d6b36e5b95f 100644 --- a/reactos/base/applications/write/write.c +++ b/reactos/base/applications/write/write.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - #include +#include +#include +#include -#include #include "resources.h" static const WCHAR SZ_BACKSLASH[] = {'\\',0}; diff --git a/reactos/base/services/audiosrv/audiosrv.h b/reactos/base/services/audiosrv/audiosrv.h index 61edb2e2627..9cfcee1b0f3 100644 --- a/reactos/base/services/audiosrv/audiosrv.h +++ b/reactos/base/services/audiosrv/audiosrv.h @@ -6,14 +6,16 @@ * COPYRIGHT: Copyright 2007 Andrew Greenwood */ -#include -#include +#include +#include +#include +#include #include +#include +#include #include -#include #include #include -#include #include #include #include diff --git a/reactos/base/services/audiosrv/pnp_list_manager.c b/reactos/base/services/audiosrv/pnp_list_manager.c index 457e8a442a3..428a4bfde14 100644 --- a/reactos/base/services/audiosrv/pnp_list_manager.c +++ b/reactos/base/services/audiosrv/pnp_list_manager.c @@ -8,7 +8,6 @@ #include "audiosrv.h" - /* Device descriptor */ diff --git a/reactos/base/services/eventlog/eventlog.h b/reactos/base/services/eventlog/eventlog.h index 4f1059328ea..6bf4e71e20a 100644 --- a/reactos/base/services/eventlog/eventlog.h +++ b/reactos/base/services/eventlog/eventlog.h @@ -13,7 +13,9 @@ #define WIN32_NO_STATUS #include -#include + +#include +#include #include #include #include @@ -21,7 +23,7 @@ #include #include #include -#include "eventlogrpc_s.h" +#include typedef struct _IO_ERROR_LPC { diff --git a/reactos/base/services/rpcss/epmp.c b/reactos/base/services/rpcss/epmp.c index 5cfef836cb8..2d3041f2b25 100644 --- a/reactos/base/services/rpcss/epmp.c +++ b/reactos/base/services/rpcss/epmp.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "epm_s.h" - -#include "wine/debug.h" -#include "wine/list.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/base/services/rpcss/irotp.c b/reactos/base/services/rpcss/irotp.c index f7683570a60..015a89f735b 100644 --- a/reactos/base/services/rpcss/irotp.c +++ b/reactos/base/services/rpcss/irotp.c @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" - -#include "irot_s.h" - -#include "wine/list.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(rpcss); diff --git a/reactos/base/services/rpcss/rpcss.h b/reactos/base/services/rpcss/rpcss.h index 9c2f04f7b86..67bbc52b38a 100644 --- a/reactos/base/services/rpcss/rpcss.h +++ b/reactos/base/services/rpcss/rpcss.h @@ -21,6 +21,10 @@ #ifndef __WINE_RPCSS_H #define __WINE_RPCSS_H -#include "windows.h" +#include +#include +#include +#include + #endif /* __WINE_RPCSS_H */ diff --git a/reactos/base/services/rpcss/rpcss.rc b/reactos/base/services/rpcss/rpcss.rc index d5a503c5f1d..4da8e3585e9 100644 --- a/reactos/base/services/rpcss/rpcss.rc +++ b/reactos/base/services/rpcss/rpcss.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "RPC subsystem\0" #define REACTOS_STR_INTERNAL_NAME "RpcSs\0" #define REACTOS_STR_ORIGINAL_FILENAME "RpcSs.exe\0" diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c index 7fd7cd41aca..87496bf6094 100644 --- a/reactos/base/services/rpcss/rpcss_main.c +++ b/reactos/base/services/rpcss/rpcss_main.c @@ -43,18 +43,13 @@ * role of rpcss.exe in wine. */ -#include -#include -#include - #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "rpcss.h" -#include "winnt.h" -#include "irot_s.h" -#include "epm_s.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/base/services/spoolsv/spoolsv.c b/reactos/base/services/spoolsv/spoolsv.c index 398e565e54a..afd6774844e 100644 --- a/reactos/base/services/spoolsv/spoolsv.c +++ b/reactos/base/services/spoolsv/spoolsv.c @@ -8,10 +8,9 @@ /* INCLUDES *****************************************************************/ -#define WIN32_NO_STATUS -#include - -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); diff --git a/reactos/base/services/svchost/svchost.c b/reactos/base/services/svchost/svchost.c index ede1971605a..b3259132403 100644 --- a/reactos/base/services/svchost/svchost.c +++ b/reactos/base/services/svchost/svchost.c @@ -13,11 +13,6 @@ #define NDEBUG #include -#ifdef _MSC_VER -#undef DPRINT1 -#define DPRINT1 -#endif - /* DEFINES *******************************************************************/ static LPCTSTR SVCHOST_REG_KEY = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"); diff --git a/reactos/base/services/svchost/svchost.h b/reactos/base/services/svchost/svchost.h index 539b5772e5f..2956fad9fa0 100644 --- a/reactos/base/services/svchost/svchost.h +++ b/reactos/base/services/svchost/svchost.h @@ -14,8 +14,12 @@ #define _CRT_SECURE_NO_DEPRECATE 1 #endif -#include -#include +#include +#include +#include +#include +#include +#include #include /* DEFINES *******************************************************************/ diff --git a/reactos/base/services/svchost/svchost.rc b/reactos/base/services/svchost/svchost.rc index 3e3677f17db..f0a71bd17f3 100644 --- a/reactos/base/services/svchost/svchost.rc +++ b/reactos/base/services/svchost/svchost.rc @@ -1,5 +1,3 @@ -/* $Id: svchost.rc 21279 2007-10-22 06:09:58Z gbrunmar $ */ - #define REACTOS_STR_FILE_DESCRIPTION "SvcHost subsystem\0" #define REACTOS_STR_INTERNAL_NAME "SvcHost\0" #define REACTOS_STR_ORIGINAL_FILENAME "SvcHost.exe\0" diff --git a/reactos/base/services/tcpsvcs/tcpsvcs.h b/reactos/base/services/tcpsvcs/tcpsvcs.h index b2e8d90e03a..f470c71542d 100644 --- a/reactos/base/services/tcpsvcs/tcpsvcs.h +++ b/reactos/base/services/tcpsvcs/tcpsvcs.h @@ -1,4 +1,10 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#define _INC_WINDOWS #include #include #include diff --git a/reactos/base/services/telnetd/serviceentry.c b/reactos/base/services/telnetd/serviceentry.c index f53fc1c7e11..71b8232d2ec 100644 --- a/reactos/base/services/telnetd/serviceentry.c +++ b/reactos/base/services/telnetd/serviceentry.c @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - -#include -#include "wine/debug.h" +#include +#include +#include +#include +#include int kickoff_telnetd(void); diff --git a/reactos/base/services/telnetd/telnetd.h b/reactos/base/services/telnetd/telnetd.h index fe5bd138610..05132a3c86e 100644 --- a/reactos/base/services/telnetd/telnetd.h +++ b/reactos/base/services/telnetd/telnetd.h @@ -1,12 +1,14 @@ #pragma once #define _CRT_SECURE_NO_WARNINGS - #define WIN32_NO_STATUS #include +#include +#include +#include +#include +#define _INC_WINDOWS #include -#include -#include /* ** macro definitions diff --git a/reactos/base/services/telnetd/telnetd.rc b/reactos/base/services/telnetd/telnetd.rc index 2e0c42aac53..c9bf98cd594 100644 --- a/reactos/base/services/telnetd/telnetd.rc +++ b/reactos/base/services/telnetd/telnetd.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Simple Telnet Service\0" #define REACTOS_STR_INTERNAL_NAME "telnetd\0" #define REACTOS_STR_ORIGINAL_FILENAME "telnetd.exe\0" diff --git a/reactos/base/services/thmsvc/thmsvc.c b/reactos/base/services/thmsvc/thmsvc.c index 5dcbc1eb894..6279756b816 100644 --- a/reactos/base/services/thmsvc/thmsvc.c +++ b/reactos/base/services/thmsvc/thmsvc.c @@ -8,11 +8,11 @@ /* INCLUDES *****************************************************************/ -#define WIN32_NO_STATUS -#include +#include +#include #include +#include -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(thmsvc); diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c index 6acefa85f9f..5f834707d73 100644 --- a/reactos/base/services/umpnpmgr/umpnpmgr.c +++ b/reactos/base/services/umpnpmgr/umpnpmgr.c @@ -29,22 +29,22 @@ /* INCLUDES *****************************************************************/ //#define HAVE_SLIST_ENTRY_IMPLEMENTED #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include -#include #include #include #include #include -#include #include #include #include - -#include -#include - -#include "pnp_s.h" +#include #define NDEBUG #include diff --git a/reactos/base/services/wlansvc/rpcserver.c b/reactos/base/services/wlansvc/rpcserver.c index bb010368669..5c4ab548f89 100644 --- a/reactos/base/services/wlansvc/rpcserver.c +++ b/reactos/base/services/wlansvc/rpcserver.c @@ -7,10 +7,8 @@ */ /* INCLUDES ****************************************************************/ -#include -#include -#include "wlansvc_s.h" +#include #define NDEBUG #include diff --git a/reactos/base/services/wlansvc/wlansvc.c b/reactos/base/services/wlansvc/wlansvc.c index 721dd0f9706..845991c16e7 100644 --- a/reactos/base/services/wlansvc/wlansvc.c +++ b/reactos/base/services/wlansvc/wlansvc.c @@ -8,9 +8,7 @@ /* INCLUDES *****************************************************************/ -#define WIN32_NO_STATUS -#include -#include "wlansvc_s.h" +#include //#define NDEBUG #include diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c index f31f993f5cb..1fbfc4d911e 100644 --- a/reactos/base/setup/reactos/reactos.c +++ b/reactos/base/setup/reactos/reactos.c @@ -26,11 +26,14 @@ * Dmitry Chapyshev (dmitry@reactos.org) */ -#include -#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include diff --git a/reactos/base/setup/reactos/reactos.rc b/reactos/base/setup/reactos/reactos.rc index bc6d03cca19..1eb064bf143 100644 --- a/reactos/base/setup/reactos/reactos.rc +++ b/reactos/base/setup/reactos/reactos.rc @@ -1,6 +1,7 @@ -/* $Id$ */ +#include +#include +#include -#include #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" diff --git a/reactos/base/setup/reactos/rsrc.rc b/reactos/base/setup/reactos/rsrc.rc index fbf8a3804ff..91141ad19c1 100644 --- a/reactos/base/setup/reactos/rsrc.rc +++ b/reactos/base/setup/reactos/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - /* Language-specific resources */ // UTF-8 #pragma code_page(65001) diff --git a/reactos/base/setup/setup/setup.c b/reactos/base/setup/setup/setup.c index 4db7fc46a92..c250eae2631 100644 --- a/reactos/base/setup/setup/setup.c +++ b/reactos/base/setup/setup/setup.c @@ -23,20 +23,17 @@ * PURPOSE: Second stage setup * PROGRAMMER: Eric Kohl */ -#define WIN32_NO_STATUS -#include -#include -#include -#include + +#include +#include +#include #include #define NDEBUG #include - typedef DWORD (WINAPI *PINSTALL_REACTOS)(HINSTANCE hInstance); - /* FUNCTIONS ****************************************************************/ LPTSTR lstrchr(LPCTSTR s, TCHAR c) diff --git a/reactos/base/setup/setup/setup.rc b/reactos/base/setup/setup/setup.rc index 23995f168d5..29bdd732865 100644 --- a/reactos/base/setup/setup/setup.rc +++ b/reactos/base/setup/setup/setup.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" #define REACTOS_STR_INTERNAL_NAME "setup\0" #define REACTOS_STR_ORIGINAL_FILENAME "setup.exe\0" diff --git a/reactos/base/setup/usetup/interface/consup.c b/reactos/base/setup/usetup/interface/consup.c index 517a289b1a7..88fd4b960b3 100644 --- a/reactos/base/setup/usetup/interface/consup.c +++ b/reactos/base/setup/usetup/interface/consup.c @@ -26,7 +26,7 @@ /* INCLUDES ******************************************************************/ -#include "usetup.h" +#include #define NDEBUG #include diff --git a/reactos/base/setup/usetup/interface/devinst.c b/reactos/base/setup/usetup/interface/devinst.c index eebb5e3986c..bdda5a284f6 100644 --- a/reactos/base/setup/usetup/interface/devinst.c +++ b/reactos/base/setup/usetup/interface/devinst.c @@ -6,7 +6,7 @@ * PROGRAMMER: Herv Poussineau (hpoussin@reactos.org) */ -#include "usetup.h" +#include #define NDEBUG #include diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index f15efdf936b..c7686e07d8b 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -26,7 +26,7 @@ * Herv Poussineau (hpoussin@reactos.org) */ -#include "usetup.h" +#include #define NDEBUG #include diff --git a/reactos/base/setup/usetup/native/console.c b/reactos/base/setup/usetup/native/console.c index 1e36e12dae1..6971b98f72b 100644 --- a/reactos/base/setup/usetup/native/console.c +++ b/reactos/base/setup/usetup/native/console.c @@ -1,4 +1,4 @@ -#include "usetup.h" +#include BOOLEAN NATIVE_InitConsole( diff --git a/reactos/base/setup/usetup/native/fslist.c b/reactos/base/setup/usetup/native/fslist.c index 509c238322b..c4d6ec91bd5 100644 --- a/reactos/base/setup/usetup/native/fslist.c +++ b/reactos/base/setup/usetup/native/fslist.c @@ -1,4 +1,4 @@ -#include "usetup.h" +#include BOOLEAN NATIVE_CreateFileSystemList( diff --git a/reactos/base/setup/usetup/native/utils/console.c b/reactos/base/setup/usetup/native/utils/console.c index 761cdd79880..21aff2c0235 100644 --- a/reactos/base/setup/usetup/native/utils/console.c +++ b/reactos/base/setup/usetup/native/utils/console.c @@ -26,7 +26,7 @@ /* INCLUDES ******************************************************************/ -#include "usetup.h" +#include /* Blue Driver Header */ #include #include "keytrans.h" diff --git a/reactos/base/setup/usetup/native/utils/keytrans.c b/reactos/base/setup/usetup/native/utils/keytrans.c index 7b70d616bb3..706be848990 100644 --- a/reactos/base/setup/usetup/native/utils/keytrans.c +++ b/reactos/base/setup/usetup/native/utils/keytrans.c @@ -25,7 +25,7 @@ * * NB: Hardcoded to US keyboard */ -#include "usetup.h" +#include #include "keytrans.h" #define NDEBUG diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h index 9f66bd68901..305cb858d5f 100644 --- a/reactos/base/setup/usetup/usetup.h +++ b/reactos/base/setup/usetup/usetup.h @@ -25,13 +25,17 @@ */ /* C Headers */ -#include #include -#include +#include /* PSDK/NDK */ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include +#include + #define NTOS_MODE_USER #include #include @@ -42,12 +46,10 @@ #include #include #include -#include /* Filesystem headers */ #include #include -#include /* DDK Disk Headers */ #include diff --git a/reactos/base/setup/usetup/usetup.rc b/reactos/base/setup/usetup/usetup.rc index a338bc9690c..cc4f49af747 100644 --- a/reactos/base/setup/usetup/usetup.rc +++ b/reactos/base/setup/usetup/usetup.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" #define REACTOS_STR_INTERNAL_NAME "usetup\0" #define REACTOS_STR_ORIGINAL_FILENAME "usetup.dll\0" diff --git a/reactos/base/setup/vmwinst/rsrc.rc b/reactos/base/setup/vmwinst/rsrc.rc index 434db264857..ff942239eae 100644 --- a/reactos/base/setup/vmwinst/rsrc.rc +++ b/reactos/base/setup/vmwinst/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "vmwinst.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Bitmaps */ diff --git a/reactos/base/setup/vmwinst/vmwinst.c b/reactos/base/setup/vmwinst/vmwinst.c index d06fbdad9d4..7058a8a33a5 100644 --- a/reactos/base/setup/vmwinst/vmwinst.c +++ b/reactos/base/setup/vmwinst/vmwinst.c @@ -24,15 +24,19 @@ * PROGRAMMERS: Thomas Weidenmueller (w3seek@users.sourceforge.net) * Klemens Friedl (frik85@hotmail.com) */ -#include -#include + +#include +#include +#include +#include +#include +#include #include -#include -#include #include -#include "vmwinst.h" #include +#include "vmwinst.h" + extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, PCWSTR CmdLineBuffer, INT nCmdShow); diff --git a/reactos/base/setup/vmwinst/vmwinst.rc b/reactos/base/setup/vmwinst/vmwinst.rc index ca0dab428ac..10d0fc9c8d0 100644 --- a/reactos/base/setup/vmwinst/vmwinst.rc +++ b/reactos/base/setup/vmwinst/vmwinst.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "vmwinst.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS VMware(r) driver installation utility\0" diff --git a/reactos/base/setup/welcome/resource.h b/reactos/base/setup/welcome/resource.h index 6a96d2bcb80..525d4add5f6 100644 --- a/reactos/base/setup/welcome/resource.h +++ b/reactos/base/setup/welcome/resource.h @@ -1,3 +1,4 @@ +#pragma once #define IDS_APPTITLE 1000 #define IDS_DEFAULTTOPICTITLE 1001 diff --git a/reactos/base/setup/welcome/rsrc.rc b/reactos/base/setup/welcome/rsrc.rc index 9cf1bbe0579..13f8aab9971 100644 --- a/reactos/base/setup/welcome/rsrc.rc +++ b/reactos/base/setup/welcome/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icons */ diff --git a/reactos/base/setup/welcome/welcome.c b/reactos/base/setup/welcome/welcome.c index 832ed0b71de..57da7b6cdba 100644 --- a/reactos/base/setup/welcome/welcome.c +++ b/reactos/base/setup/welcome/welcome.c @@ -30,16 +30,16 @@ * utility but change the resources! */ +#include +#include +#include +#include +#include #include -#include -#include -#include #include #include "resource.h" - - #define LIGHT_BLUE 0x00F7EFD6 #define DARK_BLUE 0x008C7B6B diff --git a/reactos/base/setup/welcome/welcome.rc b/reactos/base/setup/welcome/welcome.rc index 212fc15ae09..47cb895c052 100644 --- a/reactos/base/setup/welcome/welcome.rc +++ b/reactos/base/setup/welcome/welcome.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS-Welcome\0" diff --git a/reactos/base/shell/cmd/alias.c b/reactos/base/shell/cmd/alias.c index 69ab358f003..577c2404990 100644 --- a/reactos/base/shell/cmd/alias.c +++ b/reactos/base/shell/cmd/alias.c @@ -33,7 +33,7 @@ */ -#include +#include "precomp.h" #ifdef FEATURE_ALIASES diff --git a/reactos/base/shell/cmd/assoc.c b/reactos/base/shell/cmd/assoc.c index ace7a4c4235..b2e7e25492e 100644 --- a/reactos/base/shell/cmd/assoc.c +++ b/reactos/base/shell/cmd/assoc.c @@ -17,7 +17,7 @@ * priveleges to perform an operation */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_ASSOC diff --git a/reactos/base/shell/cmd/attrib.c b/reactos/base/shell/cmd/attrib.c index 8b619d06a8f..91c3e81a7a0 100644 --- a/reactos/base/shell/cmd/attrib.c +++ b/reactos/base/shell/cmd/attrib.c @@ -32,11 +32,10 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_ATTRIB - static VOID PrintAttribute (LPTSTR pszPath, LPTSTR pszFile, BOOL bRecurse) { diff --git a/reactos/base/shell/cmd/batch.c b/reactos/base/shell/cmd/batch.c index 4d9d1719847..fba5fa9f0a8 100644 --- a/reactos/base/shell/cmd/batch.c +++ b/reactos/base/shell/cmd/batch.c @@ -58,8 +58,7 @@ * Remove all hardcode string to En.rc */ -#include - +#include "precomp.h" /* The stack of current batch contexts. * NULL when no batch is active diff --git a/reactos/base/shell/cmd/beep.c b/reactos/base/shell/cmd/beep.c index efe0473624e..30a786b511e 100644 --- a/reactos/base/shell/cmd/beep.c +++ b/reactos/base/shell/cmd/beep.c @@ -24,7 +24,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_BEEP diff --git a/reactos/base/shell/cmd/call.c b/reactos/base/shell/cmd/call.c index 9f71b94cd04..f729c79fde8 100644 --- a/reactos/base/shell/cmd/call.c +++ b/reactos/base/shell/cmd/call.c @@ -28,8 +28,7 @@ * Remove all hardcode string to En.rc */ -#include - +#include "precomp.h" /* * Perform CALL command. diff --git a/reactos/base/shell/cmd/chcp.c b/reactos/base/shell/cmd/chcp.c index 92ddb8ee6aa..ac012f56318 100644 --- a/reactos/base/shell/cmd/chcp.c +++ b/reactos/base/shell/cmd/chcp.c @@ -11,9 +11,7 @@ * Remove all hardcode string to En.rc */ -#include - - +#include "precomp.h" #ifdef INCLUDE_CMD_CHCP diff --git a/reactos/base/shell/cmd/choice.c b/reactos/base/shell/cmd/choice.c index 3503e7db8f2..4fec759d91a 100644 --- a/reactos/base/shell/cmd/choice.c +++ b/reactos/base/shell/cmd/choice.c @@ -19,7 +19,7 @@ * */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_CHOICE diff --git a/reactos/base/shell/cmd/cls.c b/reactos/base/shell/cmd/cls.c index 2cb13d6ac31..8814b5dfbbc 100644 --- a/reactos/base/shell/cmd/cls.c +++ b/reactos/base/shell/cmd/cls.c @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_CLS diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index 5c6fc26c4a4..a995fbcf592 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -141,7 +141,7 @@ * handling for memmory handling need to be improve */ -#include +#include "precomp.h" #include #include diff --git a/reactos/base/shell/cmd/cmd.h b/reactos/base/shell/cmd/cmd.h index c99f0241e33..d23e81c6839 100644 --- a/reactos/base/shell/cmd/cmd.h +++ b/reactos/base/shell/cmd/cmd.h @@ -23,13 +23,15 @@ #pragma once -#include "config.h" +#include -#include +#include +#include +#include +#include #include #include "cmdver.h" - #include "cmddbg.h" #define BREAK_BATCHFILE 1 diff --git a/reactos/base/shell/cmd/cmd.rc b/reactos/base/shell/cmd/cmd.rc index 12a8d3654d5..cbc10e09fef 100644 --- a/reactos/base/shell/cmd/cmd.rc +++ b/reactos/base/shell/cmd/cmd.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #include "cmdver.h" diff --git a/reactos/base/shell/cmd/cmddbg.c b/reactos/base/shell/cmd/cmddbg.c index 59b0a4ef376..476b1b9031b 100644 --- a/reactos/base/shell/cmd/cmddbg.c +++ b/reactos/base/shell/cmd/cmddbg.c @@ -1,4 +1,4 @@ -#include +#include "precomp.h" #ifdef _DEBUG_MEM diff --git a/reactos/base/shell/cmd/cmdinput.c b/reactos/base/shell/cmd/cmdinput.c index 2de70dcbffb..6edfd2dc25e 100644 --- a/reactos/base/shell/cmd/cmdinput.c +++ b/reactos/base/shell/cmd/cmdinput.c @@ -100,8 +100,7 @@ * Added history possibilities to right key. */ -#include - +#include "precomp.h" SHORT maxx; SHORT maxy; diff --git a/reactos/base/shell/cmd/cmdtable.c b/reactos/base/shell/cmd/cmdtable.c index c26407f1f2b..6053958b8a3 100644 --- a/reactos/base/shell/cmd/cmdtable.c +++ b/reactos/base/shell/cmd/cmdtable.c @@ -17,8 +17,7 @@ * Unicode ready! */ -#include - +#include "precomp.h" /* a list of all the internal commands, associating their command names */ /* to the functions to process them */ diff --git a/reactos/base/shell/cmd/color.c b/reactos/base/shell/cmd/color.c index b30fafc57f0..a1c6fdf0dcb 100644 --- a/reactos/base/shell/cmd/color.c +++ b/reactos/base/shell/cmd/color.c @@ -20,14 +20,10 @@ * Move all hardcoded strings to En.rc. */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_COLOR - - - - VOID SetScreenColor (WORD wColor, BOOL bNoFill) { HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); @@ -58,7 +54,6 @@ VOID SetScreenColor (WORD wColor, BOOL bNoFill) } } - /* * color * diff --git a/reactos/base/shell/cmd/console.c b/reactos/base/shell/cmd/console.c index 3148fc5652e..3175bb5ac65 100644 --- a/reactos/base/shell/cmd/console.c +++ b/reactos/base/shell/cmd/console.c @@ -17,8 +17,7 @@ * Fixed ConPrintfPaging */ -#include - +#include "precomp.h" #define OUTPUT_BUFFER_SIZE 4096 diff --git a/reactos/base/shell/cmd/copy.c b/reactos/base/shell/cmd/copy.c index 64c1382b03a..e39bcde2e5f 100644 --- a/reactos/base/shell/cmd/copy.c +++ b/reactos/base/shell/cmd/copy.c @@ -31,7 +31,7 @@ * Copy command is now completed. */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_COPY diff --git a/reactos/base/shell/cmd/date.c b/reactos/base/shell/cmd/date.c index 05548c4001f..b120b419633 100644 --- a/reactos/base/shell/cmd/date.c +++ b/reactos/base/shell/cmd/date.c @@ -31,7 +31,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_DATE diff --git a/reactos/base/shell/cmd/del.c b/reactos/base/shell/cmd/del.c index e19cf77b4ab..f8409c3ae6a 100644 --- a/reactos/base/shell/cmd/del.c +++ b/reactos/base/shell/cmd/del.c @@ -45,7 +45,7 @@ * Preload some nice strings. */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_DEL @@ -550,5 +550,4 @@ INT CommandDelete (LPTSTR param) return 0; } - #endif diff --git a/reactos/base/shell/cmd/delay.c b/reactos/base/shell/cmd/delay.c index 2f80958a9c1..252cf66c62b 100644 --- a/reactos/base/shell/cmd/delay.c +++ b/reactos/base/shell/cmd/delay.c @@ -9,7 +9,7 @@ * */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_DELAY diff --git a/reactos/base/shell/cmd/dir.c b/reactos/base/shell/cmd/dir.c index 3f772da845d..2f9f54677c6 100644 --- a/reactos/base/shell/cmd/dir.c +++ b/reactos/base/shell/cmd/dir.c @@ -134,7 +134,7 @@ * Removed already commented out code of old pagination */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_DIR diff --git a/reactos/base/shell/cmd/dirstack.c b/reactos/base/shell/cmd/dirstack.c index 4a24b0c5a6a..b0853247a49 100644 --- a/reactos/base/shell/cmd/dirstack.c +++ b/reactos/base/shell/cmd/dirstack.c @@ -14,7 +14,7 @@ * Added DIRS command. */ -#include +#include "precomp.h" #ifdef FEATURE_DIRECTORY_STACK diff --git a/reactos/base/shell/cmd/echo.c b/reactos/base/shell/cmd/echo.c index e8114a734ab..272dba95995 100644 --- a/reactos/base/shell/cmd/echo.c +++ b/reactos/base/shell/cmd/echo.c @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" BOOL OnOffCommand(LPTSTR param, LPBOOL flag, INT message) diff --git a/reactos/base/shell/cmd/error.c b/reactos/base/shell/cmd/error.c index aa7eae4bf1a..f90621b6ec4 100644 --- a/reactos/base/shell/cmd/error.c +++ b/reactos/base/shell/cmd/error.c @@ -20,7 +20,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) diff --git a/reactos/base/shell/cmd/filecomp.c b/reactos/base/shell/cmd/filecomp.c index c4c2e04259e..42513c963a0 100644 --- a/reactos/base/shell/cmd/filecomp.c +++ b/reactos/base/shell/cmd/filecomp.c @@ -20,7 +20,7 @@ * Now expands lfn even when trailing " is omitted. */ -#include +#include "precomp.h" #ifdef FEATURE_UNIX_FILENAME_COMPLETION diff --git a/reactos/base/shell/cmd/for.c b/reactos/base/shell/cmd/for.c index b5e68e7e03a..f5919db1366 100644 --- a/reactos/base/shell/cmd/for.c +++ b/reactos/base/shell/cmd/for.c @@ -30,7 +30,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" /* FOR is a special command, so this function is only used for showing help now */ diff --git a/reactos/base/shell/cmd/free.c b/reactos/base/shell/cmd/free.c index 9bf8a430ae9..2d9a600b7b6 100644 --- a/reactos/base/shell/cmd/free.c +++ b/reactos/base/shell/cmd/free.c @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_FREE diff --git a/reactos/base/shell/cmd/goto.c b/reactos/base/shell/cmd/goto.c index fe9afc3aab8..0e90449f5b2 100644 --- a/reactos/base/shell/cmd/goto.c +++ b/reactos/base/shell/cmd/goto.c @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" /* diff --git a/reactos/base/shell/cmd/history.c b/reactos/base/shell/cmd/history.c index 5a85527b225..9b5df8f6f07 100644 --- a/reactos/base/shell/cmd/history.c +++ b/reactos/base/shell/cmd/history.c @@ -37,7 +37,7 @@ * */ -#include +#include "precomp.h" #ifdef FEATURE_HISTORY diff --git a/reactos/base/shell/cmd/if.c b/reactos/base/shell/cmd/if.c index ee74c046632..d7a46c3b18d 100644 --- a/reactos/base/shell/cmd/if.c +++ b/reactos/base/shell/cmd/if.c @@ -30,7 +30,7 @@ * */ -#include +#include "precomp.h" static INT GenericCmp(INT (*StringCmp)(LPCTSTR, LPCTSTR), LPCTSTR Left, LPCTSTR Right) diff --git a/reactos/base/shell/cmd/internal.c b/reactos/base/shell/cmd/internal.c index 73e91d484d8..173b69362c2 100644 --- a/reactos/base/shell/cmd/internal.c +++ b/reactos/base/shell/cmd/internal.c @@ -137,7 +137,7 @@ * Added commands help display to help command (ex. : "help cmd") */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_CHDIR diff --git a/reactos/base/shell/cmd/label.c b/reactos/base/shell/cmd/label.c index bd9eda38761..3ba4130cdd1 100644 --- a/reactos/base/shell/cmd/label.c +++ b/reactos/base/shell/cmd/label.c @@ -17,7 +17,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_LABEL diff --git a/reactos/base/shell/cmd/locale.c b/reactos/base/shell/cmd/locale.c index 9bd9d381c0e..d67a381501b 100644 --- a/reactos/base/shell/cmd/locale.c +++ b/reactos/base/shell/cmd/locale.c @@ -11,8 +11,7 @@ * Unicode safe! */ -#include - +#include "precomp.h" TCHAR cDateSeparator; TCHAR cTimeSeparator; diff --git a/reactos/base/shell/cmd/main.c b/reactos/base/shell/cmd/main.c index 0320cce8128..90242ac54c0 100644 --- a/reactos/base/shell/cmd/main.c +++ b/reactos/base/shell/cmd/main.c @@ -1,4 +1,4 @@ -#include +#include "precomp.h" int _tmain (int argc, const TCHAR *argv[]) { diff --git a/reactos/base/shell/cmd/memory.c b/reactos/base/shell/cmd/memory.c index 2b44ce9b0ab..cf3bc73f48e 100644 --- a/reactos/base/shell/cmd/memory.c +++ b/reactos/base/shell/cmd/memory.c @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_MEMORY diff --git a/reactos/base/shell/cmd/misc.c b/reactos/base/shell/cmd/misc.c index abff7482df5..78056b81a53 100644 --- a/reactos/base/shell/cmd/misc.c +++ b/reactos/base/shell/cmd/misc.c @@ -32,8 +32,7 @@ * Remove all hardcode string to En.rc */ -#include - +#include "precomp.h" /* * get a character out-of-band and honor Ctrl-Break characters diff --git a/reactos/base/shell/cmd/mklink.c b/reactos/base/shell/cmd/mklink.c index f2752adb6bc..9b1bed612ac 100644 --- a/reactos/base/shell/cmd/mklink.c +++ b/reactos/base/shell/cmd/mklink.c @@ -2,7 +2,7 @@ * MKLINK.C - mklink internal command. */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_MKLINK diff --git a/reactos/base/shell/cmd/move.c b/reactos/base/shell/cmd/move.c index 128c2c989ae..df92513ffe9 100644 --- a/reactos/base/shell/cmd/move.c +++ b/reactos/base/shell/cmd/move.c @@ -29,7 +29,7 @@ * added /y and /-y */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_MOVE diff --git a/reactos/base/shell/cmd/msgbox.c b/reactos/base/shell/cmd/msgbox.c index 31658e11683..2e6dbd70480 100644 --- a/reactos/base/shell/cmd/msgbox.c +++ b/reactos/base/shell/cmd/msgbox.c @@ -10,7 +10,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_MSGBOX diff --git a/reactos/base/shell/cmd/parser.c b/reactos/base/shell/cmd/parser.c index f1881857c04..8fa8f4da869 100644 --- a/reactos/base/shell/cmd/parser.c +++ b/reactos/base/shell/cmd/parser.c @@ -3,7 +3,7 @@ * */ -#include +#include "precomp.h" #define C_OP_LOWEST C_MULTI #define C_OP_HIGHEST C_PIPE diff --git a/reactos/base/shell/cmd/path.c b/reactos/base/shell/cmd/path.c index 68a5c920351..5885df5d834 100644 --- a/reactos/base/shell/cmd/path.c +++ b/reactos/base/shell/cmd/path.c @@ -25,7 +25,7 @@ * 30-Apr-2005 (Magnus Olsen) ) * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_PATH diff --git a/reactos/base/shell/cmd/pause.c b/reactos/base/shell/cmd/pause.c index fc56c1399d8..f4a2a0bad85 100644 --- a/reactos/base/shell/cmd/pause.c +++ b/reactos/base/shell/cmd/pause.c @@ -17,7 +17,7 @@ * Unicode ready! */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_PAUSE diff --git a/reactos/base/shell/cmd/precomp.h b/reactos/base/shell/cmd/precomp.h index 7810f24f35e..d55dff9a08d 100644 --- a/reactos/base/shell/cmd/precomp.h +++ b/reactos/base/shell/cmd/precomp.h @@ -5,25 +5,17 @@ #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ #undef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE -#endif//_MSC_VER +#endif /*_MSC_VER */ #include #include + #define WIN32_NO_STATUS -#include -#include -#include - -#include -#include - -#include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include #define NTOS_MODE_USER #include diff --git a/reactos/base/shell/cmd/prompt.c b/reactos/base/shell/cmd/prompt.c index 32a5d195787..893568d629f 100644 --- a/reactos/base/shell/cmd/prompt.c +++ b/reactos/base/shell/cmd/prompt.c @@ -46,7 +46,7 @@ * 30-Apr-2005 (Magnus Olsen) ) * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" /* * print the command-line prompt diff --git a/reactos/base/shell/cmd/redir.c b/reactos/base/shell/cmd/redir.c index d342ffb9a1a..c7bbb831ee5 100644 --- a/reactos/base/shell/cmd/redir.c +++ b/reactos/base/shell/cmd/redir.c @@ -25,7 +25,7 @@ * simple check to fix > and | bug with 'rem' */ -#include +#include "precomp.h" #ifdef FEATURE_REDIRECTION diff --git a/reactos/base/shell/cmd/ren.c b/reactos/base/shell/cmd/ren.c index 004242307ef..204e45fc07b 100644 --- a/reactos/base/shell/cmd/ren.c +++ b/reactos/base/shell/cmd/ren.c @@ -29,7 +29,7 @@ * */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_RENAME diff --git a/reactos/base/shell/cmd/replace.c b/reactos/base/shell/cmd/replace.c index 01bc2ac3bdf..9c941497880 100644 --- a/reactos/base/shell/cmd/replace.c +++ b/reactos/base/shell/cmd/replace.c @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_REPLACE diff --git a/reactos/base/shell/cmd/resource.h b/reactos/base/shell/cmd/resource.h index a840ee223e3..0272ed9c865 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -1,8 +1,7 @@ - +#pragma once #define RC_STRING_MAX_SIZE 3072 - #define STRING_ERROR_PARAMETERF_ERROR 100 #define STRING_ERROR_INVALID_SWITCH 101 #define STRING_ERROR_TOO_MANY_PARAMETERS 102 diff --git a/reactos/base/shell/cmd/screen.c b/reactos/base/shell/cmd/screen.c index 26e66a19f54..0db3ab46c1c 100644 --- a/reactos/base/shell/cmd/screen.c +++ b/reactos/base/shell/cmd/screen.c @@ -11,7 +11,7 @@ * */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_SCREEN diff --git a/reactos/base/shell/cmd/set.c b/reactos/base/shell/cmd/set.c index f8535455e19..486e46a22e9 100644 --- a/reactos/base/shell/cmd/set.c +++ b/reactos/base/shell/cmd/set.c @@ -34,7 +34,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_SET diff --git a/reactos/base/shell/cmd/setlocal.c b/reactos/base/shell/cmd/setlocal.c index 51284c9bdc0..85397bab2a0 100644 --- a/reactos/base/shell/cmd/setlocal.c +++ b/reactos/base/shell/cmd/setlocal.c @@ -7,7 +7,7 @@ * started. */ -#include +#include "precomp.h" typedef struct _SETLOCAL { struct _SETLOCAL *Prev; @@ -127,4 +127,3 @@ INT cmd_endlocal(LPTSTR param) cmd_free(Saved); return 0; } - diff --git a/reactos/base/shell/cmd/shift.c b/reactos/base/shell/cmd/shift.c index e1633d601ed..9497e74e215 100644 --- a/reactos/base/shell/cmd/shift.c +++ b/reactos/base/shell/cmd/shift.c @@ -23,8 +23,7 @@ * Remove all hardcode string to En.rc */ -#include - +#include "precomp.h" /* * Perform the SHIFT command. diff --git a/reactos/base/shell/cmd/start.c b/reactos/base/shell/cmd/start.c index f082c66749d..8935a78a8fa 100644 --- a/reactos/base/shell/cmd/start.c +++ b/reactos/base/shell/cmd/start.c @@ -11,7 +11,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_START diff --git a/reactos/base/shell/cmd/strtoclr.c b/reactos/base/shell/cmd/strtoclr.c index b4601a508af..597c9c05e8a 100644 --- a/reactos/base/shell/cmd/strtoclr.c +++ b/reactos/base/shell/cmd/strtoclr.c @@ -15,8 +15,7 @@ BOOL StringToColor(LPWORD lpColor, LPTSTR*str) is to be called other are internal service functions*/ - -#include +#include "precomp.h" #define _B FOREGROUND_BLUE #define _G FOREGROUND_GREEN diff --git a/reactos/base/shell/cmd/time.c b/reactos/base/shell/cmd/time.c index 78ff91dfc2a..c673818d14f 100644 --- a/reactos/base/shell/cmd/time.c +++ b/reactos/base/shell/cmd/time.c @@ -24,7 +24,7 @@ * Remove all hardcode string to En.rc. */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_TIME diff --git a/reactos/base/shell/cmd/timer.c b/reactos/base/shell/cmd/timer.c index 5d4a3281cc4..02a2b2b786e 100644 --- a/reactos/base/shell/cmd/timer.c +++ b/reactos/base/shell/cmd/timer.c @@ -7,7 +7,7 @@ * started - Paolo Pantaleo */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_TIMER @@ -16,10 +16,6 @@ #define NCS_ON 1 #define NCS_OFF 0 - - - - //print timer value #define PT(format) PrintElapsedTime(GetTickCount()-cT,format) diff --git a/reactos/base/shell/cmd/title.c b/reactos/base/shell/cmd/title.c index 5e1199fdeb0..7eddaa2ab97 100644 --- a/reactos/base/shell/cmd/title.c +++ b/reactos/base/shell/cmd/title.c @@ -9,7 +9,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_TITLE diff --git a/reactos/base/shell/cmd/type.c b/reactos/base/shell/cmd/type.c index 57a7ceae093..ddf6d8a4f7b 100644 --- a/reactos/base/shell/cmd/type.c +++ b/reactos/base/shell/cmd/type.c @@ -26,7 +26,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_TYPE diff --git a/reactos/base/shell/cmd/ver.c b/reactos/base/shell/cmd/ver.c index d707891a225..fa70c57dc43 100644 --- a/reactos/base/shell/cmd/ver.c +++ b/reactos/base/shell/cmd/ver.c @@ -21,7 +21,7 @@ * New version info and some output changes. */ -#include +#include "precomp.h" #include #include diff --git a/reactos/base/shell/cmd/verify.c b/reactos/base/shell/cmd/verify.c index e184891b64c..bebb7559094 100644 --- a/reactos/base/shell/cmd/verify.c +++ b/reactos/base/shell/cmd/verify.c @@ -18,7 +18,7 @@ * Remove all hardcode string to En.rc */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_VERIFY diff --git a/reactos/base/shell/cmd/vol.c b/reactos/base/shell/cmd/vol.c index 0402df8a43a..d7b5e07b5ec 100644 --- a/reactos/base/shell/cmd/vol.c +++ b/reactos/base/shell/cmd/vol.c @@ -20,7 +20,7 @@ * Redirection ready! */ -#include +#include "precomp.h" #ifdef INCLUDE_CMD_VOL diff --git a/reactos/base/shell/cmd/where.c b/reactos/base/shell/cmd/where.c index e4a9e855269..99463571d5b 100644 --- a/reactos/base/shell/cmd/where.c +++ b/reactos/base/shell/cmd/where.c @@ -73,7 +73,7 @@ * */ -#include +#include "precomp.h" /* initial size of environment variable buffer */ diff --git a/reactos/base/shell/cmd/window.c b/reactos/base/shell/cmd/window.c index 1fa23da30bc..504fc0ace9c 100644 --- a/reactos/base/shell/cmd/window.c +++ b/reactos/base/shell/cmd/window.c @@ -16,7 +16,7 @@ */ -#include +#include "precomp.h" #if ( defined(INCLUDE_CMD_WINDOW) || defined(INCLUDE_CMD_ACTIVATE) ) diff --git a/reactos/base/shell/explorer-new/desktop.c b/reactos/base/shell/explorer-new/desktop.c index 4b083c660e0..2ccebb3fc51 100644 --- a/reactos/base/shell/explorer-new/desktop.c +++ b/reactos/base/shell/explorer-new/desktop.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" typedef struct _DESKCREATEINFO { diff --git a/reactos/base/shell/explorer-new/dragdrop.c b/reactos/base/shell/explorer-new/dragdrop.c index 2afb664d9c9..100c84d415b 100644 --- a/reactos/base/shell/explorer-new/dragdrop.c +++ b/reactos/base/shell/explorer-new/dragdrop.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" static const IDropTargetVtbl IDropTargetImpl_Vtbl; diff --git a/reactos/base/shell/explorer-new/explorer.c b/reactos/base/shell/explorer-new/explorer.c index 36c0fafe55d..c3da293e211 100644 --- a/reactos/base/shell/explorer-new/explorer.c +++ b/reactos/base/shell/explorer-new/explorer.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" HINSTANCE hExplorerInstance; HMODULE hUser32; diff --git a/reactos/base/shell/explorer-new/explorer.rc b/reactos/base/shell/explorer-new/explorer.rc index c72ecda8b43..7f76aef539f 100644 --- a/reactos/base/shell/explorer-new/explorer.rc +++ b/reactos/base/shell/explorer-new/explorer.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Explorer\0" diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h index d65c4dc2048..7793d245e1d 100644 --- a/reactos/base/shell/explorer-new/precomp.h +++ b/reactos/base/shell/explorer-new/precomp.h @@ -1,29 +1,31 @@ #ifndef _EXPLORER_PRECOMP__H_ #define _EXPLORER_PRECOMP__H_ #define COBJMACROS -#include -#include -#include -#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include #include #include -#include #include #include "tmschema.h" #include "resource.h" #include "comcsup.h" -#include "todo.h" -#include "initguid.h" +//#include "todo.h" +//#include "initguid.h" #include "undoc.h" /* dynamic imports due to lack of support in msvc linker libs */ diff --git a/reactos/base/shell/explorer-new/settings.c b/reactos/base/shell/explorer-new/settings.c index 3c17dd2af44..b982c9aec3f 100644 --- a/reactos/base/shell/explorer-new/settings.c +++ b/reactos/base/shell/explorer-new/settings.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" ADVANCED_SETTINGS AdvancedSettings; const TCHAR szAdvancedSettingsKey[] = TEXT("Software\\ReactOS\\Features\\Explorer"); diff --git a/reactos/base/shell/explorer-new/startmnu.c b/reactos/base/shell/explorer-new/startmnu.c index 799104c7ad7..e5f2f159276 100644 --- a/reactos/base/shell/explorer-new/startmnu.c +++ b/reactos/base/shell/explorer-new/startmnu.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /* * Start menu button context menu diff --git a/reactos/base/shell/explorer-new/taskband.c b/reactos/base/shell/explorer-new/taskband.c index bdb1425c8e2..dc7a54f5ba8 100644 --- a/reactos/base/shell/explorer-new/taskband.c +++ b/reactos/base/shell/explorer-new/taskband.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /***************************************************************************** ** ITaskBand **************************************************************** diff --git a/reactos/base/shell/explorer-new/taskswnd.c b/reactos/base/shell/explorer-new/taskswnd.c index 7d3db2553ce..54ee6436439 100644 --- a/reactos/base/shell/explorer-new/taskswnd.c +++ b/reactos/base/shell/explorer-new/taskswnd.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ diff --git a/reactos/base/shell/explorer-new/tbsite.c b/reactos/base/shell/explorer-new/tbsite.c index 7a7e4e066fd..3cc190dd1e6 100644 --- a/reactos/base/shell/explorer-new/tbsite.c +++ b/reactos/base/shell/explorer-new/tbsite.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /***************************************************************************** ** ITrayBandSite ************************************************************ diff --git a/reactos/base/shell/explorer-new/trayntfy.c b/reactos/base/shell/explorer-new/trayntfy.c index b883a33c395..aa877a8f1a0 100644 --- a/reactos/base/shell/explorer-new/trayntfy.c +++ b/reactos/base/shell/explorer-new/trayntfy.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "precomp.h" +//#include /* * SysPagerWnd diff --git a/reactos/base/shell/explorer-new/trayprop.c b/reactos/base/shell/explorer-new/trayprop.c index 365f177b54e..1d77a150ebd 100644 --- a/reactos/base/shell/explorer-new/trayprop.c +++ b/reactos/base/shell/explorer-new/trayprop.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" typedef struct _PROPSHEET_INFO { diff --git a/reactos/base/shell/explorer-new/traywnd.c b/reactos/base/shell/explorer-new/traywnd.c index ab1ff82fa23..94b936a2e6a 100644 --- a/reactos/base/shell/explorer-new/traywnd.c +++ b/reactos/base/shell/explorer-new/traywnd.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" static const TRAYWINDOW_CTXMENU TrayWindowCtxMenu; diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp index 207d3e58de5..7a84b7edd2f 100644 --- a/reactos/base/shell/explorer/explorer.cpp +++ b/reactos/base/shell/explorer/explorer.cpp @@ -32,14 +32,16 @@ #include "resource.h" -#include // for setlocale() +//#include // for setlocale() + +#include #ifndef __WINE__ #include // for dup2() #include // for _O_RDONLY #endif -#include "dialogs/settings.h" // for MdiSdiDlg +//#include "dialogs/settings.h" // for MdiSdiDlg #include "services/shellservices.h" diff --git a/reactos/base/shell/explorer/explorer.rc b/reactos/base/shell/explorer/explorer.rc index 10aa03a78ff..5ea0d3dc07b 100644 --- a/reactos/base/shell/explorer/explorer.rc +++ b/reactos/base/shell/explorer/explorer.rc @@ -1,5 +1,3 @@ -/* $Id: explorer.rc 17951 2005-09-20 19:51:27Z mf $ */ - #include "explorer_intres.rc" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Explorer\0" diff --git a/reactos/base/shell/explorer/explorer_intres.rc b/reactos/base/shell/explorer/explorer_intres.rc index ce06091887e..42348af7295 100644 --- a/reactos/base/shell/explorer/explorer_intres.rc +++ b/reactos/base/shell/explorer/explorer_intres.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include +#include +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/reactos/base/shell/explorer/i386-stub-win32.c b/reactos/base/shell/explorer/i386-stub-win32.c index 5262ee359b9..c100c521c9a 100644 --- a/reactos/base/shell/explorer/i386-stub-win32.c +++ b/reactos/base/shell/explorer/i386-stub-win32.c @@ -460,7 +460,7 @@ _returnFromException () #ifdef WIN32 //MF #define WIN32_LEAN_AND_MEAN -#include +//#include void handle_exception(int exceptionVector); @@ -1157,7 +1157,7 @@ void disable_debugging() } } - +#define _INC_WINDOWS #include #ifdef _MSC_VER #pragma comment(lib, "wsock32") diff --git a/reactos/base/shell/explorer/notifyhook/notifyhook.rc b/reactos/base/shell/explorer/notifyhook/notifyhook.rc index 096ed22d9fb..385f797a84b 100644 --- a/reactos/base/shell/explorer/notifyhook/notifyhook.rc +++ b/reactos/base/shell/explorer/notifyhook/notifyhook.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NotifyHook DLL for ROS Explorer\0" #define REACTOS_STR_INTERNAL_NAME "notifyhook\0" diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h index f6d290af7a0..1caf6f50d5e 100644 --- a/reactos/base/shell/explorer/precomp.h +++ b/reactos/base/shell/explorer/precomp.h @@ -28,8 +28,17 @@ #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 1 -#include -#include "shlwapi.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include #include "utility/utility.h" diff --git a/reactos/base/shell/explorer/utility/utility.h b/reactos/base/shell/explorer/utility/utility.h index 10a47154aa1..262505d73f3 100644 --- a/reactos/base/shell/explorer/utility/utility.h +++ b/reactos/base/shell/explorer/utility/utility.h @@ -28,8 +28,15 @@ // standard windows headers #define WIN32_LEAN_AND_MEAN #define WIN32_EXTRA_LEAN -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include + +//#include // Unicode support #if defined(UNICODE) && !defined(_UNICODE) @@ -41,13 +48,13 @@ #include #include -#include // for VARIANT +//#include // for VARIANT -#include // for alloca() +//#include // for alloca() #include -#include // for _MAX_DIR, ... -#include // for sprintf() -#include +//#include // for _MAX_DIR, ... +//#include // for sprintf() +//#include #ifdef __cplusplus diff --git a/reactos/base/shell/explorer/utility/xmlstorage.h b/reactos/base/shell/explorer/utility/xmlstorage.h index 1913bdc9012..992acbf324b 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.h +++ b/reactos/base/shell/explorer/utility/xmlstorage.h @@ -157,8 +157,8 @@ typedef XMLCh XML_Char; #ifdef _WIN32 -#include // for LPCTSTR -#include +//#include // for LPCTSTR +//#include #include #ifndef _MSC_VER diff --git a/reactos/base/system/autochk/autochk.c b/reactos/base/system/autochk/autochk.c index abe4d95da12..50bf14f315a 100644 --- a/reactos/base/system/autochk/autochk.c +++ b/reactos/base/system/autochk/autochk.c @@ -11,7 +11,8 @@ #include #define WIN32_NO_STATUS -#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/base/system/bootok/bootok.c b/reactos/base/system/bootok/bootok.c index f9aec2c9fe3..9477f1b4b2b 100644 --- a/reactos/base/system/bootok/bootok.c +++ b/reactos/base/system/bootok/bootok.c @@ -8,10 +8,11 @@ /* INCLUDES *****************************************************************/ -#include #include #define WIN32_NO_STATUS -#include +#include +#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/base/system/diskpart/diskpart.h b/reactos/base/system/diskpart/diskpart.h index 77fb33ac851..299e8715977 100644 --- a/reactos/base/system/diskpart/diskpart.h +++ b/reactos/base/system/diskpart/diskpart.h @@ -11,10 +11,13 @@ /* INCLUDES ******************************************************************/ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include -#include -#include +#include #include "resource.h" diff --git a/reactos/base/system/expand/expand.c b/reactos/base/system/expand/expand.c index deb558bfb7f..6aa288d0643 100644 --- a/reactos/base/system/expand/expand.c +++ b/reactos/base/system/expand/expand.c @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include -#include -#include #include #include diff --git a/reactos/base/system/expand/expand.rc b/reactos/base/system/expand/expand.rc index 3c4581ceacb..0b95a9bc81d 100644 --- a/reactos/base/system/expand/expand.rc +++ b/reactos/base/system/expand/expand.rc @@ -1,4 +1,3 @@ -#include #define REACTOS_STR_FILE_DESCRIPTION "ReactOS File Expansion Utility Version 1.0 \0" #define REACTOS_STR_INTERNAL_NAME "expand\0" #define REACTOS_STR_ORIGINAL_FILENAME "expand.exe\0" diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c index a8471ba205e..5d2a166b68a 100644 --- a/reactos/base/system/format/format.c +++ b/reactos/base/system/format/format.c @@ -1,13 +1,17 @@ // Copyright (c) 1998 Mark Russinovich // Systems Internals // http://www.sysinternals.com + +#define WIN32_NO_STATUS #include -#include -#include -#include +#include +#include +#include +#include #include #include #include + #include "resource.h" // Globals @@ -609,4 +613,3 @@ _tmain(int argc, TCHAR *argv[]) return 0; } - diff --git a/reactos/base/system/format/format.rc b/reactos/base/system/format/format.rc index db220c6a2bd..d0891b896c9 100644 --- a/reactos/base/system/format/format.rc +++ b/reactos/base/system/format/format.rc @@ -1,4 +1,7 @@ -#include +#include + +#include "resource.h" + #define REACTOS_STR_FILE_DESCRIPTION "Formating a device with a filesystem \0" #define REACTOS_STR_INTERNAL_NAME "format\0" #define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" diff --git a/reactos/base/system/format/resource.h b/reactos/base/system/format/resource.h index 23c7fdc6824..ef283affeb9 100644 --- a/reactos/base/system/format/resource.h +++ b/reactos/base/system/format/resource.h @@ -1,4 +1,4 @@ - +#pragma once #define RC_STRING_MAX_SIZE 4096 diff --git a/reactos/base/system/format/rsrc.rc b/reactos/base/system/format/rsrc.rc index 734c31104e3..7d68bd8eab3 100644 --- a/reactos/base/system/format/rsrc.rc +++ b/reactos/base/system/format/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 diff --git a/reactos/base/system/lsass/lsass.c b/reactos/base/system/lsass/lsass.c index 0a97fc55d51..301e2774779 100644 --- a/reactos/base/system/lsass/lsass.c +++ b/reactos/base/system/lsass/lsass.c @@ -25,13 +25,12 @@ * Compiled successfully with egcs 1.1.2 */ #define WIN32_NO_STATUS -#include #define NTOS_MODE_USER + #include #include #include -#include #define NDEBUG #include diff --git a/reactos/base/system/lsass/lsass.rc b/reactos/base/system/lsass/lsass.rc index 351162c898e..7e9e7392c94 100644 --- a/reactos/base/system/lsass/lsass.rc +++ b/reactos/base/system/lsass/lsass.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "Local Security Authority\0" #define REACTOS_STR_INTERNAL_NAME "lsass\0" #define REACTOS_STR_ORIGINAL_FILENAME "lsass.exe\0" diff --git a/reactos/base/system/msiexec/msiexec.c b/reactos/base/system/msiexec/msiexec.c index 70e32556239..7f2dc2ae894 100644 --- a/reactos/base/system/msiexec/msiexec.c +++ b/reactos/base/system/msiexec/msiexec.c @@ -19,15 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include #include #include #include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msiexec); diff --git a/reactos/base/system/msiexec/rsrc.rc b/reactos/base/system/msiexec/rsrc.rc index 2594c51b0b1..43ab405b2c4 100644 --- a/reactos/base/system/msiexec/rsrc.rc +++ b/reactos/base/system/msiexec/rsrc.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" diff --git a/reactos/base/system/msiexec/service.c b/reactos/base/system/msiexec/service.c index 3ccdb5bb58b..1edfa4691aa 100644 --- a/reactos/base/system/msiexec/service.c +++ b/reactos/base/system/msiexec/service.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN - -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include - -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msiexec); diff --git a/reactos/base/system/regsvr32/regsvr32.c b/reactos/base/system/regsvr32/regsvr32.c index c3e4d86c3e0..628255f5980 100644 --- a/reactos/base/system/regsvr32/regsvr32.c +++ b/reactos/base/system/regsvr32/regsvr32.c @@ -9,8 +9,6 @@ * PROGRAMMER: ShadowFlare (blakflare@hotmail.com) */ -#define WIN32_LEAN_AND_MEAN - // Both UNICODE and _UNICODE must be either defined or undefined // because some headers use UNICODE and others use _UNICODE #ifdef UNICODE @@ -23,11 +21,13 @@ #endif #endif -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include -#include -#include -#include #include typedef HRESULT (WINAPI *DLLREGISTER)(void); @@ -52,8 +52,6 @@ LPCWSTR tszDllInstall = L"DllInstall"; #define tszDllInstall szDllInstall #endif - - #include "resource.h" LPCTSTR ModuleTitle = _T("RegSvr32"); @@ -67,7 +65,6 @@ TCHAR MissingEntry[RC_STRING_MAX_SIZE]; TCHAR FailureMessage[RC_STRING_MAX_SIZE]; TCHAR SuccessMessage[RC_STRING_MAX_SIZE]; - // The macro CommandLineToArgv maps to a function that converts // a command-line string to argc and argv similar to the ones // in the standard main function. If this code is compiled for @@ -482,4 +479,3 @@ int WINAPI _tWinMain( OleUninitialize(); return nRetValue; } - diff --git a/reactos/base/system/regsvr32/regsvr32.rc b/reactos/base/system/regsvr32/regsvr32.rc index ff11add3285..0fda4d6a2a0 100644 --- a/reactos/base/system/regsvr32/regsvr32.rc +++ b/reactos/base/system/regsvr32/regsvr32.rc @@ -1,6 +1,7 @@ -/* $Id$ */ +#include + +#include "resource.h" -#include #define REACTOS_STR_FILE_DESCRIPTION "Register a COM component in the registry\0" #define REACTOS_STR_INTERNAL_NAME "regsvr32\0" #define REACTOS_STR_ORIGINAL_FILENAME "regsvr32.exe\0" diff --git a/reactos/base/system/regsvr32/resource.h b/reactos/base/system/regsvr32/resource.h index 75c6bbb87af..cef71ce9606 100644 --- a/reactos/base/system/regsvr32/resource.h +++ b/reactos/base/system/regsvr32/resource.h @@ -1,4 +1,4 @@ - +#pragma once #define RC_STRING_MAX_SIZE 4096 #define IDS_UsageMessage 100 diff --git a/reactos/base/system/regsvr32/rsrc.rc b/reactos/base/system/regsvr32/rsrc.rc index bd8c21e0938..877d19c5035 100644 --- a/reactos/base/system/regsvr32/rsrc.rc +++ b/reactos/base/system/regsvr32/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 diff --git a/reactos/base/system/rundll32/CMakeLists.txt b/reactos/base/system/rundll32/CMakeLists.txt index 365085f306e..078d85aa103 100644 --- a/reactos/base/system/rundll32/CMakeLists.txt +++ b/reactos/base/system/rundll32/CMakeLists.txt @@ -1,5 +1,3 @@ - -include_directories(.) add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui UNICODE) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) diff --git a/reactos/base/system/rundll32/resource.h b/reactos/base/system/rundll32/resource.h index 83c4a596ad0..d46c7aca67a 100644 --- a/reactos/base/system/rundll32/resource.h +++ b/reactos/base/system/rundll32/resource.h @@ -1,4 +1,4 @@ - +#pragma once #define RC_STRING_MAX_SIZE 200 #define IDS_DllNotLoaded 100 diff --git a/reactos/base/system/rundll32/rsrc.rc b/reactos/base/system/rundll32/rsrc.rc index 3ccfa685a0f..db893c9c35a 100644 --- a/reactos/base/system/rundll32/rsrc.rc +++ b/reactos/base/system/rundll32/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 diff --git a/reactos/base/system/rundll32/rundll32.c b/reactos/base/system/rundll32/rundll32.c index b8e71b031da..82a97fe374a 100644 --- a/reactos/base/system/rundll32/rundll32.c +++ b/reactos/base/system/rundll32/rundll32.c @@ -9,8 +9,6 @@ * PROGRAMMER: ShadowFlare (blakflare@hotmail.com) */ -#define WIN32_LEAN_AND_MEAN - // Both UNICODE and _UNICODE must be either defined or undefined // because some headers use UNICODE and others use _UNICODE #ifdef UNICODE @@ -23,11 +21,15 @@ #endif #endif -#include -#include -#include -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include #include + #include "resource.h" typedef int (WINAPI *DllWinMainW)( diff --git a/reactos/base/system/rundll32/rundll32.rc b/reactos/base/system/rundll32/rundll32.rc index 1be04e3bd13..ebe8b241096 100644 --- a/reactos/base/system/rundll32/rundll32.rc +++ b/reactos/base/system/rundll32/rundll32.rc @@ -1,6 +1,7 @@ -/* $Id$ */ +#include + +#include "resource.h" -#include #define REACTOS_STR_FILE_DESCRIPTION "Run a DLL as an App\0" #define REACTOS_STR_INTERNAL_NAME "rundll32\0" #define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe\0" diff --git a/reactos/base/system/runonce/runonce.c b/reactos/base/system/runonce/runonce.c index 3cbd7b7a173..3d84a4bd11b 100644 --- a/reactos/base/system/runonce/runonce.c +++ b/reactos/base/system/runonce/runonce.c @@ -7,7 +7,6 @@ #include "runonce.h" - static DWORD WINAPI diff --git a/reactos/base/system/runonce/runonce.h b/reactos/base/system/runonce/runonce.h index 9e9c5849d6c..510fa2ba0b2 100644 --- a/reactos/base/system/runonce/runonce.h +++ b/reactos/base/system/runonce/runonce.h @@ -1,6 +1,11 @@ #pragma once -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include #include "resource.h" diff --git a/reactos/base/system/runonce/runonce.rc b/reactos/base/system/runonce/runonce.rc index 493ce7df7b1..6e27ac49158 100644 --- a/reactos/base/system/runonce/runonce.rc +++ b/reactos/base/system/runonce/runonce.rc @@ -1,4 +1,7 @@ -#include "runonce.h" +#include +#include + +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Run Once Wrapper\0" #define REACTOS_STR_INTERNAL_NAME "runonce\0" diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h index d8c8c377368..076ea38cbd8 100644 --- a/reactos/base/system/services/services.h +++ b/reactos/base/system/services/services.h @@ -4,16 +4,18 @@ #include #include + #define WIN32_NO_STATUS -#include +#include +#include +#include #include #define NTOS_MODE_USER #include #include #include #include -#include "svcctl_s.h" - +#include typedef struct _SERVICE_GROUP { @@ -188,4 +190,3 @@ VOID ScmLogError(DWORD dwEventId, VOID ScmWaitForLsa(VOID); /* EOF */ - diff --git a/reactos/base/system/services/services.rc b/reactos/base/system/services/services.rc index fd108fca99a..7b617b764bf 100644 --- a/reactos/base/system/services/services.rc +++ b/reactos/base/system/services/services.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager\0" #define REACTOS_STR_INTERNAL_NAME "Services\0" #define REACTOS_STR_ORIGINAL_FILENAME "Services.exe\0" diff --git a/reactos/base/system/smss/crashdmp.c b/reactos/base/system/smss/crashdmp.c index a956d8b338e..1ce871f592e 100644 --- a/reactos/base/system/smss/crashdmp.c +++ b/reactos/base/system/smss/crashdmp.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/pagefile.c b/reactos/base/system/smss/pagefile.c index 27c60ee1e3e..115d93949b9 100644 --- a/reactos/base/system/smss/pagefile.c +++ b/reactos/base/system/smss/pagefile.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/sminit.c b/reactos/base/system/smss/sminit.c index cdb9314dfea..2e11fa652a9 100644 --- a/reactos/base/system/smss/sminit.c +++ b/reactos/base/system/smss/sminit.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smloop.c b/reactos/base/system/smss/smloop.c index 75948ebf6de..35fbb9ceeee 100644 --- a/reactos/base/system/smss/smloop.c +++ b/reactos/base/system/smss/smloop.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smsbapi.c b/reactos/base/system/smss/smsbapi.c index d72b582691b..d73bb4053b8 100644 --- a/reactos/base/system/smss/smsbapi.c +++ b/reactos/base/system/smss/smsbapi.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smsessn.c b/reactos/base/system/smss/smsessn.c index 6cee473dc79..805f99c9857 100644 --- a/reactos/base/system/smss/smsessn.c +++ b/reactos/base/system/smss/smsessn.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smss.c b/reactos/base/system/smss/smss.c index 8da368aa661..2f24138b1d5 100644 --- a/reactos/base/system/smss/smss.c +++ b/reactos/base/system/smss/smss.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smss.h b/reactos/base/system/smss/smss.h index dabd9dc68b4..807536b804c 100644 --- a/reactos/base/system/smss/smss.h +++ b/reactos/base/system/smss/smss.h @@ -14,7 +14,13 @@ // Native Headers // #define WIN32_NO_STATUS -#include // Should just be using ntdef.h I think +#include +#include +#include +#include +#include + +#include #define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) #define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) #ifdef ENABLE_RTL_NUMBER_OF_V2 @@ -23,12 +29,23 @@ #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) #endif #define NTOS_MODE_USER -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // // SM Protocol Header // -#include "sm/smmsg.h" +#include /* DEFINES ********************************************************************/ diff --git a/reactos/base/system/smss/smsubsys.c b/reactos/base/system/smss/smsubsys.c index 4a93e201e76..0ddc0c2dd9e 100644 --- a/reactos/base/system/smss/smsubsys.c +++ b/reactos/base/system/smss/smsubsys.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/smss/smutil.c b/reactos/base/system/smss/smutil.c index af472c21b42..667cbd1e7e4 100644 --- a/reactos/base/system/smss/smutil.c +++ b/reactos/base/system/smss/smutil.c @@ -10,7 +10,7 @@ #include "smss.h" #define NDEBUG -#include "debug.h" +#include /* GLOBALS ********************************************************************/ diff --git a/reactos/base/system/subst/resource.h b/reactos/base/system/subst/resource.h index 9baa5b31a61..a7558936fca 100644 --- a/reactos/base/system/subst/resource.h +++ b/reactos/base/system/subst/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define RC_STRING_MAX_SIZE 2048 /* Strings */ diff --git a/reactos/base/system/subst/rsrc.rc b/reactos/base/system/subst/rsrc.rc index 456197ca11c..ef1490c0493 100644 --- a/reactos/base/system/subst/rsrc.rc +++ b/reactos/base/system/subst/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // UTF-8 diff --git a/reactos/base/system/subst/subst.c b/reactos/base/system/subst/subst.c index 3bfad0cae3e..b9ddaff4e12 100644 --- a/reactos/base/system/subst/subst.c +++ b/reactos/base/system/subst/subst.c @@ -7,13 +7,17 @@ /* INCLUDES *****************************************************************/ -#define LEAN_AND_MEAN -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include -#include #include + #define NDEBUG #include + #include "resource.h" /* FUNCTIONS ****************************************************************/ diff --git a/reactos/base/system/subst/subst.rc b/reactos/base/system/subst/subst.rc index db0df66fd9d..91ffe4be4b8 100644 --- a/reactos/base/system/subst/subst.rc +++ b/reactos/base/system/subst/subst.rc @@ -1,4 +1,7 @@ -#include +#include + +#include "resource.h" + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Virtual Drive Utility Version 1.0 \0" #define REACTOS_STR_INTERNAL_NAME "subst\0" #define REACTOS_STR_ORIGINAL_FILENAME "subst.exe\0" diff --git a/reactos/base/system/userinit/resource.h b/reactos/base/system/userinit/resource.h index ab26523f006..36b7fd3a191 100644 --- a/reactos/base/system/userinit/resource.h +++ b/reactos/base/system/userinit/resource.h @@ -1,12 +1,4 @@ +#pragma once + #define RC_STRING_MAX_SIZE 2048 #define STRING_USERINIT_FAIL 100 - - - - - - - - - - diff --git a/reactos/base/system/userinit/rsrc.rc b/reactos/base/system/userinit/rsrc.rc index ef846ddf123..a95103ac745 100644 --- a/reactos/base/system/userinit/rsrc.rc +++ b/reactos/base/system/userinit/rsrc.rc @@ -1,7 +1,3 @@ - -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL // UTF-8 diff --git a/reactos/base/system/userinit/userinit.c b/reactos/base/system/userinit/userinit.c index 3f9d97bd259..e1a6fd23f55 100644 --- a/reactos/base/system/userinit/userinit.c +++ b/reactos/base/system/userinit/userinit.c @@ -23,15 +23,24 @@ * PROGRAMMERS: Thomas Weidenmueller (w3seek@users.sourceforge.net) * Herv Poussineau (hpoussin@reactos.org) */ -#include -#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "resource.h" #include +#include "resource.h" + WINE_DEFAULT_DEBUG_CHANNEL(userinit); #define CMP_MAGIC 0x01234567 diff --git a/reactos/base/system/userinit/userinit.rc b/reactos/base/system/userinit/userinit.rc index a3d1cac4be1..f0e0fd7aedb 100644 --- a/reactos/base/system/userinit/userinit.rc +++ b/reactos/base/system/userinit/userinit.rc @@ -1,5 +1,6 @@ -/* $Id$ */ -#include +#include + +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "Userinit Logon Application\0" #define REACTOS_STR_INTERNAL_NAME "userinit\0" diff --git a/reactos/base/system/winlogon/environment.c b/reactos/base/system/winlogon/environment.c index 972d09c43bc..7bb3f380113 100644 --- a/reactos/base/system/winlogon/environment.c +++ b/reactos/base/system/winlogon/environment.c @@ -11,9 +11,6 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" -#include - -#include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/base/system/winlogon/resource.h b/reactos/base/system/winlogon/resource.h index 14b279417c8..3de720ff661 100644 --- a/reactos/base/system/winlogon/resource.h +++ b/reactos/base/system/winlogon/resource.h @@ -1,3 +1,5 @@ +#pragma once + /* Dialogs */ #define IDD_GINALOADFAILED 400 #define IDD_SHUTDOWNCOMPUTER 300 diff --git a/reactos/base/system/winlogon/rsrc.rc b/reactos/base/system/winlogon/rsrc.rc index e5fc3e3a77b..7509c684b76 100644 --- a/reactos/base/system/winlogon/rsrc.rc +++ b/reactos/base/system/winlogon/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* IDI_WINLOGON ICON "resources/winlogon.ico" */ diff --git a/reactos/base/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c index cc59e3f3e91..dfbe97eee29 100644 --- a/reactos/base/system/winlogon/sas.c +++ b/reactos/base/system/winlogon/sas.c @@ -13,8 +13,6 @@ #include "winlogon.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(winlogon); /* GLOBALS ******************************************************************/ diff --git a/reactos/base/system/winlogon/screensaver.c b/reactos/base/system/winlogon/screensaver.c index ba3e8d04f2a..4765d1c524b 100644 --- a/reactos/base/system/winlogon/screensaver.c +++ b/reactos/base/system/winlogon/screensaver.c @@ -10,8 +10,6 @@ #include "winlogon.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(winlogon); /* FUNCTIONS ****************************************************************/ diff --git a/reactos/base/system/winlogon/setup.c b/reactos/base/system/winlogon/setup.c index 4c9b01f3fea..31842902f64 100644 --- a/reactos/base/system/winlogon/setup.c +++ b/reactos/base/system/winlogon/setup.c @@ -10,8 +10,6 @@ #include "winlogon.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(winlogon); /* FUNCTIONS ****************************************************************/ diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c index eb3d05404cb..e182ecdf13e 100644 --- a/reactos/base/system/winlogon/winlogon.c +++ b/reactos/base/system/winlogon/winlogon.c @@ -12,8 +12,6 @@ #include "winlogon.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(winlogon); /* GLOBALS ******************************************************************/ diff --git a/reactos/base/system/winlogon/winlogon.h b/reactos/base/system/winlogon/winlogon.h index f344fe369be..1f0e685ef76 100644 --- a/reactos/base/system/winlogon/winlogon.h +++ b/reactos/base/system/winlogon/winlogon.h @@ -29,8 +29,9 @@ #define USE_GETLASTINPUTINFO #define WIN32_NO_STATUS -#include +#define WIN32_LEAN_AND_MEAN #include +#include #include #include #include @@ -38,14 +39,14 @@ #include #include #include -#include -#include #include #include #include #include +#include + #include "setup.h" #include "resource.h" diff --git a/reactos/base/system/winlogon/winlogon.rc b/reactos/base/system/winlogon/winlogon.rc index a13ca75bc83..acf6e0d06cc 100644 --- a/reactos/base/system/winlogon/winlogon.rc +++ b/reactos/base/system/winlogon/winlogon.rc @@ -1,6 +1,6 @@ -/* $Id$ */ +#include +#include -#include #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application\0" diff --git a/reactos/base/system/winlogon/wlx.c b/reactos/base/system/winlogon/wlx.c index 3258c19b166..f2bcfd4e964 100644 --- a/reactos/base/system/winlogon/wlx.c +++ b/reactos/base/system/winlogon/wlx.c @@ -12,8 +12,6 @@ #include "winlogon.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(winlogon); #define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \ diff --git a/reactos/dll/3rdparty/libjpeg/jerror.c b/reactos/dll/3rdparty/libjpeg/jerror.c index 3da7be86a00..e258755ba9d 100644 --- a/reactos/dll/3rdparty/libjpeg/jerror.c +++ b/reactos/dll/3rdparty/libjpeg/jerror.c @@ -25,6 +25,8 @@ #include "jerror.h" #ifdef USE_WINDOWS_MESSAGEBOX +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include #endif diff --git a/reactos/dll/3rdparty/libpng/pngpriv.h b/reactos/dll/3rdparty/libpng/pngpriv.h index 9b69f8c145d..b647e072d56 100644 --- a/reactos/dll/3rdparty/libpng/pngpriv.h +++ b/reactos/dll/3rdparty/libpng/pngpriv.h @@ -350,6 +350,8 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp; #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ defined(_WIN32) || defined(__WIN32__) +# define WIN32_NO_STATUS +# define WIN32_LEAN_AND_MEAN # include /* defines _WINDOWS_ macro */ #endif diff --git a/reactos/dll/3rdparty/libxslt/security.c b/reactos/dll/3rdparty/libxslt/security.c index b766cf7f979..0a300d5e443 100644 --- a/reactos/dll/3rdparty/libxslt/security.c +++ b/reactos/dll/3rdparty/libxslt/security.c @@ -35,7 +35,7 @@ #endif #if defined(WIN32) && !defined(__CYGWIN__) -#include +//#include #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif diff --git a/reactos/dll/3rdparty/libxslt/xsltlocale.h b/reactos/dll/3rdparty/libxslt/xsltlocale.h index 59343b0aa26..0033729607c 100644 --- a/reactos/dll/3rdparty/libxslt/xsltlocale.h +++ b/reactos/dll/3rdparty/libxslt/xsltlocale.h @@ -28,7 +28,11 @@ typedef xmlChar xsltLocaleChar; #elif defined(XSLT_LOCALE_WINAPI) -#include +//#include + +#define WIN32_NO_STATUS +#include +#include #include typedef LCID xsltLocale; diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h index 0a10a461ade..b642894df7d 100644 --- a/reactos/dll/cpl/access/access.h +++ b/reactos/dll/cpl/access/access.h @@ -1,9 +1,12 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include #include #include "resource.h" diff --git a/reactos/dll/cpl/access/access.rc b/reactos/dll/cpl/access/access.rc index ae49a7d0ea8..ca418b29d9c 100644 --- a/reactos/dll/cpl/access/access.rc +++ b/reactos/dll/cpl/access/access.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/access/rsrc.rc b/reactos/dll/cpl/access/rsrc.rc index 4a4b575b604..7ee21acbe02 100644 --- a/reactos/dll/cpl/access/rsrc.rc +++ b/reactos/dll/cpl/access/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/appwiz/appwiz.h b/reactos/dll/cpl/appwiz/appwiz.h index 355cffc86a1..bffe9324276 100644 --- a/reactos/dll/cpl/appwiz/appwiz.h +++ b/reactos/dll/cpl/appwiz/appwiz.h @@ -1,18 +1,16 @@ #define COBJMACROS -#include -#include -#include -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include +#include +#include +#include +#include +#include +#include #include -#include -#include #include -#include -#include -#include #include "resource.h" diff --git a/reactos/dll/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc index 94ff3b59381..64ed0e8a871 100644 --- a/reactos/dll/cpl/appwiz/appwiz.rc +++ b/reactos/dll/cpl/appwiz/appwiz.rc @@ -1,5 +1,7 @@ +#include +#include + #include "resource.h" -#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/appwiz/rsrc.rc b/reactos/dll/cpl/appwiz/rsrc.rc index 10e56c616cd..5ed12b937cb 100644 --- a/reactos/dll/cpl/appwiz/rsrc.rc +++ b/reactos/dll/cpl/appwiz/rsrc.rc @@ -1,6 +1,3 @@ -#include "resource.h" -#include - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/console/console.h b/reactos/dll/cpl/console/console.h index c7d1619f68c..1d86befd070 100644 --- a/reactos/dll/cpl/console/console.h +++ b/reactos/dll/cpl/console/console.h @@ -1,14 +1,18 @@ #ifndef CONSOLE_H__ #define CONSOLE_H__ -#include "ntstatus.h" #define WIN32_NO_STATUS -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include + #include "resource.h" typedef struct @@ -52,7 +56,6 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); #define PM_APPLY_CONSOLE_INFO (WM_APP + 100) - // Globals extern HINSTANCE hApplet; diff --git a/reactos/dll/cpl/console/console.rc b/reactos/dll/cpl/console/console.rc index d4f5ad07b7f..d42e9f95eb0 100644 --- a/reactos/dll/cpl/console/console.rc +++ b/reactos/dll/cpl/console/console.rc @@ -6,8 +6,9 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald@student.tugraz.at) */ +#include +#include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/cpl/console/rsrc.rc b/reactos/dll/cpl/console/rsrc.rc index 2d3ff18dddb..47a163f4762 100644 --- a/reactos/dll/cpl/console/rsrc.rc +++ b/reactos/dll/cpl/console/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h index d6d8e692eb6..207cc7a84fc 100644 --- a/reactos/dll/cpl/desk/desk.h +++ b/reactos/dll/cpl/desk/desk.h @@ -1,11 +1,19 @@ #define COBJMACROS -#include -#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include #include #include #include diff --git a/reactos/dll/cpl/desk/desk.rc b/reactos/dll/cpl/desk/desk.rc index c8d26f1a237..7823db03bee 100644 --- a/reactos/dll/cpl/desk/desk.rc +++ b/reactos/dll/cpl/desk/desk.rc @@ -1,5 +1,7 @@ -#include +#include +#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/desk/preview.h b/reactos/dll/cpl/desk/preview.h index 66aa5f94808..987f02415ee 100644 --- a/reactos/dll/cpl/desk/preview.h +++ b/reactos/dll/cpl/desk/preview.h @@ -21,8 +21,6 @@ #define IDX_APPSPACE 16 #define IDX_QUICKINFO 20 - - #define PVM_GETCYCAPTION (WM_USER+1) #define PVM_SETCYCAPTION (WM_USER+2) diff --git a/reactos/dll/cpl/desk/rsrc.rc b/reactos/dll/cpl/desk/rsrc.rc index 106d4bb6e39..1b244574f13 100644 --- a/reactos/dll/cpl/desk/rsrc.rc +++ b/reactos/dll/cpl/desk/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.h b/reactos/dll/cpl/hdwwiz/hdwwiz.h index 3712adb222a..6716d7cf554 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.h +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.h @@ -1,15 +1,19 @@ #pragma once -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include #define NDEBUG #include diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rc b/reactos/dll/cpl/hdwwiz/hdwwiz.rc index 133fbd90bd2..33d39313713 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.rc +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/hdwwiz/rsrc.rc b/reactos/dll/cpl/hdwwiz/rsrc.rc index 88921192c31..c0f7c3b41ec 100644 --- a/reactos/dll/cpl/hdwwiz/rsrc.rc +++ b/reactos/dll/cpl/hdwwiz/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/inetcpl/content.c b/reactos/dll/cpl/inetcpl/content.c index 8fb1729308e..405e629f01c 100644 --- a/reactos/dll/cpl/inetcpl/content.c +++ b/reactos/dll/cpl/inetcpl/content.c @@ -20,6 +20,7 @@ */ #define NONAMELESSUNION +#define WIN32_NO_STATUS #include #include @@ -28,7 +29,7 @@ #include #include "inetcpl.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); diff --git a/reactos/dll/cpl/inetcpl/general.c b/reactos/dll/cpl/inetcpl/general.c index 1d8f027e042..95613bc96a4 100644 --- a/reactos/dll/cpl/inetcpl/general.c +++ b/reactos/dll/cpl/inetcpl/general.c @@ -21,17 +21,22 @@ #define NONAMELESSUNION +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #include -#include +//#include #include #include #include -#include +//#include #include "inetcpl.h" -#include "wine/debug.h" + +#include WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); diff --git a/reactos/dll/cpl/inetcpl/inetcpl.c b/reactos/dll/cpl/inetcpl/inetcpl.c index 751eccd468a..458dd3a0010 100644 --- a/reactos/dll/cpl/inetcpl/inetcpl.c +++ b/reactos/dll/cpl/inetcpl/inetcpl.c @@ -22,21 +22,23 @@ #define NONAMELESSUNION #define COBJMACROS #define CONST_VTABLE +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include #include #include -#include +//#include #include -#include +//#include #include -#include "ole2.h" +#include -#include "wine/debug.h" +#include #include "inetcpl.h" - WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); DECLSPEC_HIDDEN HMODULE hcpl; diff --git a/reactos/dll/cpl/inetcpl/security.c b/reactos/dll/cpl/inetcpl/security.c index 118718533b1..32ad780b05d 100644 --- a/reactos/dll/cpl/inetcpl/security.c +++ b/reactos/dll/cpl/inetcpl/security.c @@ -23,21 +23,25 @@ #define CONST_VTABLE #define NONAMELESSUNION +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #include #include -#include -#include "commctrl.h" +//#include +//#include "commctrl.h" -#include "ole2.h" -#include "urlmon.h" -#include "initguid.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "ole2.h" +//#include "urlmon.h" +//#include "initguid.h" +#include +#include #include "inetcpl.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); diff --git a/reactos/dll/cpl/input/input.h b/reactos/dll/cpl/input/input.h index f51e26a93a6..d962fb98825 100644 --- a/reactos/dll/cpl/input/input.h +++ b/reactos/dll/cpl/input/input.h @@ -1,12 +1,14 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include +#include #include #include - -#include -#include -#include #include -#include #include "resource.h" diff --git a/reactos/dll/cpl/input/input.rc b/reactos/dll/cpl/input/input.rc index 170571835a0..f9904a1f7ce 100644 --- a/reactos/dll/cpl/input/input.rc +++ b/reactos/dll/cpl/input/input.rc @@ -1,5 +1,8 @@ +#include +#include +#include + #include "resource.h" -#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/input/rsrc.rc b/reactos/dll/cpl/input/rsrc.rc index e984e0dd41e..36114d73c04 100644 --- a/reactos/dll/cpl/input/rsrc.rc +++ b/reactos/dll/cpl/input/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h index 559287831f3..7fb1d2038b7 100644 --- a/reactos/dll/cpl/intl/intl.h +++ b/reactos/dll/cpl/intl/intl.h @@ -1,11 +1,14 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include +#include #include -#include #include -#include -#include #include -#include #include #include diff --git a/reactos/dll/cpl/intl/intl.rc b/reactos/dll/cpl/intl/intl.rc index 9b3a95550f0..d50d42ca4a0 100644 --- a/reactos/dll/cpl/intl/intl.rc +++ b/reactos/dll/cpl/intl/intl.rc @@ -1,6 +1,7 @@ -/* $Id$ */ +#include +#include +#include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/cpl/intl/rsrc.rc b/reactos/dll/cpl/intl/rsrc.rc index 590532b24a8..2882bce9898 100644 --- a/reactos/dll/cpl/intl/rsrc.rc +++ b/reactos/dll/cpl/intl/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/cpl/joy/joy.h b/reactos/dll/cpl/joy/joy.h index 7e1b30c2916..42d5f6f4d89 100644 --- a/reactos/dll/cpl/joy/joy.h +++ b/reactos/dll/cpl/joy/joy.h @@ -1,13 +1,14 @@ #pragma once -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include #include "resource.h" diff --git a/reactos/dll/cpl/joy/joy.rc b/reactos/dll/cpl/joy/joy.rc index 5a94ebe203e..9713e713a83 100644 --- a/reactos/dll/cpl/joy/joy.rc +++ b/reactos/dll/cpl/joy/joy.rc @@ -1,5 +1,7 @@ +#include +#include + #include "resource.h" -#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/joy/rsrc.rc b/reactos/dll/cpl/joy/rsrc.rc index 28496740e51..9a8ed658b43 100644 --- a/reactos/dll/cpl/joy/rsrc.rc +++ b/reactos/dll/cpl/joy/rsrc.rc @@ -1,6 +1,3 @@ -#include "resource.h" -#include - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/main/main.h b/reactos/dll/cpl/main/main.h index 3b8638202a6..b2dbf13419c 100644 --- a/reactos/dll/cpl/main/main.h +++ b/reactos/dll/cpl/main/main.h @@ -1,13 +1,16 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include #include -#include -#include #include #include #include diff --git a/reactos/dll/cpl/main/main.rc b/reactos/dll/cpl/main/main.rc index 84bf2b253d4..bddf0117bcb 100644 --- a/reactos/dll/cpl/main/main.rc +++ b/reactos/dll/cpl/main/main.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/main/rsrc.rc b/reactos/dll/cpl/main/rsrc.rc index 2ef419a84d3..9c6c8a3a3f7 100644 --- a/reactos/dll/cpl/main/rsrc.rc +++ b/reactos/dll/cpl/main/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/mmsys/mmsys.h b/reactos/dll/cpl/mmsys/mmsys.h index f5085cc5714..37b8908dc5e 100644 --- a/reactos/dll/cpl/mmsys/mmsys.h +++ b/reactos/dll/cpl/mmsys/mmsys.h @@ -1,10 +1,18 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include -#include #include #include #include diff --git a/reactos/dll/cpl/mmsys/mmsys.rc b/reactos/dll/cpl/mmsys/mmsys.rc index 5ce7fbae8d1..d89dcc4e9d5 100644 --- a/reactos/dll/cpl/mmsys/mmsys.rc +++ b/reactos/dll/cpl/mmsys/mmsys.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/mmsys/rsrc.rc b/reactos/dll/cpl/mmsys/rsrc.rc index f711207d913..ed540d2f0c7 100644 --- a/reactos/dll/cpl/mmsys/rsrc.rc +++ b/reactos/dll/cpl/mmsys/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c index 4cf865baf1e..87dac5bcf4d 100644 --- a/reactos/dll/cpl/ncpa/ncpa.c +++ b/reactos/dll/cpl/ncpa/ncpa.c @@ -7,14 +7,14 @@ * 07-18-2004 Created */ -#include -#include +#define WIN32_NO_STATUS #include -#include +#include +#include +#include #include #include - LONG CALLBACK DisplayApplet(VOID) { diff --git a/reactos/dll/cpl/odbccp32/odbccp32.h b/reactos/dll/cpl/odbccp32/odbccp32.h index 8a534c4b038..b8d738bbaa5 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.h +++ b/reactos/dll/cpl/odbccp32/odbccp32.h @@ -1,6 +1,10 @@ #pragma once -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include #include #include diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rc b/reactos/dll/cpl/odbccp32/odbccp32.rc index d47e9cd4585..42c0ad1316a 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.rc +++ b/reactos/dll/cpl/odbccp32/odbccp32.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS ODBC Control Panel Applet\0" #define REACTOS_STR_INTERNAL_NAME "odbccp32\0" diff --git a/reactos/dll/cpl/powercfg/powercfg.h b/reactos/dll/cpl/powercfg/powercfg.h index c5997889204..5dcdd3f8e32 100644 --- a/reactos/dll/cpl/powercfg/powercfg.h +++ b/reactos/dll/cpl/powercfg/powercfg.h @@ -1,15 +1,17 @@ -#include "ntstatus.h" +#include #define WIN32_NO_STATUS -#include - -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include -#include #include #include #include +#include -#include "powrprof.h" #include "resource.h" typedef struct diff --git a/reactos/dll/cpl/powercfg/powercfg.rc b/reactos/dll/cpl/powercfg/powercfg.rc index 85bb13715b8..4fd42479a80 100644 --- a/reactos/dll/cpl/powercfg/powercfg.rc +++ b/reactos/dll/cpl/powercfg/powercfg.rc @@ -1,6 +1,7 @@ -/* $Id: powercfg.rc 21982 2006-05-22 21:33:22Z janderwald $ */ +#include +#include +#include -#include #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/powercfg/rsrc.rc b/reactos/dll/cpl/powercfg/rsrc.rc index 0bcf5e7fb7b..6e9f8715e0f 100644 --- a/reactos/dll/cpl/powercfg/rsrc.rc +++ b/reactos/dll/cpl/powercfg/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h index eb0b0c5f03a..bf52f3aeb03 100644 --- a/reactos/dll/cpl/sysdm/precomp.h +++ b/reactos/dll/cpl/sysdm/precomp.h @@ -3,19 +3,23 @@ #include #define WIN32_NO_STATUS -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include -#include #include -#include #include #include + #include "resource.h" #define NUM_APPLETS (1) diff --git a/reactos/dll/cpl/sysdm/rsrc.rc b/reactos/dll/cpl/sysdm/rsrc.rc index d9eb2a2c1e4..4e8a8c9a3db 100644 --- a/reactos/dll/cpl/sysdm/rsrc.rc +++ b/reactos/dll/cpl/sysdm/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #pragma code_page(65001) #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" diff --git a/reactos/dll/cpl/sysdm/sysdm.rc b/reactos/dll/cpl/sysdm/sysdm.rc index 81c348ee1bc..07fe9debfdc 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rc +++ b/reactos/dll/cpl/sysdm/sysdm.rc @@ -1,5 +1,7 @@ -#include +#include +#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/telephon/rsrc.rc b/reactos/dll/cpl/telephon/rsrc.rc index 3f3be262665..f254e4945fa 100644 --- a/reactos/dll/cpl/telephon/rsrc.rc +++ b/reactos/dll/cpl/telephon/rsrc.rc @@ -1,6 +1,3 @@ -#include "resource.h" -#include - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/cpl/telephon/telephon.c b/reactos/dll/cpl/telephon/telephon.c index d19c8ddaccc..d08c3d0bb3b 100644 --- a/reactos/dll/cpl/telephon/telephon.c +++ b/reactos/dll/cpl/telephon/telephon.c @@ -8,7 +8,10 @@ * 10-19-2007 Created */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #include "resource.h" diff --git a/reactos/dll/cpl/telephon/telephon.rc b/reactos/dll/cpl/telephon/telephon.rc index 23bc87f10a4..e138d9d477b 100644 --- a/reactos/dll/cpl/telephon/telephon.rc +++ b/reactos/dll/cpl/telephon/telephon.rc @@ -1,5 +1,6 @@ +#include + #include "resource.h" -#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/timedate/clock.c b/reactos/dll/cpl/timedate/clock.c index b9eaf29d870..eafe1bf2e8f 100644 --- a/reactos/dll/cpl/timedate/clock.c +++ b/reactos/dll/cpl/timedate/clock.c @@ -9,7 +9,7 @@ /* Code based on clock.c from Programming Windows, Charles Petzold */ -#include +#include "timedate.h" typedef struct _CLOCKDATA { diff --git a/reactos/dll/cpl/timedate/dateandtime.c b/reactos/dll/cpl/timedate/dateandtime.c index d74f7496d2b..c51e175cc98 100644 --- a/reactos/dll/cpl/timedate/dateandtime.c +++ b/reactos/dll/cpl/timedate/dateandtime.c @@ -9,7 +9,7 @@ * */ -#include +#include "timedate.h" static WNDPROC pOldWndProc = NULL; diff --git a/reactos/dll/cpl/timedate/internettime.c b/reactos/dll/cpl/timedate/internettime.c index 02cdf0acfd9..9f0b8514518 100644 --- a/reactos/dll/cpl/timedate/internettime.c +++ b/reactos/dll/cpl/timedate/internettime.c @@ -7,7 +7,7 @@ * */ -#include +#include "timedate.h" static VOID CreateNTPServerList(HWND hwnd) diff --git a/reactos/dll/cpl/timedate/monthcal.c b/reactos/dll/cpl/timedate/monthcal.c index 0d71e8a22dc..c66014e5629 100644 --- a/reactos/dll/cpl/timedate/monthcal.c +++ b/reactos/dll/cpl/timedate/monthcal.c @@ -7,7 +7,7 @@ * */ -#include +#include "timedate.h" static const WCHAR szMonthCalWndClass[] = L"MonthCalWnd"; diff --git a/reactos/dll/cpl/timedate/ntpclient.c b/reactos/dll/cpl/timedate/ntpclient.c index 8651999b258..bbb6565aab3 100644 --- a/reactos/dll/cpl/timedate/ntpclient.c +++ b/reactos/dll/cpl/timedate/ntpclient.c @@ -7,7 +7,7 @@ * */ -#include +#include "timedate.h" #define TIMEOUT 4000 /* 4 second timeout */ diff --git a/reactos/dll/cpl/timedate/rsrc.rc b/reactos/dll/cpl/timedate/rsrc.rc index 8ef413ca5e9..99b6ddee2ab 100644 --- a/reactos/dll/cpl/timedate/rsrc.rc +++ b/reactos/dll/cpl/timedate/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c index a74db407eef..f19882c86f1 100644 --- a/reactos/dll/cpl/timedate/timedate.c +++ b/reactos/dll/cpl/timedate/timedate.c @@ -8,7 +8,7 @@ * */ -#include +#include "timedate.h" #define NUM_APPLETS 1 diff --git a/reactos/dll/cpl/timedate/timedate.h b/reactos/dll/cpl/timedate/timedate.h index 97e6acb09ae..d1e8c5d24cc 100644 --- a/reactos/dll/cpl/timedate/timedate.h +++ b/reactos/dll/cpl/timedate/timedate.h @@ -1,6 +1,15 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include +#include #include -#include +#define _INC_WINDOWS +#include +#include #include #include #include diff --git a/reactos/dll/cpl/timedate/timedate.rc b/reactos/dll/cpl/timedate/timedate.rc index 3f1f48e0dde..897c32abaf9 100644 --- a/reactos/dll/cpl/timedate/timedate.rc +++ b/reactos/dll/cpl/timedate/timedate.rc @@ -1,5 +1,7 @@ -#include +#include +#include #include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/timedate/timezone.c b/reactos/dll/cpl/timedate/timezone.c index cf727c9e952..8276c0e2d89 100644 --- a/reactos/dll/cpl/timedate/timezone.c +++ b/reactos/dll/cpl/timedate/timezone.c @@ -9,7 +9,7 @@ * */ -#include +#include "timedate.h" typedef struct _TZ_INFO { diff --git a/reactos/dll/cpl/usrmgr/resource.h b/reactos/dll/cpl/usrmgr/resource.h index c0c7bfa97fb..4e9fddbeaea 100644 --- a/reactos/dll/cpl/usrmgr/resource.h +++ b/reactos/dll/cpl/usrmgr/resource.h @@ -1,7 +1,5 @@ #pragma once -#include - /* metrics */ #define PROPSHEETWIDTH 246 #define PROPSHEETHEIGHT 228 diff --git a/reactos/dll/cpl/usrmgr/rsrc.rc b/reactos/dll/cpl/usrmgr/rsrc.rc index d051048368c..cd588eaa568 100644 --- a/reactos/dll/cpl/usrmgr/rsrc.rc +++ b/reactos/dll/cpl/usrmgr/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif diff --git a/reactos/dll/cpl/usrmgr/usrmgr.h b/reactos/dll/cpl/usrmgr/usrmgr.h index 1a6fdf84338..e14f7cea106 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.h +++ b/reactos/dll/cpl/usrmgr/usrmgr.h @@ -1,13 +1,14 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include -#include #include #include -#include #include #include #include -#include #include "resource.h" diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rc b/reactos/dll/cpl/usrmgr/usrmgr.rc index d1b55a94e28..9407402da05 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.rc +++ b/reactos/dll/cpl/usrmgr/usrmgr.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/wined3dcfg/rsrc.rc b/reactos/dll/cpl/wined3dcfg/rsrc.rc index 4b802fc226b..b0486d39a69 100644 --- a/reactos/dll/cpl/wined3dcfg/rsrc.rc +++ b/reactos/dll/cpl/wined3dcfg/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) diff --git a/reactos/dll/cpl/wined3dcfg/wined3dcfg.c b/reactos/dll/cpl/wined3dcfg/wined3dcfg.c index 98b1eafdd6a..006bf5cd863 100644 --- a/reactos/dll/cpl/wined3dcfg/wined3dcfg.c +++ b/reactos/dll/cpl/wined3dcfg/wined3dcfg.c @@ -74,4 +74,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) return TRUE; } - diff --git a/reactos/dll/cpl/wined3dcfg/wined3dcfg.h b/reactos/dll/cpl/wined3dcfg/wined3dcfg.h index 480c07f5c6a..16789cfafb3 100644 --- a/reactos/dll/cpl/wined3dcfg/wined3dcfg.h +++ b/reactos/dll/cpl/wined3dcfg/wined3dcfg.h @@ -1,8 +1,11 @@ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include #include -#include -#include #include #include "resource.h" diff --git a/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc b/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc index 5fafaec5340..5a5487c3fd8 100644 --- a/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc +++ b/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/directx/amstream/amstream.c b/reactos/dll/directx/amstream/amstream.c index bebe6e80208..39e97c4847a 100644 --- a/reactos/dll/directx/amstream/amstream.c +++ b/reactos/dll/directx/amstream/amstream.c @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" +//#include "winbase.h" +//#include "wingdi.h" #include "amstream_private.h" -#include "amstream.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(amstream); diff --git a/reactos/dll/directx/amstream/amstream_private.h b/reactos/dll/directx/amstream/amstream_private.h index 69fd23f7ca6..d1edbf5321d 100644 --- a/reactos/dll/directx/amstream/amstream_private.h +++ b/reactos/dll/directx/amstream/amstream_private.h @@ -21,15 +21,18 @@ #ifndef __AMSTREAM_PRIVATE_INCLUDED__ #define __AMSTREAM_PRIVATE_INCLUDED__ -#include +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "mmstream.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "wtypes.h" +//#include "wingdi.h" +//#include "winuser.h" +#include +#include HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/reactos/dll/directx/amstream/main.c b/reactos/dll/directx/amstream/main.c index 9f239746e99..af56c01a1b0 100644 --- a/reactos/dll/directx/amstream/main.c +++ b/reactos/dll/directx/amstream/main.c @@ -18,23 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winerror.h" -#include "ole2.h" -#include "rpcproxy.h" +//#include +#include +#include #include "amstream_private.h" -#include "amstream.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(amstream); diff --git a/reactos/dll/directx/amstream/mediastream.c b/reactos/dll/directx/amstream/mediastream.c index 12d3542a6fa..57c0221ffb7 100644 --- a/reactos/dll/directx/amstream/mediastream.c +++ b/reactos/dll/directx/amstream/mediastream.c @@ -18,17 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "amstream_private.h" -#include "amstream.h" +//#include "amstream_private.h" +#include -#include "ddstream.h" +//#include "ddstream.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); diff --git a/reactos/dll/directx/amstream/mediastreamfilter.c b/reactos/dll/directx/amstream/mediastreamfilter.c index 0c72c775ee0..d33c8034aff 100644 --- a/reactos/dll/directx/amstream/mediastreamfilter.c +++ b/reactos/dll/directx/amstream/mediastreamfilter.c @@ -18,17 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "amstream_private.h" -#include "amstream.h" +//#include "amstream_private.h" +#include -#include "ddstream.h" +//#include "ddstream.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); diff --git a/reactos/dll/directx/devenum/createdevenum.c b/reactos/dll/directx/devenum/createdevenum.c index 5a20da58b1e..936ba4d07de 100644 --- a/reactos/dll/directx/devenum/createdevenum.c +++ b/reactos/dll/directx/devenum/createdevenum.c @@ -27,11 +27,11 @@ #define NONAMELESSUNION #include "devenum_private.h" -#include "vfw.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" -#include "mmddk.h" +#include +//#include "wine/unicode.h" +//#include "mmddk.h" WINE_DEFAULT_DEBUG_CHANNEL(devenum); diff --git a/reactos/dll/directx/devenum/devenum.rc b/reactos/dll/directx/devenum/devenum.rc index 89844bfc096..af706a3fafe 100644 --- a/reactos/dll/directx/devenum/devenum.rc +++ b/reactos/dll/directx/devenum/devenum.rc @@ -21,8 +21,8 @@ #pragma code_page(65001) #include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "winbase.h" +//#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/directx/devenum/devenum_main.c b/reactos/dll/directx/devenum/devenum_main.c index 32caa7e2490..d4d29484bd9 100644 --- a/reactos/dll/directx/devenum/devenum_main.c +++ b/reactos/dll/directx/devenum/devenum_main.c @@ -20,8 +20,8 @@ */ #include "devenum_private.h" -#include "wine/debug.h" -#include "winreg.h" +#include +//#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(devenum); diff --git a/reactos/dll/directx/devenum/devenum_private.h b/reactos/dll/directx/devenum/devenum_private.h index da65add3c8a..d508cd23314 100644 --- a/reactos/dll/directx/devenum/devenum_private.h +++ b/reactos/dll/directx/devenum/devenum_private.h @@ -26,22 +26,26 @@ #include #endif -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +//#include "winuser.h" +#include +//#include "winerror.h" #define COBJMACROS -#include "ole2.h" -#include "strmif.h" -#include "olectl.h" -#include "uuids.h" +#include +#include +//#include "olectl.h" +#include #ifndef RC_INVOKED -#include "wine/unicode.h" +#include #endif /********************************************************************** diff --git a/reactos/dll/directx/devenum/factory.c b/reactos/dll/directx/devenum/factory.c index 09861fa0315..29d86ee0348 100644 --- a/reactos/dll/directx/devenum/factory.c +++ b/reactos/dll/directx/devenum/factory.c @@ -21,7 +21,7 @@ #include "devenum_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(devenum); diff --git a/reactos/dll/directx/devenum/mediacatenum.c b/reactos/dll/directx/devenum/mediacatenum.c index 349ea7d6e43..c360684d8f8 100644 --- a/reactos/dll/directx/devenum/mediacatenum.c +++ b/reactos/dll/directx/devenum/mediacatenum.c @@ -23,10 +23,10 @@ */ #include "devenum_private.h" -#include "oleauto.h" -#include "ocidl.h" +//#include "oleauto.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(devenum); diff --git a/reactos/dll/directx/devenum/parsedisplayname.c b/reactos/dll/directx/devenum/parsedisplayname.c index fa2f99565a6..05db97eb091 100644 --- a/reactos/dll/directx/devenum/parsedisplayname.c +++ b/reactos/dll/directx/devenum/parsedisplayname.c @@ -23,7 +23,7 @@ */ #include "devenum_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(devenum); diff --git a/reactos/dll/directx/dinput/data_formats.c b/reactos/dll/directx/dinput/data_formats.c index 1f25556665f..e1582c0e535 100644 --- a/reactos/dll/directx/dinput/data_formats.c +++ b/reactos/dll/directx/dinput/data_formats.c @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "dinput.h" +#include +#include +#include #define numObjects(x) (sizeof(x) / sizeof(x[0])) diff --git a/reactos/dll/directx/dinput/device.c b/reactos/dll/directx/dinput/device.c index 941206ccf3b..7a0cf218de0 100644 --- a/reactos/dll/directx/dinput/device.c +++ b/reactos/dll/directx/dinput/device.c @@ -24,20 +24,20 @@ It also contains all the helper functions. */ -#include "config.h" +#include -#include -#include -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "winerror.h" -#include "dinput.h" +//#include +//#include +#include +//#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winreg.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "dinput.h" #include "device_private.h" -#include "dinput_private.h" +//#include "dinput_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/device_private.h b/reactos/dll/directx/dinput/device_private.h index 346338201e2..024fa8a1ff0 100644 --- a/reactos/dll/directx/dinput/device_private.h +++ b/reactos/dll/directx/dinput/device_private.h @@ -20,12 +20,12 @@ #ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H #define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "dinput.h" -#include "wine/list.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dinput.h" +//#include "wine/list.h" #include "dinput_private.h" typedef struct diff --git a/reactos/dll/directx/dinput/dinput_main.c b/reactos/dll/directx/dinput/dinput_main.c index bdcf557eca0..41ba14f2685 100644 --- a/reactos/dll/directx/dinput/dinput_main.c +++ b/reactos/dll/directx/dinput/dinput_main.c @@ -30,21 +30,21 @@ * - Fallout : works great in X and DGA mode */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "dinput_private.h" +#include +//#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "dinput_private.h" #include "device_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/dinput_private.h b/reactos/dll/directx/dinput/dinput_private.h index 15783e2bb28..6e48c34d9fa 100644 --- a/reactos/dll/directx/dinput/dinput_private.h +++ b/reactos/dll/directx/dinput/dinput_private.h @@ -19,12 +19,18 @@ #ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H #define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "dinput.h" -#include "wine/list.h" +#include +#include +#include +#include +#include +#include /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; diff --git a/reactos/dll/directx/dinput/joystick_linux.c b/reactos/dll/directx/dinput/joystick_linux.c index e9b6916e432..c8cab0cf645 100644 --- a/reactos/dll/directx/dinput/joystick_linux.c +++ b/reactos/dll/directx/dinput/joystick_linux.c @@ -25,24 +25,24 @@ * force feedback */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include -#include -#include +//#include +//#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif #ifdef HAVE_SYS_TIME_H # include #endif -#include +//#include #ifdef HAVE_SYS_IOCTL_H # include #endif -#include +//#include #ifdef HAVE_SYS_ERRNO_H # include #endif @@ -57,15 +57,15 @@ # include #endif -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "dinput.h" +#include +//#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "winreg.h" +//#include "dinput.h" -#include "dinput_private.h" +//#include "dinput_private.h" #include "device_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/joystick_linuxinput.c b/reactos/dll/directx/dinput/joystick_linuxinput.c index c24ade98ad9..ad1ad6ad2dd 100644 --- a/reactos/dll/directx/dinput/joystick_linuxinput.c +++ b/reactos/dll/directx/dinput/joystick_linuxinput.c @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif @@ -53,16 +53,16 @@ # include #endif -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "dinput.h" +#include +//#include "wine/unicode.h" +//#include "wine/list.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "winreg.h" +//#include "dinput.h" -#include "dinput_private.h" +//#include "dinput_private.h" #include "device_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/keyboard.c b/reactos/dll/directx/dinput/keyboard.c index 47536f7f68e..3bdabf339fc 100644 --- a/reactos/dll/directx/dinput/keyboard.c +++ b/reactos/dll/directx/dinput/keyboard.c @@ -20,21 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "dinput.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "dinput.h" -#include "dinput_private.h" +//#include "dinput_private.h" #include "device_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/mouse.c b/reactos/dll/directx/dinput/mouse.c index 178b8fb4842..c637da998fb 100644 --- a/reactos/dll/directx/dinput/mouse.c +++ b/reactos/dll/directx/dinput/mouse.c @@ -19,24 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "winreg.h" -#include "dinput.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "winreg.h" +//#include "dinput.h" -#include "dinput_private.h" +//#include "dinput_private.h" #include "device_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput/regsvr.c b/reactos/dll/directx/dinput/regsvr.c index 54f5be5b160..e4e1e5674d8 100644 --- a/reactos/dll/directx/dinput/regsvr.c +++ b/reactos/dll/directx/dinput/regsvr.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "winerror.h" -#include "dinput.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dinput8/dinput8_main.c b/reactos/dll/directx/dinput8/dinput8_main.c index c855caf62ec..7fab88cdac7 100644 --- a/reactos/dll/directx/dinput8/dinput8_main.c +++ b/reactos/dll/directx/dinput8/dinput8_main.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "dinput.h" +#include +//#include "windef.h" +#include +//#include "winerror.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dinput); static LONG dll_count; diff --git a/reactos/dll/directx/dinput8/regsvr.c b/reactos/dll/directx/dinput8/regsvr.c index 3d8cdc9458a..f59ff9c19f3 100644 --- a/reactos/dll/directx/dinput8/regsvr.c +++ b/reactos/dll/directx/dinput8/regsvr.c @@ -19,19 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "winerror.h" -#include "dinput.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/reactos/dll/directx/dmusic/dmusic_main.c b/reactos/dll/directx/dmusic/dmusic_main.c index 32171facb7b..f8e901494f3 100644 --- a/reactos/dll/directx/dmusic/dmusic_main.c +++ b/reactos/dll/directx/dmusic/dmusic_main.c @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include diff --git a/reactos/dll/directx/dmusic/dmusic_private.h b/reactos/dll/directx/dmusic/dmusic_private.h index 2de7e8a11b1..54340655a96 100644 --- a/reactos/dll/directx/dmusic/dmusic_private.h +++ b/reactos/dll/directx/dmusic/dmusic_private.h @@ -20,25 +20,28 @@ #ifndef __WINE_DMUSIC_PRIVATE_H #define __WINE_DMUSIC_PRIVATE_H -#include +//#include #define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "wingdi.h" -#include "winuser.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnt.h" +//#include "wingdi.h" +//#include "winuser.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" -#include "winreg.h" -#include "objbase.h" +#include +#include +#include +#include +#include -#include "dmusici.h" -#include "dmusicf.h" -#include "dmusics.h" +#include +#include +#include /***************************************************************************** * Interfaces diff --git a/reactos/dll/directx/dmusic/regsvr.c b/reactos/dll/directx/dmusic/regsvr.c index e3b5d36ff95..d0d9a2abba4 100644 --- a/reactos/dll/directx/dmusic/regsvr.c +++ b/reactos/dll/directx/dmusic/regsvr.c @@ -19,7 +19,7 @@ */ #include "dmusic_private.h" -#include "wine/unicode.h" +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/reactos/dll/directx/dplayx/dpclassfactory.c b/reactos/dll/directx/dplayx/dpclassfactory.c index 610b44bdd56..55181b7cb2e 100644 --- a/reactos/dll/directx/dplayx/dpclassfactory.c +++ b/reactos/dll/directx/dplayx/dpclassfactory.c @@ -17,16 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "winerror.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "objbase.h" +//#include "winerror.h" +#include #include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/dpinit.h b/reactos/dll/directx/dplayx/dpinit.h index df728777ceb..1fac19dd889 100644 --- a/reactos/dll/directx/dplayx/dpinit.h +++ b/reactos/dll/directx/dplayx/dpinit.h @@ -19,11 +19,11 @@ #ifndef __WINE_DPINIT_H #define __WINE_DPINIT_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wtypes.h" #include "dplay_global.h" extern HRESULT DP_CreateInterface( REFIID riid, LPVOID* ppvObj ); diff --git a/reactos/dll/directx/dplayx/dplay.c b/reactos/dll/directx/dplayx/dplay.c index da0cad5113f..2d036622512 100644 --- a/reactos/dll/directx/dplayx/dplay.c +++ b/reactos/dll/directx/dplayx/dplay.c @@ -17,29 +17,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +//#include "winerror.h" +//#include "winbase.h" +//#include "winnt.h" +#include +//#include "winnls.h" +#include +#include #include "dpinit.h" #include "dplayx_global.h" #include "name_server.h" -#include "dplayx_queue.h" -#include "dplaysp.h" -#include "dplay_global.h" +//#include "dplayx_queue.h" +//#include "dplaysp.h" +//#include "dplay_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/dplay_global.h b/reactos/dll/directx/dplayx/dplay_global.h index b7b0f0becfa..516a61b3200 100644 --- a/reactos/dll/directx/dplayx/dplay_global.h +++ b/reactos/dll/directx/dplayx/dplay_global.h @@ -19,10 +19,10 @@ #ifndef __WINE_DPLAY_GLOBAL_INCLUDED #define __WINE_DPLAY_GLOBAL_INCLUDED -#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" #include "dplaysp.h" #include "lobbysp.h" #include "dplayx_queue.h" diff --git a/reactos/dll/directx/dplayx/dplaysp.c b/reactos/dll/directx/dplayx/dplaysp.c index 63421d543e9..29087ca99f3 100644 --- a/reactos/dll/directx/dplayx/dplaysp.c +++ b/reactos/dll/directx/dplayx/dplaysp.c @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include "winerror.h" -#include "wine/debug.h" +//#include +//#include "winerror.h" +#include -#include "dpinit.h" -#include "dplaysp.h" -#include "dplay_global.h" +//#include "dpinit.h" +//#include "dplaysp.h" +//#include "dplay_global.h" #include "name_server.h" -#include "dplayx_messages.h" +//#include "dplayx_messages.h" #include "dplayx_global.h" /* FIXME: For global hack */ diff --git a/reactos/dll/directx/dplayx/dplaysp.h b/reactos/dll/directx/dplayx/dplaysp.h index c12d0b47599..d83cd291934 100644 --- a/reactos/dll/directx/dplayx/dplaysp.h +++ b/reactos/dll/directx/dplayx/dplaysp.h @@ -19,13 +19,17 @@ #ifndef __WINE_DIRECT_PLAY_SP_H #define __WINE_DIRECT_PLAY_SP_H -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "dplay.h" -#include "dplobby.h" +//#include + +//#include "windef.h" +#include +//#include "winuser.h" +//#include "dplay.h" +#include /* GUID for IDirectPlaySP {0C9F6360-CC61-11cf-ACEC-00AA006886E3} */ DEFINE_GUID(IID_IDirectPlaySP, 0xc9f6360, 0xcc61, 0x11cf, 0xac, 0xec, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3); diff --git a/reactos/dll/directx/dplayx/dplayx_global.c b/reactos/dll/directx/dplayx/dplayx_global.c index 94da5d9cc99..fc3fa41232d 100644 --- a/reactos/dll/directx/dplayx/dplayx_global.c +++ b/reactos/dll/directx/dplayx/dplayx_global.c @@ -29,22 +29,22 @@ * */ -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/unicode.h" +#include +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include -#include "wingdi.h" -#include "winuser.h" +//#include "wingdi.h" +//#include "winuser.h" #include "dplayx_global.h" -#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */ +//#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */ WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/dplayx_global.h b/reactos/dll/directx/dplayx/dplayx_global.h index 9f518a850f0..4d9571eeb7a 100644 --- a/reactos/dll/directx/dplayx/dplayx_global.h +++ b/reactos/dll/directx/dplayx/dplayx_global.h @@ -19,12 +19,16 @@ #ifndef __WINE_DPLAYX_GLOBAL #define __WINE_DPLAYX_GLOBAL +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "dplay.h" +#include +#include +//#include "winuser.h" +#include BOOL DPLAYX_ConstructData(void); BOOL DPLAYX_DestructData(void); diff --git a/reactos/dll/directx/dplayx/dplayx_main.c b/reactos/dll/directx/dplayx/dplayx_main.c index 21c785fea45..822c5c70663 100644 --- a/reactos/dll/directx/dplayx/dplayx_main.c +++ b/reactos/dll/directx/dplayx/dplayx_main.c @@ -56,12 +56,12 @@ * client. Also get rid of offset dependency by making data offset independent * somehow. */ -#include +//#include -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +//#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +#include #include "dplayx_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/dplayx_messages.c b/reactos/dll/directx/dplayx/dplayx_messages.c index 2820e4e2b68..e6d1f130d99 100644 --- a/reactos/dll/directx/dplayx/dplayx_messages.c +++ b/reactos/dll/directx/dplayx/dplayx_messages.c @@ -20,19 +20,19 @@ * o Messaging interface required for both DirectPlay and DirectPlayLobby. */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winerror.h" -#include "dplayx_messages.h" -#include "dplay_global.h" +//#include "dplayx_messages.h" +//#include "dplay_global.h" #include "dplayx_global.h" #include "name_server.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/dplayx_messages.h b/reactos/dll/directx/dplayx/dplayx_messages.h index 9ff109787ff..60f08576475 100644 --- a/reactos/dll/directx/dplayx/dplayx_messages.h +++ b/reactos/dll/directx/dplayx/dplayx_messages.h @@ -19,12 +19,12 @@ #ifndef __WINE_DPLAYX_MESSAGES__ #define __WINE_DPLAYX_MESSAGES__ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "dplay.h" -#include "rpc.h" /* For GUID */ +//#include "windef.h" +//#include "winbase.h" +//#include "dplay.h" +//#include "rpc.h" /* For GUID */ #include "dplay_global.h" @@ -48,7 +48,7 @@ void DP_MSG_ToSelf( IDirectPlay2AImpl* This, DPID dpidSelf ); #define DPMSG_DEFAULT_WAIT_TIME DPMSG_WAIT_30_SECS /* Message types etc. */ -#include "pshpack1.h" +#include /* Non provided messages for DPLAY - guess work which may be wrong :( */ #define DPMSGCMD_ENUMSESSIONSREPLY 1 @@ -218,6 +218,6 @@ typedef struct tagDPMSG_FORWARDADDPLAYERNACK } DPMSG_FORWARDADDPLAYERNACK, *LPDPMSG_FORWARDADDPLAYERNACK; typedef const DPMSG_FORWARDADDPLAYERNACK* LPCDPMSG_FORWARDADDPLAYERNACK; -#include "poppack.h" +#include #endif diff --git a/reactos/dll/directx/dplayx/dplayx_queue.h b/reactos/dll/directx/dplayx/dplayx_queue.h index 814f684e6fa..9bad0cc56ba 100644 --- a/reactos/dll/directx/dplayx/dplayx_queue.h +++ b/reactos/dll/directx/dplayx/dplayx_queue.h @@ -26,10 +26,10 @@ #ifndef __WINE_DPLAYX_QUEUE_H #define __WINE_DPLAYX_QUEUE_H -#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" #define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c) diff --git a/reactos/dll/directx/dplayx/dplobby.c b/reactos/dll/directx/dplayx/dplobby.c index 1b836578bbb..7bfc9ce0434 100644 --- a/reactos/dll/directx/dplayx/dplobby.c +++ b/reactos/dll/directx/dplayx/dplobby.c @@ -17,21 +17,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include -#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +#include +#include #include "dplayx_global.h" #include "dplayx_messages.h" -#include "dplayx_queue.h" -#include "dplobby.h" +//#include "dplayx_queue.h" +//#include "dplobby.h" #include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/lobbysp.c b/reactos/dll/directx/dplayx/lobbysp.c index 261af2d597e..18e4165e24b 100644 --- a/reactos/dll/directx/dplayx/lobbysp.c +++ b/reactos/dll/directx/dplayx/lobbysp.c @@ -18,11 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "winerror.h" -#include "wine/debug.h" +//#include "winerror.h" +#include -#include "lobbysp.h" -#include "dplay_global.h" +//#include "lobbysp.h" +//#include "dplay_global.h" #include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/reactos/dll/directx/dplayx/lobbysp.h b/reactos/dll/directx/dplayx/lobbysp.h index 50ed70499e6..8897201c616 100644 --- a/reactos/dll/directx/dplayx/lobbysp.h +++ b/reactos/dll/directx/dplayx/lobbysp.h @@ -19,11 +19,11 @@ #ifndef __WINE_LOBBY_SP_H #define __WINE_LOBBY_SP_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" #include "dplobby.h" /* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */ diff --git a/reactos/dll/directx/dplayx/name_server.c b/reactos/dll/directx/dplayx/name_server.c index 7548b18f11a..ec47bd97968 100644 --- a/reactos/dll/directx/dplayx/name_server.c +++ b/reactos/dll/directx/dplayx/name_server.c @@ -19,23 +19,23 @@ /* NOTE: Methods with the NS_ prefix are name server methods */ -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "mmsystem.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include -#include "dplayx_global.h" +//#include "dplayx_global.h" #include "name_server.h" -#include "dplaysp.h" -#include "dplayx_messages.h" -#include "dplayx_queue.h" +//#include "dplaysp.h" +//#include "dplayx_messages.h" +//#include "dplayx_queue.h" /* FIXME: Need to create a crit section, store and use it */ diff --git a/reactos/dll/directx/dplayx/name_server.h b/reactos/dll/directx/dplayx/name_server.h index fc3f0eb2768..15fdde5f5cf 100644 --- a/reactos/dll/directx/dplayx/name_server.h +++ b/reactos/dll/directx/dplayx/name_server.h @@ -19,14 +19,14 @@ #ifndef __WINE_DPLAYX_NAMESERVER #define __WINE_DPLAYX_NAMESERVER -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "dplay.h" -#include "dplaysp.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dplay.h" +//#include "dplaysp.h" #include "dplayx_messages.h" -#include "dplay_global.h" +//#include "dplay_global.h" void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); void NS_SetRemoteComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); diff --git a/reactos/dll/directx/dplayx/regsvr.c b/reactos/dll/directx/dplayx/regsvr.c index abaa33dd813..c8579b180ec 100644 --- a/reactos/dll/directx/dplayx/regsvr.c +++ b/reactos/dll/directx/dplayx/regsvr.c @@ -18,19 +18,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +//#include "winerror.h" -#include "dplay.h" -#include "dplobby.h" +//#include "dplay.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dplayx); diff --git a/reactos/dll/directx/dsound/buffer.c b/reactos/dll/directx/dsound/buffer.c index 251c436d14a..c5ad35e29bc 100644 --- a/reactos/dll/directx/dsound/buffer.c +++ b/reactos/dll/directx/dsound/buffer.c @@ -21,16 +21,20 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/capture.c b/reactos/dll/directx/dsound/capture.c index 312c90f92cd..221a7cb5f6c 100644 --- a/reactos/dll/directx/dsound/capture.c +++ b/reactos/dll/directx/dsound/capture.c @@ -27,18 +27,22 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "mmddk.h" -#include "winternl.h" -#include "winnls.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "mmsystem.h" +#include +#include +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/dsound.c b/reactos/dll/directx/dsound/dsound.c index 1f60f37be6f..40d3132a516 100644 --- a/reactos/dll/directx/dsound/dsound.c +++ b/reactos/dll/directx/dsound/dsound.c @@ -20,24 +20,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "winternl.h" -#include "mmddk.h" -#include "wingdi.h" -#include "mmreg.h" -#include "ks.h" -#include "ksmedia.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "mmddk.h" +//#include "wingdi.h" +//#include "mmreg.h" +//#include "ks.h" +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/dsound_convert.c b/reactos/dll/directx/dsound/dsound_convert.c index 0a6e474d09d..03f5fc45e1d 100644 --- a/reactos/dll/directx/dsound/dsound_convert.c +++ b/reactos/dll/directx/dsound/dsound_convert.c @@ -33,19 +33,23 @@ * Sound is LITTLE endian */ -#include "config.h" +#include #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +#include +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/dsound_main.c b/reactos/dll/directx/dsound/dsound_main.c index 44897bc9946..4958966b354 100644 --- a/reactos/dll/directx/dsound/dsound_main.c +++ b/reactos/dll/directx/dsound/dsound_main.c @@ -34,24 +34,28 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "mmsystem.h" -#include "winternl.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsconf.h" -#include "ks.h" -#include "initguid.h" -#include "ksmedia.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "mmsystem.h" +#include +#include +#include +#include +#include +//#include "ks.h" +#include +//#include "ksmedia.h" +#include #include "dsound_private.h" diff --git a/reactos/dll/directx/dsound/dsound_private.h b/reactos/dll/directx/dsound/dsound_private.h index 221433f24cb..9947b85d032 100644 --- a/reactos/dll/directx/dsound/dsound_private.h +++ b/reactos/dll/directx/dsound/dsound_private.h @@ -23,7 +23,7 @@ #define DS_TIME_RES 2 /* Resolution of multimedia timer */ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ -#include "wine/list.h" +#include /* direct sound hardware acceleration levels */ #define DS_HW_ACCEL_FULL 0 /* default on Windows 98 */ diff --git a/reactos/dll/directx/dsound/duplex.c b/reactos/dll/directx/dsound/duplex.c index 1fe6bbc67da..42095c221fc 100644 --- a/reactos/dll/directx/dsound/duplex.c +++ b/reactos/dll/directx/dsound/duplex.c @@ -22,17 +22,21 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "mmddk.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +#include +//#include "mmddk.h" +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/mixer.c b/reactos/dll/directx/dsound/mixer.c index d014c4b8655..1e073790a2d 100644 --- a/reactos/dll/directx/dsound/mixer.c +++ b/reactos/dll/directx/dsound/mixer.c @@ -25,15 +25,19 @@ #include #include /* Insomnia - pow() function */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +#include +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/primary.c b/reactos/dll/directx/dsound/primary.c index b35a4eba09c..c4dd2dcc5bf 100644 --- a/reactos/dll/directx/dsound/primary.c +++ b/reactos/dll/directx/dsound/primary.c @@ -21,17 +21,21 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "winternl.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "mmsystem.h" +#include +#include +#include +#include +#include #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/propset.c b/reactos/dll/directx/dsound/propset.c index 147d7245512..df81a22e36e 100644 --- a/reactos/dll/directx/dsound/propset.c +++ b/reactos/dll/directx/dsound/propset.c @@ -20,21 +20,26 @@ */ #define COBJMACROS + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "winternl.h" -#include "winnls.h" -#include "vfwmsgs.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +//#include "mmsystem.h" +#include +#include +#include +#include +#include +#include +#include #include "dsound_private.h" -#include "dsconf.h" +#include #ifdef NONAMELESSSTRUCT # define S(x) (x).s @@ -44,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); - /******************************************************************************* * IKsBufferPropertySet */ diff --git a/reactos/dll/directx/dsound/regsvr.c b/reactos/dll/directx/dsound/regsvr.c index 49c648a9199..a1335633498 100644 --- a/reactos/dll/directx/dsound/regsvr.c +++ b/reactos/dll/directx/dsound/regsvr.c @@ -20,18 +20,22 @@ #include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" +#include +#include +//#include "winuser.h" +#include -#include "mmsystem.h" -#include "dsound.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/reactos/dll/directx/dsound/sound3d.c b/reactos/dll/directx/dsound/sound3d.c index 252c7632667..6c0285a1e8c 100644 --- a/reactos/dll/directx/dsound/sound3d.c +++ b/reactos/dll/directx/dsound/sound3d.c @@ -40,17 +40,21 @@ #include #include /* Insomnia - pow() function */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmsystem.h" -#include "winternl.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "mmddk.h" +#include +#include +#include #include "dsound_private.h" /* default velocity of sound in the air */ diff --git a/reactos/dll/directx/dxdiagn/container.c b/reactos/dll/directx/dxdiagn/container.c index 392a32de77e..75581714da4 100644 --- a/reactos/dll/directx/dxdiagn/container.c +++ b/reactos/dll/directx/dxdiagn/container.c @@ -19,10 +19,10 @@ * */ -#include "config.h" +#include #include "dxdiag_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); diff --git a/reactos/dll/directx/dxdiagn/dxdiag_main.c b/reactos/dll/directx/dxdiagn/dxdiag_main.c index 02ae12a53c3..94c42e606dc 100644 --- a/reactos/dll/directx/dxdiagn/dxdiag_main.c +++ b/reactos/dll/directx/dxdiagn/dxdiag_main.c @@ -19,9 +19,9 @@ * */ -#include "config.h" +#include #include "dxdiag_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); diff --git a/reactos/dll/directx/dxdiagn/dxdiag_private.h b/reactos/dll/directx/dxdiagn/dxdiag_private.h index f9cd9e34623..5d90a400a03 100644 --- a/reactos/dll/directx/dxdiagn/dxdiag_private.h +++ b/reactos/dll/directx/dxdiagn/dxdiag_private.h @@ -21,16 +21,20 @@ #ifndef __WINE_DXDIAG_PRIVATE_H #define __WINE_DXDIAG_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "objbase.h" +//#include "oleauto.h" -#include "dxdiag.h" +#include /* DXDiag Interfaces: */ typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; diff --git a/reactos/dll/directx/dxdiagn/provider.c b/reactos/dll/directx/dxdiagn/provider.c index bf5232d8e1c..9838aff58de 100644 --- a/reactos/dll/directx/dxdiagn/provider.c +++ b/reactos/dll/directx/dxdiagn/provider.c @@ -19,9 +19,9 @@ * */ -#include "config.h" +#include #include "dxdiag_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); diff --git a/reactos/dll/directx/dxdiagn/regsvr.c b/reactos/dll/directx/dxdiagn/regsvr.c index d5a003ebce5..748cc22e01f 100644 --- a/reactos/dll/directx/dxdiagn/regsvr.c +++ b/reactos/dll/directx/dxdiagn/regsvr.c @@ -18,20 +18,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "winerror.h" -#include "initguid.h" +#include #include "dxdiag_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); diff --git a/reactos/dll/directx/ksproxy/precomp.h b/reactos/dll/directx/ksproxy/precomp.h index f7268b1e026..9255270997a 100644 --- a/reactos/dll/directx/ksproxy/precomp.h +++ b/reactos/dll/directx/ksproxy/precomp.h @@ -1,5 +1,8 @@ #pragma once +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + #define _FORCENAMELESSUNION #define BUILDING_KS #define _KSDDK_ @@ -9,15 +12,15 @@ #include #define __STREAMS__ #include +#include #include -#include -#include -#include +//#include +//#include +//#include #include #include #include #include -#include #include #include #include @@ -25,7 +28,6 @@ #include //#include - interface DECLSPEC_UUID("877E4351-6FEA-11D0-B863-00AA00A216A1") IKsClock; #undef INTERFACE diff --git a/reactos/dll/directx/ksuser/ksuser.h b/reactos/dll/directx/ksuser/ksuser.h index 10953981dda..70aad96c03e 100644 --- a/reactos/dll/directx/ksuser/ksuser.h +++ b/reactos/dll/directx/ksuser/ksuser.h @@ -3,11 +3,14 @@ #define _KSDDK_ #define WIN32_NO_STATUS -#include -#include -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include diff --git a/reactos/dll/directx/msdmo/dmoreg.c b/reactos/dll/directx/msdmo/dmoreg.c index a3dc9304687..2a63452f820 100644 --- a/reactos/dll/directx/msdmo/dmoreg.c +++ b/reactos/dll/directx/msdmo/dmoreg.c @@ -17,18 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "winreg.h" -#include "objbase.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "initguid.h" -#include "dmo.h" +#include +#include +#include +//#include "winerror.h" +#include +#include +#include +#include +//#include "initguid.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msdmo); diff --git a/reactos/dll/directx/msdmo/dmort.c b/reactos/dll/directx/msdmo/dmort.c index b586cac6116..9102781c049 100644 --- a/reactos/dll/directx/msdmo/dmort.c +++ b/reactos/dll/directx/msdmo/dmort.c @@ -19,14 +19,17 @@ #include #define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "mediaobj.h" -#include "dmort.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msdmo); diff --git a/reactos/dll/directx/msdmo/stubs.c b/reactos/dll/directx/msdmo/stubs.c index 1b4dee9a72f..de89923de9e 100644 --- a/reactos/dll/directx/msdmo/stubs.c +++ b/reactos/dll/directx/msdmo/stubs.c @@ -1,5 +1,8 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include -#include #define NDEBUG #include diff --git a/reactos/dll/directx/qedit/main.c b/reactos/dll/directx/qedit/main.c index ede377fb579..3fbfea98337 100644 --- a/reactos/dll/directx/qedit/main.c +++ b/reactos/dll/directx/qedit/main.c @@ -18,7 +18,7 @@ */ #include "qedit_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/reactos/dll/directx/qedit/mediadet.c b/reactos/dll/directx/qedit/mediadet.c index 9aeb9c017cc..3a2d880ae66 100644 --- a/reactos/dll/directx/qedit/mediadet.c +++ b/reactos/dll/directx/qedit/mediadet.c @@ -18,17 +18,17 @@ */ #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "ole2.h" #include "qedit_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/reactos/dll/directx/qedit/qedit_private.h b/reactos/dll/directx/qedit/qedit_private.h index cf4747f5f17..66506d1ec9e 100644 --- a/reactos/dll/directx/qedit/qedit_private.h +++ b/reactos/dll/directx/qedit/qedit_private.h @@ -26,15 +26,22 @@ #include #define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" +#include +#include +//#include "wtypes.h" +//#include "wingdi.h" +//#include "winuser.h" + +#include +#include + +#include #define __WINE_DDRAW_H /* ROS HACK */ -#include "qedit.h" +#include HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj); diff --git a/reactos/dll/directx/qedit/regsvr.c b/reactos/dll/directx/qedit/regsvr.c index d007311840a..e1e3d8694a7 100644 --- a/reactos/dll/directx/qedit/regsvr.c +++ b/reactos/dll/directx/qedit/regsvr.c @@ -19,9 +19,9 @@ */ #include "qedit_private.h" -#include "winreg.h" +//#include "winreg.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/reactos/dll/directx/qedit/samplegrabber.c b/reactos/dll/directx/qedit/samplegrabber.c index 78979fecf28..60e221b94d3 100644 --- a/reactos/dll/directx/qedit/samplegrabber.c +++ b/reactos/dll/directx/qedit/samplegrabber.c @@ -17,18 +17,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "ole2.h" #include "qedit_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/reactos/dll/directx/quartz/acmwrapper.c b/reactos/dll/directx/quartz/acmwrapper.c index a0323911707..e40cfeca0fe 100644 --- a/reactos/dll/directx/quartz/acmwrapper.c +++ b/reactos/dll/directx/quartz/acmwrapper.c @@ -18,24 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "quartz_private.h" #include "pin.h" -#include "uuids.h" -#include "mmreg.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "strmif.h" -#include "vfwmsgs.h" -#include "msacm.h" +//#include "uuids.h" +#include +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "strmif.h" +//#include "vfwmsgs.h" +#include #include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include #include "transform.h" diff --git a/reactos/dll/directx/quartz/avidec.c b/reactos/dll/directx/quartz/avidec.c index b7d45e93890..a4f997c9233 100644 --- a/reactos/dll/directx/quartz/avidec.c +++ b/reactos/dll/directx/quartz/avidec.c @@ -18,25 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "quartz_private.h" #include "pin.h" -#include "uuids.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "strmif.h" -#include "vfwmsgs.h" -#include "vfw.h" -#include "dvdmedia.h" +//#include "uuids.h" +//#include "amvideo.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "strmif.h" +//#include "vfwmsgs.h" +#include +#include #include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +#include #include "transform.h" diff --git a/reactos/dll/directx/quartz/avisplit.c b/reactos/dll/directx/quartz/avisplit.c index 61078805903..ef28e3bb63e 100644 --- a/reactos/dll/directx/quartz/avisplit.c +++ b/reactos/dll/directx/quartz/avisplit.c @@ -33,16 +33,16 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "vfw.h" -#include "aviriff.h" -#include "vfwmsgs.h" -#include "amvideo.h" +//#include "uuids.h" +#include +#include +//#include "vfwmsgs.h" +//#include "amvideo.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +#include -#include +//#include #include #include "parser.h" diff --git a/reactos/dll/directx/quartz/control.c b/reactos/dll/directx/quartz/control.c index 9a50737ae91..03f87bbe6dc 100644 --- a/reactos/dll/directx/quartz/control.c +++ b/reactos/dll/directx/quartz/control.c @@ -22,8 +22,8 @@ #include "quartz_private.h" #include "control_private.h" -#include "uuids.h" -#include "wine/debug.h" +//#include "uuids.h" +#include #include diff --git a/reactos/dll/directx/quartz/dsoundrender.c b/reactos/dll/directx/quartz/dsoundrender.c index b327c00da9b..ddeb3b17e1e 100644 --- a/reactos/dll/directx/quartz/dsoundrender.c +++ b/reactos/dll/directx/quartz/dsoundrender.c @@ -18,24 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "quartz_private.h" #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "evcode.h" -#include "strmif.h" -#include "dsound.h" -#include "amaudio.h" +//#include "uuids.h" +//#include "vfwmsgs.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "evcode.h" +//#include "strmif.h" +//#include "dsound.h" +//#include "amaudio.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/enumfilters.c b/reactos/dll/directx/quartz/enumfilters.c index ab1f6ec6a72..ad80e619564 100644 --- a/reactos/dll/directx/quartz/enumfilters.c +++ b/reactos/dll/directx/quartz/enumfilters.c @@ -20,7 +20,7 @@ #include "quartz_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/enummedia.c b/reactos/dll/directx/quartz/enummedia.c index 60ff13a7b68..fca46912121 100644 --- a/reactos/dll/directx/quartz/enummedia.c +++ b/reactos/dll/directx/quartz/enummedia.c @@ -20,7 +20,7 @@ #include "quartz_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/enummoniker.c b/reactos/dll/directx/quartz/enummoniker.c index 0cc804a8b38..55f4d6a8d03 100644 --- a/reactos/dll/directx/quartz/enummoniker.c +++ b/reactos/dll/directx/quartz/enummoniker.c @@ -25,7 +25,7 @@ #include "quartz_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/enumpins.c b/reactos/dll/directx/quartz/enumpins.c index 8125ff42101..7f3c6440df5 100644 --- a/reactos/dll/directx/quartz/enumpins.c +++ b/reactos/dll/directx/quartz/enumpins.c @@ -20,7 +20,7 @@ #include "quartz_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/enumregfilters.c b/reactos/dll/directx/quartz/enumregfilters.c index cadeba5e02f..7145778b251 100644 --- a/reactos/dll/directx/quartz/enumregfilters.c +++ b/reactos/dll/directx/quartz/enumregfilters.c @@ -20,9 +20,9 @@ #include "quartz_private.h" -#include "wine/unicode.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/filesource.c b/reactos/dll/directx/quartz/filesource.c index cb9282c8bb5..6f1174d5924 100644 --- a/reactos/dll/directx/quartz/filesource.c +++ b/reactos/dll/directx/quartz/filesource.c @@ -23,14 +23,14 @@ #include "quartz_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "pin.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "uuids.h" +//#include "vfwmsgs.h" +//#include "winbase.h" +//#include "winreg.h" +#include #include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/filtergraph.c b/reactos/dll/directx/quartz/filtergraph.c index 18bf97c392b..553e026ab65 100644 --- a/reactos/dll/directx/quartz/filtergraph.c +++ b/reactos/dll/directx/quartz/filtergraph.c @@ -21,25 +21,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include +#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "dshow.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winreg.h" +//#include "dshow.h" +#include #include "quartz_private.h" -#include "ole2.h" -#include "olectl.h" -#include "strmif.h" -#include "vfwmsgs.h" -#include "evcode.h" -#include "wine/unicode.h" +#include +//#include "ole2.h" +//#include "olectl.h" +//#include "strmif.h" +//#include "vfwmsgs.h" +//#include "evcode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/filtermapper.c b/reactos/dll/directx/quartz/filtermapper.c index aeacfac386e..5946da86964 100644 --- a/reactos/dll/directx/quartz/filtermapper.c +++ b/reactos/dll/directx/quartz/filtermapper.c @@ -21,23 +21,23 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winreg.h" +//#include "winerror.h" #include "quartz_private.h" -#include "ole2.h" -#include "olectl.h" -#include "strmif.h" -#include "wine/unicode.h" -#include "uuids.h" +//#include "ole2.h" +//#include "olectl.h" +//#include "strmif.h" +#include +//#include "uuids.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/main.c b/reactos/dll/directx/quartz/main.c index 7828487b2dd..c3124dd1d53 100644 --- a/reactos/dll/directx/quartz/main.c +++ b/reactos/dll/directx/quartz/main.c @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#include +#include #include "quartz_private.h" -#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/memallocator.c b/reactos/dll/directx/quartz/memallocator.c index a1c4473238f..01a13b359a1 100644 --- a/reactos/dll/directx/quartz/memallocator.c +++ b/reactos/dll/directx/quartz/memallocator.c @@ -19,15 +19,15 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "vfwmsgs.h" +//#include "windef.h" +//#include "winbase.h" +//#include "vfwmsgs.h" #include "quartz_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/mpegsplit.c b/reactos/dll/directx/quartz/mpegsplit.c index 7eb2d2c213f..1f002b93f12 100644 --- a/reactos/dll/directx/quartz/mpegsplit.c +++ b/reactos/dll/directx/quartz/mpegsplit.c @@ -22,20 +22,20 @@ */ #include -#include +//#include #include "quartz_private.h" #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "mmreg.h" -#include "mmsystem.h" +//#include "uuids.h" +#include +//#include "mmsystem.h" -#include "winternl.h" +//#include "winternl.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include #include "parser.h" diff --git a/reactos/dll/directx/quartz/nullrenderer.c b/reactos/dll/directx/quartz/nullrenderer.c index d2aedfa38f4..1c4311ec40b 100644 --- a/reactos/dll/directx/quartz/nullrenderer.c +++ b/reactos/dll/directx/quartz/nullrenderer.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -27,18 +27,18 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "evcode.h" -#include "strmif.h" -#include "ddraw.h" +//#include "uuids.h" +//#include "vfwmsgs.h" +//#include "amvideo.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "evcode.h" +//#include "strmif.h" +//#include "ddraw.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/parser.c b/reactos/dll/directx/quartz/parser.c index da5e9d3d6ce..8fb591d2972 100644 --- a/reactos/dll/directx/quartz/parser.c +++ b/reactos/dll/directx/quartz/parser.c @@ -23,13 +23,13 @@ #include "control_private.h" #include "pin.h" -#include "vfwmsgs.h" -#include "amvideo.h" +//#include "vfwmsgs.h" +//#include "amvideo.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include -#include +//#include #include #include "parser.h" diff --git a/reactos/dll/directx/quartz/pin.c b/reactos/dll/directx/quartz/pin.c index fd0d5a2e522..20d7aedde9b 100644 --- a/reactos/dll/directx/quartz/pin.c +++ b/reactos/dll/directx/quartz/pin.c @@ -21,10 +21,10 @@ #include "quartz_private.h" #include "pin.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "uuids.h" -#include "vfwmsgs.h" +#include +#include +//#include "uuids.h" +//#include "vfwmsgs.h" #include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/quartz_private.h b/reactos/dll/directx/quartz/quartz_private.h index 3e0dfe1ae5e..a5073a7ff2a 100644 --- a/reactos/dll/directx/quartz/quartz_private.h +++ b/reactos/dll/directx/quartz/quartz_private.h @@ -23,17 +23,23 @@ #ifndef __QUARTZ_PRIVATE_INCLUDED__ #define __QUARTZ_PRIVATE_INCLUDED__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "wine/list.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/reactos/dll/directx/quartz/regsvr.c b/reactos/dll/directx/quartz/regsvr.c index cdb33d101c7..b5ec6ea7674 100644 --- a/reactos/dll/directx/quartz/regsvr.c +++ b/reactos/dll/directx/quartz/regsvr.c @@ -18,25 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +#include +#include +#include +//#include "winerror.h" -#include "ole2.h" -#include "uuids.h" -#include "strmif.h" +//#include "ole2.h" +#include "objbase.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/systemclock.c b/reactos/dll/directx/quartz/systemclock.c index 62413525572..a36512e5f56 100644 --- a/reactos/dll/directx/quartz/systemclock.c +++ b/reactos/dll/directx/quartz/systemclock.c @@ -20,9 +20,9 @@ #include "quartz_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include +#include +//#include "wine/unicode.h" +//#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/transform.c b/reactos/dll/directx/quartz/transform.c index adb753d057c..ceb04c171ed 100644 --- a/reactos/dll/directx/quartz/transform.c +++ b/reactos/dll/directx/quartz/transform.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "quartz_private.h" -#include "control_private.h" +//#include "control_private.h" #include "pin.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "strmif.h" -#include "vfw.h" +//#include "amvideo.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "strmif.h" +//#include "vfw.h" -#include +//#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include #include "transform.h" diff --git a/reactos/dll/directx/quartz/videorenderer.c b/reactos/dll/directx/quartz/videorenderer.c index 268373f1888..17042a7e1e8 100644 --- a/reactos/dll/directx/quartz/videorenderer.c +++ b/reactos/dll/directx/quartz/videorenderer.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -26,20 +26,20 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "evcode.h" -#include "strmif.h" -#include "ddraw.h" -#include "dvdmedia.h" +//#include "uuids.h" +//#include "vfwmsgs.h" +//#include "amvideo.h" +//#include "windef.h" +//#include "winbase.h" +//#include "dshow.h" +//#include "evcode.h" +//#include "strmif.h" +//#include "ddraw.h" +#include -#include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/reactos/dll/directx/quartz/waveparser.c b/reactos/dll/directx/quartz/waveparser.c index cbdfcebc3b8..fed18e16637 100644 --- a/reactos/dll/directx/quartz/waveparser.c +++ b/reactos/dll/directx/quartz/waveparser.c @@ -22,16 +22,16 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "aviriff.h" -#include "vfwmsgs.h" -#include "mmsystem.h" +//#include "uuids.h" +#include +//#include "vfwmsgs.h" +//#include "mmsystem.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include -#include -#include +//#include +//#include #include "parser.h" diff --git a/reactos/dll/directx/wine/d3d8/buffer.c b/reactos/dll/directx/wine/d3d8/buffer.c index b0a11ad6331..2a54efbc5bf 100644 --- a/reactos/dll/directx/wine/d3d8/buffer.c +++ b/reactos/dll/directx/wine/d3d8/buffer.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/d3d8_main.c b/reactos/dll/directx/wine/d3d8/d3d8_main.c index 34054472487..f3b162565f5 100644 --- a/reactos/dll/directx/wine/d3d8/d3d8_main.c +++ b/reactos/dll/directx/wine/d3d8/d3d8_main.c @@ -19,10 +19,10 @@ * */ -#include "config.h" -#include "initguid.h" +#include +#include #include "d3d8_private.h" -#include "wine/debug.h" +//#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/d3d8_private.h b/reactos/dll/directx/wine/d3d8/d3d8_private.h index af47e161fe4..2f16b0f3af1 100644 --- a/reactos/dll/directx/wine/d3d8/d3d8_private.h +++ b/reactos/dll/directx/wine/d3d8/d3d8_private.h @@ -23,18 +23,22 @@ #ifndef __WINE_D3D8_PRIVATE_H #define __WINE_D3D8_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/debug.h" -#include "d3d8.h" -#include "wine/wined3d.h" +#include +#include +#include +#include +#include +#include /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 diff --git a/reactos/dll/directx/wine/d3d8/device.c b/reactos/dll/directx/wine/d3d8/device.c index fa7cb4891f2..4b5956f8a8c 100644 --- a/reactos/dll/directx/wine/d3d8/device.c +++ b/reactos/dll/directx/wine/d3d8/device.c @@ -19,18 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" +//#include "wine/debug.h" #include "d3d8_private.h" diff --git a/reactos/dll/directx/wine/d3d8/directx.c b/reactos/dll/directx/wine/d3d8/directx.c index 89c2fcc8eaa..afe52330e26 100644 --- a/reactos/dll/directx/wine/d3d8/directx.c +++ b/reactos/dll/directx/wine/d3d8/directx.c @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "wine/debug.h" +//#include "wine/unicode.h" #include "d3d8_private.h" diff --git a/reactos/dll/directx/wine/d3d8/shader.c b/reactos/dll/directx/wine/d3d8/shader.c index db36120eee5..b82655ba4cb 100644 --- a/reactos/dll/directx/wine/d3d8/shader.c +++ b/reactos/dll/directx/wine/d3d8/shader.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/surface.c b/reactos/dll/directx/wine/d3d8/surface.c index 91d263c1c50..ba78426b00f 100644 --- a/reactos/dll/directx/wine/d3d8/surface.c +++ b/reactos/dll/directx/wine/d3d8/surface.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/swapchain.c b/reactos/dll/directx/wine/d3d8/swapchain.c index 0410fb80fc3..40565f01bd2 100644 --- a/reactos/dll/directx/wine/d3d8/swapchain.c +++ b/reactos/dll/directx/wine/d3d8/swapchain.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/texture.c b/reactos/dll/directx/wine/d3d8/texture.c index 59bc69379cf..22e03909c53 100644 --- a/reactos/dll/directx/wine/d3d8/texture.c +++ b/reactos/dll/directx/wine/d3d8/texture.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/vertexdeclaration.c b/reactos/dll/directx/wine/d3d8/vertexdeclaration.c index 2277be4b26f..a0a88005028 100644 --- a/reactos/dll/directx/wine/d3d8/vertexdeclaration.c +++ b/reactos/dll/directx/wine/d3d8/vertexdeclaration.c @@ -21,7 +21,7 @@ /* IDirect3DVertexDeclaration8 is internal to our implementation. * It's not visible in the API. */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d8/volume.c b/reactos/dll/directx/wine/d3d8/volume.c index 5c77193a2fc..c63c0895ed4 100644 --- a/reactos/dll/directx/wine/d3d8/volume.c +++ b/reactos/dll/directx/wine/d3d8/volume.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/reactos/dll/directx/wine/d3d9/buffer.c b/reactos/dll/directx/wine/d3d9/buffer.c index d543b2709b6..0711f9e626e 100644 --- a/reactos/dll/directx/wine/d3d9/buffer.c +++ b/reactos/dll/directx/wine/d3d9/buffer.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/d3d9_main.c b/reactos/dll/directx/wine/d3d9/d3d9_main.c index 065a37ee5ae..e6b0ed07071 100644 --- a/reactos/dll/directx/wine/d3d9/d3d9_main.c +++ b/reactos/dll/directx/wine/d3d9/d3d9_main.c @@ -21,8 +21,8 @@ * */ -#include "config.h" -#include "initguid.h" +#include +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/d3d9_private.h b/reactos/dll/directx/wine/d3d9/d3d9_private.h index bed2ed0861a..f8055386d39 100644 --- a/reactos/dll/directx/wine/d3d9/d3d9_private.h +++ b/reactos/dll/directx/wine/d3d9/d3d9_private.h @@ -23,21 +23,25 @@ #ifndef __WINE_D3D9_PRIVATE_H #define __WINE_D3D9_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +//#include "winuser.h" +#include +//#include "wine/unicode.h" -#include "d3d9.h" -#include "wine/wined3d.h" +#include +#include extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; diff --git a/reactos/dll/directx/wine/d3d9/device.c b/reactos/dll/directx/wine/d3d9/device.c index dff1ed00414..f3c531469e5 100644 --- a/reactos/dll/directx/wine/d3d9/device.c +++ b/reactos/dll/directx/wine/d3d9/device.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/directx.c b/reactos/dll/directx/wine/d3d9/directx.c index 3cb979f4f35..e887cdd80e6 100644 --- a/reactos/dll/directx/wine/d3d9/directx.c +++ b/reactos/dll/directx/wine/d3d9/directx.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/query.c b/reactos/dll/directx/wine/d3d9/query.c index d3634133601..7e01a69a4cb 100644 --- a/reactos/dll/directx/wine/d3d9/query.c +++ b/reactos/dll/directx/wine/d3d9/query.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/shader.c b/reactos/dll/directx/wine/d3d9/shader.c index e65f485b2e3..4e7abed9450 100644 --- a/reactos/dll/directx/wine/d3d9/shader.c +++ b/reactos/dll/directx/wine/d3d9/shader.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/stateblock.c b/reactos/dll/directx/wine/d3d9/stateblock.c index 8ec8db9d3b9..6062364b523 100644 --- a/reactos/dll/directx/wine/d3d9/stateblock.c +++ b/reactos/dll/directx/wine/d3d9/stateblock.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/surface.c b/reactos/dll/directx/wine/d3d9/surface.c index 7213a32dfaf..9d44d84972a 100644 --- a/reactos/dll/directx/wine/d3d9/surface.c +++ b/reactos/dll/directx/wine/d3d9/surface.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/swapchain.c b/reactos/dll/directx/wine/d3d9/swapchain.c index af56d73e60f..d06dc81e79d 100644 --- a/reactos/dll/directx/wine/d3d9/swapchain.c +++ b/reactos/dll/directx/wine/d3d9/swapchain.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/texture.c b/reactos/dll/directx/wine/d3d9/texture.c index 87395c00b2c..de795b845b8 100644 --- a/reactos/dll/directx/wine/d3d9/texture.c +++ b/reactos/dll/directx/wine/d3d9/texture.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/vertexdeclaration.c b/reactos/dll/directx/wine/d3d9/vertexdeclaration.c index 4fe11896c98..d57d3b96129 100644 --- a/reactos/dll/directx/wine/d3d9/vertexdeclaration.c +++ b/reactos/dll/directx/wine/d3d9/vertexdeclaration.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3d9/volume.c b/reactos/dll/directx/wine/d3d9/volume.c index ba5dc0566bc..6511820c778 100644 --- a/reactos/dll/directx/wine/d3d9/volume.c +++ b/reactos/dll/directx/wine/d3d9/volume.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c b/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c index cc6ffbf04e9..07293304e50 100644 --- a/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c +++ b/reactos/dll/directx/wine/d3dx9_24/d3dx9_24_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c b/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c index 57a066964a8..5d436825ccc 100644 --- a/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c +++ b/reactos/dll/directx/wine/d3dx9_25/d3dx9_25_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c b/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c index 1ce818b5b50..267339614db 100644 --- a/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c +++ b/reactos/dll/directx/wine/d3dx9_26/d3dx9_26_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c b/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c index 15919832ccd..f989f761299 100644 --- a/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c +++ b/reactos/dll/directx/wine/d3dx9_27/d3dx9_27_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c b/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c index 2157eec4324..cbe18f221e6 100644 --- a/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c +++ b/reactos/dll/directx/wine/d3dx9_28/d3dx9_28_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c b/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c index 5782417710e..59a7971a463 100644 --- a/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c +++ b/reactos/dll/directx/wine/d3dx9_29/d3dx9_29_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c index ae131156924..1bb0ce35657 100644 --- a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c +++ b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c b/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c index 3f38b840b53..9338dc61239 100644 --- a/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c +++ b/reactos/dll/directx/wine/d3dx9_31/d3dx9_31_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c b/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c index 90888225952..f5751c9e895 100644 --- a/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c +++ b/reactos/dll/directx/wine/d3dx9_32/d3dx9_32_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c b/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c index afe8947b1b6..180edf777e0 100644 --- a/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c +++ b/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c b/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c index 18acc11e909..324d2f1b017 100644 --- a/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c +++ b/reactos/dll/directx/wine/d3dx9_34/d3dx9_34_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c b/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c index f87861883fa..e21899ac771 100644 --- a/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c +++ b/reactos/dll/directx/wine/d3dx9_35/d3dx9_35_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_36/core.c b/reactos/dll/directx/wine/d3dx9_36/core.c index 3b63e9e4688..ee47c0ad4c9 100644 --- a/reactos/dll/directx/wine/d3dx9_36/core.c +++ b/reactos/dll/directx/wine/d3dx9_36/core.c @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +#include +//#include "wine/unicode.h" #include "d3dx9_36_private.h" diff --git a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c index e9c700444ef..6bc93a7302e 100644 --- a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c +++ b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c @@ -20,18 +20,22 @@ * */ -#include "config.h" -#include "wine/port.h" -#include "initguid.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h index cca440384c0..ff396b48bc8 100644 --- a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h +++ b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h @@ -22,13 +22,19 @@ #ifndef __WINE_D3DX9_36_PRIVATE_H #define __WINE_D3DX9_36_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "d3dx9.h" +#include +#include +#include +#include +#include +#include /* for internal use */ typedef enum _FormatType { diff --git a/reactos/dll/directx/wine/d3dx9_36/font.c b/reactos/dll/directx/wine/d3dx9_36/font.c index 98b4fe9557f..0ba65d23617 100644 --- a/reactos/dll/directx/wine/d3dx9_36/font.c +++ b/reactos/dll/directx/wine/d3dx9_36/font.c @@ -17,11 +17,11 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/math.c b/reactos/dll/directx/wine/d3dx9_36/math.c index c2193c83eba..ed5696554fb 100644 --- a/reactos/dll/directx/wine/d3dx9_36/math.c +++ b/reactos/dll/directx/wine/d3dx9_36/math.c @@ -24,12 +24,12 @@ #define NONAMELESSUNION -#include "config.h" -#include "windef.h" -#include "wingdi.h" +#include +//#include "windef.h" +//#include "wingdi.h" #include "d3dx9_36_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/mesh.c b/reactos/dll/directx/wine/d3dx9_36/mesh.c index 91116b28341..b945f820fce 100644 --- a/reactos/dll/directx/wine/d3dx9_36/mesh.c +++ b/reactos/dll/directx/wine/d3dx9_36/mesh.c @@ -18,14 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #define NONAMELESSUNION -#include "windef.h" -#include "wingdi.h" -#include "d3dx9.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/shader.c b/reactos/dll/directx/wine/d3dx9_36/shader.c index e4de6b32dca..9b41c59d23f 100644 --- a/reactos/dll/directx/wine/d3dx9_36/shader.c +++ b/reactos/dll/directx/wine/d3dx9_36/shader.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "wingdi.h" -#include "d3dx9.h" -#include "d3dx9shader.h" +#include +//#include "wine/port.h" +#include +//#include "wine/unicode.h" +//#include "windef.h" +//#include "wingdi.h" +//#include "d3dx9.h" +//#include "d3dx9shader.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/sprite.c b/reactos/dll/directx/wine/d3dx9_36/sprite.c index ce9938e9e55..f625b814c33 100644 --- a/reactos/dll/directx/wine/d3dx9_36/sprite.c +++ b/reactos/dll/directx/wine/d3dx9_36/sprite.c @@ -17,7 +17,7 @@ * */ -#include "wine/debug.h" +#include #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/surface.c b/reactos/dll/directx/wine/d3dx9_36/surface.c index 6de6de77ab2..e1d5203c76d 100644 --- a/reactos/dll/directx/wine/d3dx9_36/surface.c +++ b/reactos/dll/directx/wine/d3dx9_36/surface.c @@ -17,8 +17,8 @@ * */ -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/texture.c b/reactos/dll/directx/wine/d3dx9_36/texture.c index f47853a89df..ea6882424f1 100644 --- a/reactos/dll/directx/wine/d3dx9_36/texture.c +++ b/reactos/dll/directx/wine/d3dx9_36/texture.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/reactos/dll/directx/wine/d3dx9_36/util.c b/reactos/dll/directx/wine/d3dx9_36/util.c index 748e6d1125b..7acc41a4e11 100644 --- a/reactos/dll/directx/wine/d3dx9_36/util.c +++ b/reactos/dll/directx/wine/d3dx9_36/util.c @@ -17,7 +17,7 @@ * */ -#include "wine/debug.h" +#include #include "d3dx9_36_private.h" diff --git a/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c b/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c index 21700098a23..9600afab7ba 100644 --- a/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c +++ b/reactos/dll/directx/wine/d3dx9_37/d3dx9_37_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c b/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c index 5165ad66b33..665440a4456 100644 --- a/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c +++ b/reactos/dll/directx/wine/d3dx9_38/d3dx9_38_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c b/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c index 2386be79485..e9f999a876f 100644 --- a/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c +++ b/reactos/dll/directx/wine/d3dx9_39/d3dx9_39_main.c @@ -19,17 +19,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c b/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c index f603db927a2..220b76115cb 100644 --- a/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c +++ b/reactos/dll/directx/wine/d3dx9_40/d3dx9_40_main.c @@ -20,17 +20,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c b/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c index 51a92c5ade2..36fbbf4287c 100644 --- a/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c +++ b/reactos/dll/directx/wine/d3dx9_41/d3dx9_41_main.c @@ -20,17 +20,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c b/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c index ca5f7506b68..744eb6014f3 100644 --- a/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c +++ b/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c @@ -21,17 +21,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "d3dx9.h" +#include /*********************************************************************** * DllMain. diff --git a/reactos/dll/directx/wine/ddraw/clipper.c b/reactos/dll/directx/wine/ddraw/clipper.c index db9c3838285..7703fd0c495 100644 --- a/reactos/dll/directx/wine/ddraw/clipper.c +++ b/reactos/dll/directx/wine/ddraw/clipper.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/ddraw.c b/reactos/dll/directx/wine/ddraw/ddraw.c index ceed7924a7f..9fd1c6bcd88 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw.c +++ b/reactos/dll/directx/wine/ddraw/ddraw.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/ddraw.rc b/reactos/dll/directx/wine/ddraw/ddraw.rc index 14a2b40fc0b..3926bb44eae 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw.rc +++ b/reactos/dll/directx/wine/ddraw/ddraw.rc @@ -1,3 +1,3 @@ #include "version.rc" -1 WINE_REGISTRY ddraw.rgs \ No newline at end of file +1 WINE_REGISTRY ddraw.rgs diff --git a/reactos/dll/directx/wine/ddraw/ddraw_private.h b/reactos/dll/directx/wine/ddraw/ddraw_private.h index 563377f049d..3fe2dbb3dc1 100644 --- a/reactos/dll/directx/wine/ddraw/ddraw_private.h +++ b/reactos/dll/directx/wine/ddraw/ddraw_private.h @@ -19,23 +19,27 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "wine/debug.h" +#include -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +#include -#include "d3d.h" -#include "ddraw.h" +#include +//#include "ddraw.h" #ifdef DDRAW_INIT_GUID -#include "initguid.h" +#include #endif -#include "wine/list.h" -#include "wine/wined3d.h" +#include +#include extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; diff --git a/reactos/dll/directx/wine/ddraw/device.c b/reactos/dll/directx/wine/ddraw/device.c index a60abe4a3aa..d12a70e8f3e 100644 --- a/reactos/dll/directx/wine/ddraw/device.c +++ b/reactos/dll/directx/wine/ddraw/device.c @@ -27,8 +27,8 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/executebuffer.c b/reactos/dll/directx/wine/ddraw/executebuffer.c index 85625c1beb9..d30b169c928 100644 --- a/reactos/dll/directx/wine/ddraw/executebuffer.c +++ b/reactos/dll/directx/wine/ddraw/executebuffer.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/light.c b/reactos/dll/directx/wine/ddraw/light.c index ad4ac712e2d..abd2731c721 100644 --- a/reactos/dll/directx/wine/ddraw/light.c +++ b/reactos/dll/directx/wine/ddraw/light.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/main.c b/reactos/dll/directx/wine/ddraw/main.c index 61e8ec9dd0b..d6d531d252b 100644 --- a/reactos/dll/directx/wine/ddraw/main.c +++ b/reactos/dll/directx/wine/ddraw/main.c @@ -24,15 +24,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #define DDRAW_INIT_GUID #include "ddraw_private.h" -#include "rpcproxy.h" +#include -#include "wine/exception.h" -#include "winreg.h" +#include +//#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/reactos/dll/directx/wine/ddraw/material.c b/reactos/dll/directx/wine/ddraw/material.c index 4b447265978..884159b53ab 100644 --- a/reactos/dll/directx/wine/ddraw/material.c +++ b/reactos/dll/directx/wine/ddraw/material.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/palette.c b/reactos/dll/directx/wine/ddraw/palette.c index 7d879ad3b10..eb5ac2fff43 100644 --- a/reactos/dll/directx/wine/ddraw/palette.c +++ b/reactos/dll/directx/wine/ddraw/palette.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/surface.c b/reactos/dll/directx/wine/ddraw/surface.c index 1b66cba9b2e..b87da4d74d2 100644 --- a/reactos/dll/directx/wine/ddraw/surface.c +++ b/reactos/dll/directx/wine/ddraw/surface.c @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/utils.c b/reactos/dll/directx/wine/ddraw/utils.c index 3d25adcad6d..c69a1cf70b0 100644 --- a/reactos/dll/directx/wine/ddraw/utils.c +++ b/reactos/dll/directx/wine/ddraw/utils.c @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/vertexbuffer.c b/reactos/dll/directx/wine/ddraw/vertexbuffer.c index 1fd33e7e9ee..41da3d0c8be 100644 --- a/reactos/dll/directx/wine/ddraw/vertexbuffer.c +++ b/reactos/dll/directx/wine/ddraw/vertexbuffer.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/ddraw/viewport.c b/reactos/dll/directx/wine/ddraw/viewport.c index 6a4713af462..05b5556dd7f 100644 --- a/reactos/dll/directx/wine/ddraw/viewport.c +++ b/reactos/dll/directx/wine/ddraw/viewport.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "ddraw_private.h" diff --git a/reactos/dll/directx/wine/wined3d/arb_program_shader.c b/reactos/dll/directx/wine/wined3d/arb_program_shader.c index c8799df333d..5341d6a626a 100644 --- a/reactos/dll/directx/wine/wined3d/arb_program_shader.c +++ b/reactos/dll/directx/wine/wined3d/arb_program_shader.c @@ -27,10 +27,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c index bc816fb06d6..1d3cfabbce6 100644 --- a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c +++ b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include +//#include +//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/buffer.c b/reactos/dll/directx/wine/wined3d/buffer.c index 97547eb960f..1e9a8b3b56d 100644 --- a/reactos/dll/directx/wine/wined3d/buffer.c +++ b/reactos/dll/directx/wine/wined3d/buffer.c @@ -22,8 +22,8 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/context.c b/reactos/dll/directx/wine/wined3d/context.c index 229632d9f87..72301e0ca7d 100644 --- a/reactos/dll/directx/wine/wined3d/context.c +++ b/reactos/dll/directx/wine/wined3d/context.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #ifdef HAVE_FLOAT_H # include #endif diff --git a/reactos/dll/directx/wine/wined3d/device.c b/reactos/dll/directx/wine/wined3d/device.c index 9744265b013..a0c19602fca 100644 --- a/reactos/dll/directx/wine/wined3d/device.c +++ b/reactos/dll/directx/wine/wined3d/device.c @@ -24,10 +24,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #ifdef HAVE_FLOAT_H # include #endif diff --git a/reactos/dll/directx/wine/wined3d/directx.c b/reactos/dll/directx/wine/wined3d/directx.c index 58397e98bc0..9b44c030ce9 100644 --- a/reactos/dll/directx/wine/wined3d/directx.c +++ b/reactos/dll/directx/wine/wined3d/directx.c @@ -21,13 +21,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include #include "wined3d_private.h" -#include "winternl.h" +//#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/drawprim.c b/reactos/dll/directx/wine/wined3d/drawprim.c index 8df04a33ff1..69625ffef7c 100644 --- a/reactos/dll/directx/wine/wined3d/drawprim.c +++ b/reactos/dll/directx/wine/wined3d/drawprim.c @@ -24,15 +24,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); -#include -#include +//#include +//#include /* GL locking is done by the caller */ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primitive_type, UINT count, UINT idx_size, diff --git a/reactos/dll/directx/wine/wined3d/gl_compat.c b/reactos/dll/directx/wine/wined3d/gl_compat.c index cd22097b6e6..fb4e2b8785f 100644 --- a/reactos/dll/directx/wine/wined3d/gl_compat.c +++ b/reactos/dll/directx/wine/wined3d/gl_compat.c @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #ifdef HAVE_FLOAT_H # include #endif diff --git a/reactos/dll/directx/wine/wined3d/glsl_shader.c b/reactos/dll/directx/wine/wined3d/glsl_shader.c index 8e6b23a9c7c..ea0c0ee8d66 100644 --- a/reactos/dll/directx/wine/wined3d/glsl_shader.c +++ b/reactos/dll/directx/wine/wined3d/glsl_shader.c @@ -29,10 +29,10 @@ * mask for the destination parameter into account. */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c index bc38cb83561..015e3684892 100644 --- a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c +++ b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c @@ -19,11 +19,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include +//#include +//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/palette.c b/reactos/dll/directx/wine/wined3d/palette.c index 1e85be24236..1d1220380f7 100644 --- a/reactos/dll/directx/wine/wined3d/palette.c +++ b/reactos/dll/directx/wine/wined3d/palette.c @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "winerror.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +//#include "wine/debug.h" -#include +//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/query.c b/reactos/dll/directx/wine/wined3d/query.c index 4a3d7a77e43..25a67f48b65 100644 --- a/reactos/dll/directx/wine/wined3d/query.c +++ b/reactos/dll/directx/wine/wined3d/query.c @@ -19,8 +19,8 @@ */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/resource.c b/reactos/dll/directx/wine/wined3d/resource.c index d7846224a89..7059ca551f9 100644 --- a/reactos/dll/directx/wine/wined3d/resource.c +++ b/reactos/dll/directx/wine/wined3d/resource.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/shader.c b/reactos/dll/directx/wine/wined3d/shader.c index 2244ccd3ee1..78afef43f3d 100644 --- a/reactos/dll/directx/wine/wined3d/shader.c +++ b/reactos/dll/directx/wine/wined3d/shader.c @@ -22,12 +22,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include -#include +//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/shader_sm1.c b/reactos/dll/directx/wine/wined3d/shader_sm1.c index aa1da56c5ba..350f540b64f 100644 --- a/reactos/dll/directx/wine/wined3d/shader_sm1.c +++ b/reactos/dll/directx/wine/wined3d/shader_sm1.c @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/shader_sm4.c b/reactos/dll/directx/wine/wined3d/shader_sm4.c index 25bb72a4275..5285ae95bbb 100644 --- a/reactos/dll/directx/wine/wined3d/shader_sm4.c +++ b/reactos/dll/directx/wine/wined3d/shader_sm4.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/state.c b/reactos/dll/directx/wine/wined3d/state.c index ebfdb7e7239..310388fb8bf 100644 --- a/reactos/dll/directx/wine/wined3d/state.c +++ b/reactos/dll/directx/wine/wined3d/state.c @@ -25,10 +25,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #ifdef HAVE_FLOAT_H # include #endif diff --git a/reactos/dll/directx/wine/wined3d/stateblock.c b/reactos/dll/directx/wine/wined3d/stateblock.c index 9660f2ed62e..8066fd0848e 100644 --- a/reactos/dll/directx/wine/wined3d/stateblock.c +++ b/reactos/dll/directx/wine/wined3d/stateblock.c @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/surface.c b/reactos/dll/directx/wine/wined3d/surface.c index 71beb51758b..9bc153ab048 100644 --- a/reactos/dll/directx/wine/wined3d/surface.c +++ b/reactos/dll/directx/wine/wined3d/surface.c @@ -26,8 +26,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); diff --git a/reactos/dll/directx/wine/wined3d/swapchain.c b/reactos/dll/directx/wine/wined3d/swapchain.c index c4fc409cf39..379b2687b51 100644 --- a/reactos/dll/directx/wine/wined3d/swapchain.c +++ b/reactos/dll/directx/wine/wined3d/swapchain.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/texture.c b/reactos/dll/directx/wine/wined3d/texture.c index ecfcc060498..3d148fbf8aa 100644 --- a/reactos/dll/directx/wine/wined3d/texture.c +++ b/reactos/dll/directx/wine/wined3d/texture.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); diff --git a/reactos/dll/directx/wine/wined3d/utils.c b/reactos/dll/directx/wine/wined3d/utils.c index 4f8108ff7cf..f2328c921ea 100644 --- a/reactos/dll/directx/wine/wined3d/utils.c +++ b/reactos/dll/directx/wine/wined3d/utils.c @@ -24,8 +24,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c index ff8c07c7272..2e47bcd95ad 100644 --- a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c +++ b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); diff --git a/reactos/dll/directx/wine/wined3d/view.c b/reactos/dll/directx/wine/wined3d/view.c index 872335f2bd5..3d06208052d 100644 --- a/reactos/dll/directx/wine/wined3d/view.c +++ b/reactos/dll/directx/wine/wined3d/view.c @@ -17,8 +17,8 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/volume.c b/reactos/dll/directx/wine/wined3d/volume.c index c11a6025b6a..ad38d5e2e67 100644 --- a/reactos/dll/directx/wine/wined3d/volume.c +++ b/reactos/dll/directx/wine/wined3d/volume.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); diff --git a/reactos/dll/directx/wine/wined3d/wined3d_main.c b/reactos/dll/directx/wine/wined3d/wined3d_main.c index 2247e9c17ce..01a4071c6e6 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_main.c +++ b/reactos/dll/directx/wine/wined3d/wined3d_main.c @@ -22,10 +22,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include "initguid.h" +//#include "initguid.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h index c23a6fa84ce..4963e960374 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_private.h +++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h @@ -24,6 +24,10 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #ifdef USE_WIN32_OPENGL #define WINE_GLAPI __stdcall #else @@ -31,25 +35,25 @@ #endif #include -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "winbase.h" +#include +#include +#include +#include +#include -#include "objbase.h" -#include "wine/wined3d.h" +#include +#include #include "wined3d_gl.h" -#include "wine/list.h" -#include "wine/rbtree.h" -#include "wine/wgl_driver.h" +#include +#include +#include /* Driver quirks */ #define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 diff --git a/reactos/dll/keyboard/kbda1/kbda1.c b/reactos/dll/keyboard/kbda1/kbda1.c index 971b8d94ae4..e85d0eaf3d3 100644 --- a/reactos/dll/keyboard/kbda1/kbda1.c +++ b/reactos/dll/keyboard/kbda1/kbda1.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbda2/kbda2.c b/reactos/dll/keyboard/kbda2/kbda2.c index 9054bdcf149..3ad64ea40cf 100644 --- a/reactos/dll/keyboard/kbda2/kbda2.c +++ b/reactos/dll/keyboard/kbda2/kbda2.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbda3/kbda3.c b/reactos/dll/keyboard/kbda3/kbda3.c index d446804098e..888330a2944 100644 --- a/reactos/dll/keyboard/kbda3/kbda3.c +++ b/reactos/dll/keyboard/kbda3/kbda3.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdal/kbdal.c b/reactos/dll/keyboard/kbdal/kbdal.c index 74ff25f6703..6c8af804acb 100644 --- a/reactos/dll/keyboard/kbdal/kbdal.c +++ b/reactos/dll/keyboard/kbdal/kbdal.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.c b/reactos/dll/keyboard/kbdarme/kbdarme.c index f40cc4aad45..e2b9bb8aded 100644 --- a/reactos/dll/keyboard/kbdarme/kbdarme.c +++ b/reactos/dll/keyboard/kbdarme/kbdarme.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.c b/reactos/dll/keyboard/kbdarmw/kbdarmw.c index a67baba6b37..2be08a89688 100644 --- a/reactos/dll/keyboard/kbdarmw/kbdarmw.c +++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.c b/reactos/dll/keyboard/kbdaze/kbdaze.c index 8c5a1d27ff6..5124ba87dcd 100644 --- a/reactos/dll/keyboard/kbdaze/kbdaze.c +++ b/reactos/dll/keyboard/kbdaze/kbdaze.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.c b/reactos/dll/keyboard/kbdazel/kbdazel.c index 6e792c51e15..f337d165a2c 100644 --- a/reactos/dll/keyboard/kbdazel/kbdazel.c +++ b/reactos/dll/keyboard/kbdazel/kbdazel.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.c b/reactos/dll/keyboard/kbdbe/kbdbe.c index 02637905fb9..7e5d6657a60 100644 --- a/reactos/dll/keyboard/kbdbe/kbdbe.c +++ b/reactos/dll/keyboard/kbdbe/kbdbe.c @@ -8,7 +8,10 @@ * Dead keys */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.c b/reactos/dll/keyboard/kbdbga/kbdbga.c index 0684ac13ab0..667071e021b 100644 --- a/reactos/dll/keyboard/kbdbga/kbdbga.c +++ b/reactos/dll/keyboard/kbdbga/kbdbga.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.c b/reactos/dll/keyboard/kbdbgm/kbdbgm.c index a81188e0be6..14ca5a24713 100644 --- a/reactos/dll/keyboard/kbdbgm/kbdbgm.c +++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.c b/reactos/dll/keyboard/kbdbgt/kbdbgt.c index eb9c1821582..c1e85be7c25 100644 --- a/reactos/dll/keyboard/kbdbgt/kbdbgt.c +++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.c b/reactos/dll/keyboard/kbdblr/kbdblr.c index ac4ce5e265b..0c049085f6f 100644 --- a/reactos/dll/keyboard/kbdblr/kbdblr.c +++ b/reactos/dll/keyboard/kbdblr/kbdblr.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.c b/reactos/dll/keyboard/kbdbr/kbdbr.c index 434b757b75d..7719c044721 100644 --- a/reactos/dll/keyboard/kbdbr/kbdbr.c +++ b/reactos/dll/keyboard/kbdbr/kbdbr.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.c b/reactos/dll/keyboard/kbdbur/kbdbur.c index 715657c18f1..078ffe7dfe2 100644 --- a/reactos/dll/keyboard/kbdbur/kbdbur.c +++ b/reactos/dll/keyboard/kbdbur/kbdbur.c @@ -5,7 +5,10 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.c b/reactos/dll/keyboard/kbdcan/kbdcan.c index 7d56dbfaa90..c2099e5f121 100644 --- a/reactos/dll/keyboard/kbdcan/kbdcan.c +++ b/reactos/dll/keyboard/kbdcan/kbdcan.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.c b/reactos/dll/keyboard/kbdcr/kbdcr.c index 509204db492..87345c22187 100644 --- a/reactos/dll/keyboard/kbdcr/kbdcr.c +++ b/reactos/dll/keyboard/kbdcr/kbdcr.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdcz/kbdcz.c b/reactos/dll/keyboard/kbdcz/kbdcz.c index 27f0afb129e..8675452dcc9 100644 --- a/reactos/dll/keyboard/kbdcz/kbdcz.c +++ b/reactos/dll/keyboard/kbdcz/kbdcz.c @@ -7,7 +7,10 @@ * modified by Radek Liska (radekliska att gmail ddot com) */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.c b/reactos/dll/keyboard/kbdcz1/kbdcz1.c index 94ad39bacee..e4b6e923af2 100644 --- a/reactos/dll/keyboard/kbdcz1/kbdcz1.c +++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.c @@ -7,7 +7,10 @@ * modified by Kamil Hornicek (tykef at atlas dot cz) */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdda/kbdda.c b/reactos/dll/keyboard/kbdda/kbdda.c index ed8e710ba34..1d68d3c2d00 100644 --- a/reactos/dll/keyboard/kbdda/kbdda.c +++ b/reactos/dll/keyboard/kbdda/kbdda.c @@ -2,7 +2,10 @@ * Danish Keyboard layout * Copyright (C) 2004 ReactOS Development Team */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbddv/kbddv.c b/reactos/dll/keyboard/kbddv/kbddv.c index a156cfa237f..b3100b7116b 100644 --- a/reactos/dll/keyboard/kbddv/kbddv.c +++ b/reactos/dll/keyboard/kbddv/kbddv.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdes/kbdes.c b/reactos/dll/keyboard/kbdes/kbdes.c index 0891785f2f9..67aa880ad01 100644 --- a/reactos/dll/keyboard/kbdes/kbdes.c +++ b/reactos/dll/keyboard/kbdes/kbdes.c @@ -12,7 +12,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdest/kbdest.c b/reactos/dll/keyboard/kbdest/kbdest.c index e693eef4470..43b344ee3a0 100644 --- a/reactos/dll/keyboard/kbdest/kbdest.c +++ b/reactos/dll/keyboard/kbdest/kbdest.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.c b/reactos/dll/keyboard/kbdfc/kbdfc.c index 892287f851d..016869cd110 100644 --- a/reactos/dll/keyboard/kbdfc/kbdfc.c +++ b/reactos/dll/keyboard/kbdfc/kbdfc.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.c b/reactos/dll/keyboard/kbdfi/kbdfi.c index 88d1b118856..a321dda808b 100644 --- a/reactos/dll/keyboard/kbdfi/kbdfi.c +++ b/reactos/dll/keyboard/kbdfi/kbdfi.c @@ -5,7 +5,10 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.c b/reactos/dll/keyboard/kbdfr/kbdfr.c index c71e0b111b9..e2d315e160b 100644 --- a/reactos/dll/keyboard/kbdfr/kbdfr.c +++ b/reactos/dll/keyboard/kbdfr/kbdfr.c @@ -7,7 +7,10 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.c b/reactos/dll/keyboard/kbdgeo/kbdgeo.c index 993294740fd..44eee7e5bdb 100644 --- a/reactos/dll/keyboard/kbdgeo/kbdgeo.c +++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.c b/reactos/dll/keyboard/kbdgerg/kbdgerg.c index df55f18de10..249d579a940 100644 --- a/reactos/dll/keyboard/kbdgerg/kbdgerg.c +++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.c b/reactos/dll/keyboard/kbdgneo/kbdgneo.c index bb10077e256..34300170c60 100644 --- a/reactos/dll/keyboard/kbdgneo/kbdgneo.c +++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.c b/reactos/dll/keyboard/kbdgr/kbdgr.c index 152177ee7ef..ff83647b878 100644 --- a/reactos/dll/keyboard/kbdgr/kbdgr.c +++ b/reactos/dll/keyboard/kbdgr/kbdgr.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.c b/reactos/dll/keyboard/kbdgrist/kbdgrist.c index 31a10028708..a9dbbff43db 100644 --- a/reactos/dll/keyboard/kbdgrist/kbdgrist.c +++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.c b/reactos/dll/keyboard/kbdhe/kbdhe.c index 68f5165d776..e01af950fc7 100644 --- a/reactos/dll/keyboard/kbdhe/kbdhe.c +++ b/reactos/dll/keyboard/kbdhe/kbdhe.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.c b/reactos/dll/keyboard/kbdheb/kbdheb.c index bf340382f04..703809310b3 100644 --- a/reactos/dll/keyboard/kbdheb/kbdheb.c +++ b/reactos/dll/keyboard/kbdheb/kbdheb.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _MSC_VER diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.c b/reactos/dll/keyboard/kbdhu/kbdhu.c index 3acdffa377b..c2fbabeb8a9 100644 --- a/reactos/dll/keyboard/kbdhu/kbdhu.c +++ b/reactos/dll/keyboard/kbdhu/kbdhu.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdic/kbdic.c b/reactos/dll/keyboard/kbdic/kbdic.c index a75fc9cd73a..ec14a97250d 100644 --- a/reactos/dll/keyboard/kbdic/kbdic.c +++ b/reactos/dll/keyboard/kbdic/kbdic.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.c b/reactos/dll/keyboard/kbdinasa/kbdinasa.c index ac3841794f5..32e39764f69 100644 --- a/reactos/dll/keyboard/kbdinasa/kbdinasa.c +++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.c b/reactos/dll/keyboard/kbdinben/kbdinben.c index e31bb93d61b..ad7c1db9b57 100644 --- a/reactos/dll/keyboard/kbdinben/kbdinben.c +++ b/reactos/dll/keyboard/kbdinben/kbdinben.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.c b/reactos/dll/keyboard/kbdindev/kbdindev.c index 9d14cc724b6..966c0be19fb 100644 --- a/reactos/dll/keyboard/kbdindev/kbdindev.c +++ b/reactos/dll/keyboard/kbdindev/kbdindev.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.c b/reactos/dll/keyboard/kbdinguj/kbdinguj.c index c0648b82cb1..90a1dcf93ac 100644 --- a/reactos/dll/keyboard/kbdinguj/kbdinguj.c +++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.c b/reactos/dll/keyboard/kbdinmal/kbdinmal.c index a8e270db463..904c4f22679 100644 --- a/reactos/dll/keyboard/kbdinmal/kbdinmal.c +++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdir/kbdir.c b/reactos/dll/keyboard/kbdir/kbdir.c index c28e2de035a..8f8377271e8 100644 --- a/reactos/dll/keyboard/kbdir/kbdir.c +++ b/reactos/dll/keyboard/kbdir/kbdir.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdit/kbdit.c b/reactos/dll/keyboard/kbdit/kbdit.c index 66fc2f829b9..9c841421df5 100644 --- a/reactos/dll/keyboard/kbdit/kbdit.c +++ b/reactos/dll/keyboard/kbdit/kbdit.c @@ -5,7 +5,10 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdja/kbdja.c b/reactos/dll/keyboard/kbdja/kbdja.c index c17853aac74..b250b9a1118 100644 --- a/reactos/dll/keyboard/kbdja/kbdja.c +++ b/reactos/dll/keyboard/kbdja/kbdja.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.c b/reactos/dll/keyboard/kbdkaz/kbdkaz.c index fbf33be47a7..60121f69a6a 100644 --- a/reactos/dll/keyboard/kbdkaz/kbdkaz.c +++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdko/kbdko.c b/reactos/dll/keyboard/kbdko/kbdko.c index 896e502ca30..d6b10143f87 100644 --- a/reactos/dll/keyboard/kbdko/kbdko.c +++ b/reactos/dll/keyboard/kbdko/kbdko.c @@ -13,7 +13,10 @@ * keyboard layout! */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdla/kbdla.c b/reactos/dll/keyboard/kbdla/kbdla.c index ba33457fa29..488cfeaf204 100644 --- a/reactos/dll/keyboard/kbdla/kbdla.c +++ b/reactos/dll/keyboard/kbdla/kbdla.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdlt1/kbdlt1.c b/reactos/dll/keyboard/kbdlt1/kbdlt1.c index 8cf8a37985f..b5781ca5304 100644 --- a/reactos/dll/keyboard/kbdlt1/kbdlt1.c +++ b/reactos/dll/keyboard/kbdlt1/kbdlt1.c @@ -9,7 +9,10 @@ * http://www.microsoft.com/globaldev/reference/keyboards.mspx */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.c b/reactos/dll/keyboard/kbdlv/kbdlv.c index ca859218b03..2d75ebf4b5e 100644 --- a/reactos/dll/keyboard/kbdlv/kbdlv.c +++ b/reactos/dll/keyboard/kbdlv/kbdlv.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.c b/reactos/dll/keyboard/kbdmac/kbdmac.c index 8b21e962c01..8a77a449aea 100644 --- a/reactos/dll/keyboard/kbdmac/kbdmac.c +++ b/reactos/dll/keyboard/kbdmac/kbdmac.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdne/kbdne.c b/reactos/dll/keyboard/kbdne/kbdne.c index 2b33fecec58..f58e7ae36d2 100644 --- a/reactos/dll/keyboard/kbdne/kbdne.c +++ b/reactos/dll/keyboard/kbdne/kbdne.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdno/kbdno.c b/reactos/dll/keyboard/kbdno/kbdno.c index a3c9dfdc817..c9b19bc3729 100644 --- a/reactos/dll/keyboard/kbdno/kbdno.c +++ b/reactos/dll/keyboard/kbdno/kbdno.c @@ -2,7 +2,10 @@ * Norwegian Keyboard layout * Copyright (C) 2004 ReactOS Development Team */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdpl/kbdpl.c b/reactos/dll/keyboard/kbdpl/kbdpl.c index 7680afc8c1b..d7b0e353644 100644 --- a/reactos/dll/keyboard/kbdpl/kbdpl.c +++ b/reactos/dll/keyboard/kbdpl/kbdpl.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.c b/reactos/dll/keyboard/kbdpl1/kbdpl1.c index 0df8bd742f3..bd20e8c8ab5 100644 --- a/reactos/dll/keyboard/kbdpl1/kbdpl1.c +++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.c b/reactos/dll/keyboard/kbdpo/kbdpo.c index b639bbcbaaa..a6fb89072a4 100644 --- a/reactos/dll/keyboard/kbdpo/kbdpo.c +++ b/reactos/dll/keyboard/kbdpo/kbdpo.c @@ -15,7 +15,10 @@ * Correct DIVIDE and PrtScr */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdro/kbdro.c b/reactos/dll/keyboard/kbdro/kbdro.c index 793ffec6696..8849c4d1681 100644 --- a/reactos/dll/keyboard/kbdro/kbdro.c +++ b/reactos/dll/keyboard/kbdro/kbdro.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdru/kbdru.c b/reactos/dll/keyboard/kbdru/kbdru.c index c8d3e8d3d77..092ed570957 100644 --- a/reactos/dll/keyboard/kbdru/kbdru.c +++ b/reactos/dll/keyboard/kbdru/kbdru.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.c b/reactos/dll/keyboard/kbdru1/kbdru1.c index 34bdbd41c5b..b3419c76a8a 100644 --- a/reactos/dll/keyboard/kbdru1/kbdru1.c +++ b/reactos/dll/keyboard/kbdru1/kbdru1.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.c b/reactos/dll/keyboard/kbdsg/kbdsg.c index e3a50001970..b7985437731 100644 --- a/reactos/dll/keyboard/kbdsg/kbdsg.c +++ b/reactos/dll/keyboard/kbdsg/kbdsg.c @@ -8,7 +8,10 @@ * and http://www.unicode.org/charts/ */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.c b/reactos/dll/keyboard/kbdsk/kbdsk.c index 892302a283e..4f636ab1e7e 100644 --- a/reactos/dll/keyboard/kbdsk/kbdsk.c +++ b/reactos/dll/keyboard/kbdsk/kbdsk.c @@ -7,7 +7,10 @@ * Thanks to creators of others kbdxx.dll */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.c b/reactos/dll/keyboard/kbdsk1/kbdsk1.c index 20bc91dd453..ec02c8aa221 100644 --- a/reactos/dll/keyboard/kbdsk1/kbdsk1.c +++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.c @@ -7,7 +7,10 @@ * Special thanks to Milan Margus (malin23@atlas.sk) */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.c b/reactos/dll/keyboard/kbdsw/kbdsw.c index 970d6d823b1..66d8fa32791 100644 --- a/reactos/dll/keyboard/kbdsw/kbdsw.c +++ b/reactos/dll/keyboard/kbdsw/kbdsw.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.c b/reactos/dll/keyboard/kbdtat/kbdtat.c index 9bf67a307a1..4f04ba193a7 100644 --- a/reactos/dll/keyboard/kbdtat/kbdtat.c +++ b/reactos/dll/keyboard/kbdtat/kbdtat.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.c b/reactos/dll/keyboard/kbdth0/kbdth0.c index 08fd8248bbb..7085975b853 100644 --- a/reactos/dll/keyboard/kbdth0/kbdth0.c +++ b/reactos/dll/keyboard/kbdth0/kbdth0.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.c b/reactos/dll/keyboard/kbdth1/kbdth1.c index e9b0f359dc8..d30fd373f5a 100644 --- a/reactos/dll/keyboard/kbdth1/kbdth1.c +++ b/reactos/dll/keyboard/kbdth1/kbdth1.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.c b/reactos/dll/keyboard/kbdth2/kbdth2.c index 562b9a84c39..3779699ab5a 100644 --- a/reactos/dll/keyboard/kbdth2/kbdth2.c +++ b/reactos/dll/keyboard/kbdth2/kbdth2.c @@ -5,7 +5,10 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.c b/reactos/dll/keyboard/kbdth3/kbdth3.c index 76c5f7196fb..c98c7c0ab98 100644 --- a/reactos/dll/keyboard/kbdth3/kbdth3.c +++ b/reactos/dll/keyboard/kbdth3/kbdth3.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.c b/reactos/dll/keyboard/kbdtuf/kbdtuf.c index 4057558a250..03cdb1d2b31 100644 --- a/reactos/dll/keyboard/kbdtuf/kbdtuf.c +++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.c b/reactos/dll/keyboard/kbdtuq/kbdtuq.c index b3e33a0597c..ed9f1f6bb79 100644 --- a/reactos/dll/keyboard/kbdtuq/kbdtuq.c +++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbduk/kbduk.c b/reactos/dll/keyboard/kbduk/kbduk.c index d0f3f034f00..23feb4a492d 100644 --- a/reactos/dll/keyboard/kbduk/kbduk.c +++ b/reactos/dll/keyboard/kbduk/kbduk.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdur/kbdur.c b/reactos/dll/keyboard/kbdur/kbdur.c index f8bf0058d4f..b101be5c6ed 100644 --- a/reactos/dll/keyboard/kbdur/kbdur.c +++ b/reactos/dll/keyboard/kbdur/kbdur.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.c b/reactos/dll/keyboard/kbdurs/kbdurs.c index 6726f7334bc..320f1dae9f8 100644 --- a/reactos/dll/keyboard/kbdurs/kbdurs.c +++ b/reactos/dll/keyboard/kbdurs/kbdurs.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdus/kbdus.c b/reactos/dll/keyboard/kbdus/kbdus.c index 053cedca8e8..ef103cdc1b2 100644 --- a/reactos/dll/keyboard/kbdus/kbdus.c +++ b/reactos/dll/keyboard/kbdus/kbdus.c @@ -7,7 +7,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.c b/reactos/dll/keyboard/kbdusa/kbdusa.c index b448fc64d5e..7f39d4d1c80 100644 --- a/reactos/dll/keyboard/kbdusa/kbdusa.c +++ b/reactos/dll/keyboard/kbdusa/kbdusa.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.c b/reactos/dll/keyboard/kbdusl/kbdusl.c index da822d62887..4ee85186dff 100644 --- a/reactos/dll/keyboard/kbdusl/kbdusl.c +++ b/reactos/dll/keyboard/kbdusl/kbdusl.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.c b/reactos/dll/keyboard/kbdusr/kbdusr.c index 65540000dbf..8733483d0e1 100644 --- a/reactos/dll/keyboard/kbdusr/kbdusr.c +++ b/reactos/dll/keyboard/kbdusr/kbdusr.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.c b/reactos/dll/keyboard/kbdusx/kbdusx.c index 5090836cdb0..0f0ae653d86 100644 --- a/reactos/dll/keyboard/kbdusx/kbdusx.c +++ b/reactos/dll/keyboard/kbdusx/kbdusx.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.c b/reactos/dll/keyboard/kbduzb/kbduzb.c index d6fcf340bc2..f48c4b28933 100644 --- a/reactos/dll/keyboard/kbduzb/kbduzb.c +++ b/reactos/dll/keyboard/kbduzb/kbduzb.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.c b/reactos/dll/keyboard/kbdvntc/kbdvntc.c index 970b99fc0f8..2c453c794a7 100644 --- a/reactos/dll/keyboard/kbdvntc/kbdvntc.c +++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.c b/reactos/dll/keyboard/kbdycc/kbdycc.c index 6554c9136c2..9570f49ae53 100644 --- a/reactos/dll/keyboard/kbdycc/kbdycc.c +++ b/reactos/dll/keyboard/kbdycc/kbdycc.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.c b/reactos/dll/keyboard/kbdycl/kbdycl.c index 9886dec40a3..3991436e0ae 100644 --- a/reactos/dll/keyboard/kbdycl/kbdycl.c +++ b/reactos/dll/keyboard/kbdycl/kbdycl.c @@ -8,7 +8,10 @@ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html */ -#include +#define WIN32_NO_STATUS +#include +#include +#include #include #ifdef _M_IA64 diff --git a/reactos/dll/ntdll/def/ntdll.rc b/reactos/dll/ntdll/def/ntdll.rc index fd330ca9846..fbc9abd0db5 100644 --- a/reactos/dll/ntdll/def/ntdll.rc +++ b/reactos/dll/ntdll/def/ntdll.rc @@ -1,9 +1,7 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Layer DLL\0" #define REACTOS_STR_INTERNAL_NAME "ntdll\0" #define REACTOS_STR_ORIGINAL_FILENAME "ntdll.dll\0" #include -#include "ntstatus.rc" +#include diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h index edbce5ae68d..159cbb3af8b 100644 --- a/reactos/dll/ntdll/include/ntdll.h +++ b/reactos/dll/ntdll/include/ntdll.h @@ -16,13 +16,16 @@ #define _CTYPE_DISABLE_MACROS #define _CRT_SECURE_NO_DEPRECATE #define _INC_SWPRINTF_INL_ -#include #include -#include /* SDK/DDK/NDK Headers. */ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/dll/opengl/glu32/src/include/gluos.h b/reactos/dll/opengl/glu32/src/include/gluos.h index 290a06f0282..28fd5881eb6 100644 --- a/reactos/dll/opengl/glu32/src/include/gluos.h +++ b/reactos/dll/opengl/glu32/src/include/gluos.h @@ -33,8 +33,9 @@ #include /* For _MAX_PATH definition */ #include -#include +//#include +#define WIN32_NO_STATUS #define WIN32_LEAN_AND_MEAN #define NOGDI #define NOIME @@ -53,7 +54,8 @@ #define STRICT 1 #endif -#include +//#include +#include /* Disable warnings */ #if defined(_MSC_VER) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc index b414f535f95..83bba984761 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc @@ -35,11 +35,11 @@ /* */ -#include -#include +//#include +//#include #include #include -#include "bezierEval.h" +//#include "bezierEval.h" #ifdef __WATCOMC__ #pragma warning 14 10 diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc index dbab3a1a2b7..af678c2fdab 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc @@ -36,8 +36,8 @@ */ #include "gluos.h" -#include -#include +//#include +//#include #include #include /*for drawing bzier patch*/ #include "bezierPatch.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc index ac7ff84fc4a..6b4d7cfdaec 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc @@ -36,10 +36,10 @@ */ #include "gluos.h" -#include -#include +//#include +//#include #include -#include +//#include #include "bezierEval.h" #include "bezierPatchMesh.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc index b6591dba0d4..0f035b9d1b3 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc @@ -40,10 +40,10 @@ /* Polynomial Evaluator Interface */ #include "gluos.h" -#include "glimports.h" +//#include "glimports.h" #include "glrenderer.h" -#include "glcurveval.h" -#include "nurbsconsts.h" +//#include "glcurveval.h" +//#include "nurbsconsts.h" OpenGLCurveEvaluator::OpenGLCurveEvaluator(void) { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc index ba64bcd2dcf..86d50a9db6c 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc @@ -36,12 +36,12 @@ */ #include "gluos.h" -#include -#include -#include -#include "glimports.h" +//#include +//#include +//#include +//#include "glimports.h" #include "glrenderer.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" //#define DOWN_LOAD_NURBS #ifdef DOWN_LOAD_NURBS diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc index 17123fbc614..ecd5c45e853 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc @@ -36,7 +36,7 @@ */ #include "gluos.h" -#include "glimports.h" +//#include "glimports.h" #include "glrenderer.h" GLUnurbs::GLUnurbs() diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc index b5bfab1e281..bb10d06b939 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc @@ -39,12 +39,12 @@ /* Polynomial Evaluator Interface */ #include "gluos.h" -#include -#include "glimports.h" +//#include +//#include "glimports.h" #include "glrenderer.h" -#include "glsurfeval.h" -#include "nurbsconsts.h" -#include "bezierPatchMesh.h" +//#include "glsurfeval.h" +//#include "nurbsconsts.h" +//#include "bezierPatchMesh.h" //extern int surfcount; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc index 96ea8896ae7..ae0cb37da88 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc @@ -35,8 +35,8 @@ /* */ -#include -#include +//#include +//#include #include "glcurveval.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc b/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc index 9d0c82a91c0..b35761a4be1 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc @@ -36,9 +36,9 @@ */ #include "gluos.h" -#include -#include -#include +//#include +//#include +//#include #include #include diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc index cd4c4048a0a..310e8fda340 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc @@ -37,13 +37,13 @@ * */ -#include -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "arc.h" -#include "bin.h" -#include "pwlarc.h" +//#include "bin.h" +//#include "pwlarc.h" #include "simplemath.h" /* local preprocessor definitions */ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h index ca397f3b1fd..b2491346bb0 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h @@ -36,10 +36,10 @@ #ifndef __gluarc_h_ #define __gluarc_h_ -#include "myassert.h" +//#include "myassert.h" #include "bufpool.h" #include "mystdio.h" -#include "types.h" +//#include "types.h" #include "pwlarc.h" #include "trimvertex.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc index 1f85cb7108a..5e8b0d908d2 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc @@ -40,8 +40,8 @@ #ifndef __gluarcsorter_c_ #define __gluarcsorter_c_ -#include "glimports.h" -#include "arc.h" +//#include "glimports.h" +//#include "arc.h" #include "arcsorter.h" #include "subdivider.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc index 29e7cf4c002..48de92c4ab6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc @@ -37,14 +37,14 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "arctess.h" -#include "bufpool.h" +//#include "bufpool.h" #include "simplemath.h" #include "bezierarc.h" -#include "trimvertex.h" +//#include "trimvertex.h" #include "trimvertpool.h" #define NOELIMINATION diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h index 7802af90c0a..60ad48c63e3 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h @@ -37,7 +37,7 @@ #define __gluarctess_h_ #include "defines.h" -#include "types.h" +//#include "types.h" #include "arc.h" struct BezierArc; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc index 27b41ebb29e..c1e6515106f 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc @@ -40,9 +40,9 @@ /* Bezier surface backend - interprets display mode (wireframe,shaded,...) */ -#include -#include "glimports.h" -#include "mystdio.h" +//#include +//#include "glimports.h" +//#include "mystdio.h" #include "backend.h" #include "basiccrveval.h" #include "basicsurfeval.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h index 6840cb19e92..c443f2d2b5b 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h @@ -36,8 +36,8 @@ #ifndef __glubackend_h_ #define __glubackend_h_ -#include "trimvertex.h" -#include "gridvertex.h" +//#include "trimvertex.h" +//#include "gridvertex.h" #include "gridtrimvertex.h" class BasicCurveEvaluator; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc index cc473e4c2a1..725b4ff81b6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc @@ -37,8 +37,8 @@ * */ -#include "mystdio.h" -#include "types.h" +//#include "mystdio.h" +//#include "types.h" #include "basiccrveval.h" void diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h index 277dc8dc967..ddb050dc7db 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h @@ -37,7 +37,7 @@ #define __glubasiccrveval_h_ #include "types.h" -#include "displaymode.h" +//#include "displaymode.h" #include "cachingeval.h" class BasicCurveEvaluator : public CachingEvaluator { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc index fad5dd0ada3..60d86271825 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc @@ -37,8 +37,8 @@ * */ -#include "mystdio.h" -#include "types.h" +//#include "mystdio.h" +//#include "types.h" #include "basicsurfeval.h" #ifdef __WATCOMC__ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h index 4acfb094881..994300f55fb 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h @@ -36,7 +36,7 @@ #ifndef __glubezierarc_h #define __glubezierarc_h -#include "myassert.h" +//#include "myassert.h" class Mapdesc; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc index d85bd80dc8b..8fd2e8ec980 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "bin.h" /*---------------------------------------------------------------------------- diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h index dd0f878f60e..3cb445634ec 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h @@ -36,9 +36,9 @@ #ifndef __glubin_h_ #define __glubin_h_ -#include "myassert.h" +//#include "myassert.h" #include "arc.h" -#include "defines.h" +//#include "defines.h" class Bin { /* a linked list of jordan arcs */ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc index 53ac1a5695d..33893ab8ac1 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc @@ -37,8 +37,8 @@ * */ -#include "glimports.h" -#include "myassert.h" +//#include "glimports.h" +//#include "myassert.h" #include "bufpool.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h index 0fa9433750c..d5042e40353 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h @@ -38,7 +38,7 @@ #include "gluos.h" #include "myassert.h" -#include "mystdlib.h" +//#include "mystdlib.h" #define NBLOCKS 32 diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc index eb01b7781a7..fcd85a427f6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc @@ -37,13 +37,13 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "subdivider.h" -#include "types.h" -#include "arc.h" -#include "trimvertex.h" +//#include "types.h" +//#include "arc.h" +//#include "trimvertex.h" #include "simplemath.h" inline int diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc index ca5bf36b363..14c51bb8641 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc @@ -37,13 +37,13 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "coveandtiler.h" -#include "gridvertex.h" -#include "gridtrimvertex.h" -#include "uarray.h" +//#include "gridvertex.h" +//#include "gridtrimvertex.h" +//#include "uarray.h" #include "backend.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h index d454202e6d3..e1861052a30 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h @@ -37,7 +37,7 @@ #define __glucoveandtiler_h #include "trimregion.h" -#include "trimvertex.h" +//#include "trimvertex.h" #include "gridvertex.h" class Backend; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc index b7c4d4a9c7c..ca396c38237 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc @@ -37,15 +37,15 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "mymath.h" #include "curve.h" #include "mapdesc.h" -#include "types.h" +//#include "types.h" #include "quilt.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" /*-------------------------------------------------------------------------- * Curve::Curve - copy curve from quilt and transform control points diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc index 8f2ee4678d2..b0927fb324d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc @@ -37,13 +37,13 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "quilt.h" #include "curvelist.h" #include "curve.h" -#include "types.h" +//#include "types.h" Curvelist::Curvelist( Quilt *quilts, REAL pta, REAL ptb ) { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h index 733a5115d01..2b51acdfeaa 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h @@ -36,8 +36,8 @@ #ifndef __glucurvelist_h_ #define __glucurvelist_h_ -#include "types.h" -#include "defines.h" +//#include "types.h" +//#include "defines.h" class Mapdesc; class Quilt; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc index 91f2ca8ce8e..ae3fae7cbf4 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc @@ -45,7 +45,7 @@ #include "backend.h" #include "quilt.h" #include "curvelist.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" /*-------------------------------------------------------------------------- * drawCurves - main curve rendering entry point diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc index 55c0fbb159a..baad24ded21 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc @@ -35,12 +35,12 @@ /* */ -#include -#include -#include "glimports.h" -#include "myassert.h" -#include "nurbsconsts.h" -#include "trimvertex.h" +//#include +//#include +//#include "glimports.h" +//#include "myassert.h" +//#include "nurbsconsts.h" +//#include "trimvertex.h" #include "dataTransform.h" extern directedLine* arcLoopToDLineLoop(Arc_ptr loop); diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc index 48593c6371d..94b3a9b1c87 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "nurbstess.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "nurbstess.h" #include "displaylist.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h index d009a42513e..34eb6b1f01b 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h @@ -36,9 +36,9 @@ #ifndef __gludisplaylist_h_ #define __gludisplaylist_h_ -#include "glimports.h" -#include "mysetjmp.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "mysetjmp.h" +//#include "mystdio.h" #include "bufpool.h" class NurbsTessellator; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc index d3162b9f5f5..ff06bbe2fad 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" +//#include "glimports.h" #include "myassert.h" -#include "mystdio.h" +//#include "mystdio.h" #include "flist.h" /*---------------------------------------------------------------------------- diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h index 014273ebe51..62fab2dc2c5 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h @@ -36,7 +36,7 @@ #ifndef __gluflist_h_ #define __gluflist_h_ -#include "types.h" +//#include "types.h" #include "flistsorter.h" class Flist { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc index d49bdea3e00..4be15a83d3e 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc @@ -37,7 +37,7 @@ * */ -#include "glimports.h" +//#include "glimports.h" #include "flistsorter.h" FlistSorter::FlistSorter( void ) : Sorter( sizeof( REAL ) ) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h index 707f649d20b..3b46219494d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h @@ -36,7 +36,7 @@ #ifndef __glugridtrimvertex_h_ #define __glugridtrimvertex_h_ -#include "mystdlib.h" +//#include "mystdlib.h" #include "bufpool.h" #include "trimvertex.h" #include "gridvertex.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc index 389ba66fb84..16eb0c03f17 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc @@ -37,16 +37,16 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "hull.h" -#include "gridvertex.h" -#include "gridtrimvertex.h" -#include "gridline.h" -#include "trimline.h" -#include "uarray.h" -#include "trimregion.h" +//#include "gridvertex.h" +//#include "gridtrimvertex.h" +//#include "gridline.h" +//#include "trimline.h" +//#include "uarray.h" +//#include "trimregion.h" Hull::Hull( void ) {} diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h index dfe865267f7..534368741a0 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h @@ -36,9 +36,9 @@ #ifndef __gluhull_h_ #define __gluhull_h_ -#include "trimline.h" +//#include "trimline.h" #include "trimregion.h" -#include "trimvertex.h" +//#include "trimvertex.h" #include "gridtrimvertex.h" struct Gridline; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc index b39ea2121ef..076761508c6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc @@ -37,14 +37,14 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "subdivider.h" -#include "arc.h" -#include "bin.h" +//#include "arc.h" +//#include "bin.h" #include "backend.h" -#include "trimvertpool.h" +//#include "trimvertpool.h" /*#define NOTDEF*/ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc index dcbf0067d85..6d303bdeac6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc @@ -37,8 +37,8 @@ * */ -#include "glimports.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "mystdio.h" #include "myassert.h" #include "knotvector.h" #include "defines.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc index 0a96c5f45b8..99c4995f07e 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc @@ -37,14 +37,14 @@ * */ -#include -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" -#include "mystring.h" +//#include +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" +//#include "mystring.h" #include "mymath.h" #include "backend.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" #include "mapdesc.h" Mapdesc::Mapdesc( long _type, int _israt, int _ncoords, Backend& b ) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h index 6f06154f92a..fd7659e1c8d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h @@ -36,7 +36,7 @@ #ifndef __glumapdesc_h_ #define __glumapdesc_h_ -#include "mystdio.h" +//#include "mystdio.h" #include "types.h" #include "defines.h" #include "bufpool.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc index 35b38b141b7..df0524382e6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc @@ -37,12 +37,12 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" -#include "mystring.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" +//#include "mystring.h" #include "mymath.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" #include "mapdesc.h" /*-------------------------------------------------------------------------- diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc index e51a3e85d0c..c933b8d6610 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc @@ -37,11 +37,11 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" -#include "mymath.h" -#include "nurbsconsts.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" +//#include "mymath.h" +//#include "nurbsconsts.h" #include "maplist.h" #include "mapdesc.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h index 49720e49b42..5a81a824bbb 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h @@ -36,8 +36,8 @@ #ifndef __glumaplist_h_ #define __glumaplist_h_ -#include "types.h" -#include "defines.h" +//#include "types.h" +//#include "defines.h" #include "bufpool.h" class Backend; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc index b2d83f41288..3b4c0f00c94 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc @@ -37,15 +37,15 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" -#include "gridvertex.h" -#include "gridtrimvertex.h" -#include "jarcloc.h" -#include "gridline.h" -#include "trimline.h" -#include "uarray.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" +//#include "gridvertex.h" +//#include "gridtrimvertex.h" +//#include "jarcloc.h" +//#include "gridline.h" +//#include "trimline.h" +//#include "uarray.h" #include "backend.h" #include "mesher.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc index 2830cc743ca..88fd59b9ec8 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc @@ -38,7 +38,7 @@ #include "monoTriangulation.h" #include "polyUtil.h" #include "backend.h" -#include "arc.h" +//#include "arc.h" void reflexChain::outputFan(Real v[2], Backend* backend) { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc index 5845d310bad..1a8beff3c28 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc @@ -37,15 +37,15 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "arc.h" -#include "arctess.h" +//#include "arctess.h" #include "bezierarc.h" -#include "bin.h" +//#include "bin.h" #include "mapdesc.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" #include "subdivider.h" /*----------------------------------------------------------------------------- diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc index 3625cacd74f..30b3ab63e04 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc @@ -35,7 +35,7 @@ /* */ -#include "mymath.h" +//#include "mymath.h" #ifdef NEEDCEILF diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc index 520bd419ea2..12cf1a72ea2 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc @@ -37,11 +37,11 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "nurbsconsts.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "nurbsconsts.h" #include "nurbstess.h" -#include "bufpool.h" +//#include "bufpool.h" #include "quilt.h" #include "displaylist.h" #include "knotvector.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc index e477a8c8334..67631ef0cfe 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc @@ -37,17 +37,17 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mysetjmp.h" -#include "mystdio.h" -#include "nurbsconsts.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mysetjmp.h" +//#include "mystdio.h" +//#include "nurbsconsts.h" #include "nurbstess.h" -#include "bufpool.h" +//#include "bufpool.h" #include "quilt.h" #include "knotvector.h" #include "mapdesc.h" -#include "maplist.h" +//#include "maplist.h" void NurbsTessellator::set_domain_distance_u_rate(REAL u_rate) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h index a6869002fb6..2e7a0cbec64 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h @@ -36,13 +36,13 @@ #ifndef __glunurbstess_h_ #define __glunurbstess_h_ -#include "mysetjmp.h" +//#include "mysetjmp.h" #include "subdivider.h" #include "renderhints.h" #include "backend.h" #include "maplist.h" #include "reader.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" struct Knotvector; class Quilt; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc index 808baa69e44..28c78625eb2 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc @@ -37,16 +37,16 @@ * */ -#include -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "mymath.h" -#include "mystring.h" +//#include "mystring.h" #include "patch.h" #include "mapdesc.h" #include "quilt.h" -#include "nurbsconsts.h" +//#include "nurbsconsts.h" #include "simplemath.h" //for glu_abs function in ::singleStep(); diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc index 6a400ab6f72..79c61910d65 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc @@ -37,13 +37,13 @@ * */ -#include -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "quilt.h" #include "patchlist.h" -#include "patch.h" +//#include "patch.h" Patchlist::Patchlist( Quilt *quilts, REAL *pta, REAL *ptb ) { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h index 9bfc5b47a24..dc40c0c02e5 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h @@ -36,8 +36,8 @@ #ifndef __glupatchlist_h_ #define __glupatchlist_h_ -#include "types.h" -#include "defines.h" +//#include "types.h" +//#include "defines.h" #include "patch.h" class Quilt; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h index 2e5175a6f33..f583cd644e8 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h @@ -36,7 +36,7 @@ #ifndef __glupwlarc_h_ #define __glupwlarc_h_ -#include "myassert.h" +//#include "myassert.h" #include "nurbsconsts.h" class TrimVertex; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc index d16f4bfec02..d51188a2dee 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" #include "quilt.h" #include "backend.h" #include "mapdesc.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h index fe1e3309ead..eec2335a6b5 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h @@ -36,7 +36,7 @@ #ifndef __gluquilt_h_ #define __gluquilt_h_ -#include "defines.h" +//#include "defines.h" #include "bufpool.h" #include "types.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc index c59240d26ab..7e11a875a7b 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc @@ -37,8 +37,8 @@ * */ -#include -#include "glimports.h" +//#include +//#include "glimports.h" #include "nurbsconsts.h" #include "reader.h" #include "trimvertex.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc index 4b347ebc7f5..1ade0d1b53f 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc @@ -38,7 +38,7 @@ */ #include "glimports.h" -#include "mystdio.h" +//#include "mystdio.h" #include "renderhints.h" #include "nurbsconsts.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h index d00062dc700..c35a7a1acbb 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h @@ -38,7 +38,7 @@ /* simple inline routines */ -#include "types.h" +//#include "types.h" inline int max( int x, int y ) { return ( x < y ) ? y : x; } diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc index 1b18d73c176..ef79f03cf29 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc @@ -37,19 +37,19 @@ * */ -#include -#include -#include -#include "glimports.h" -#include "mystdio.h" -#include "myassert.h" -#include "bufpool.h" +//#include +//#include +//#include +//#include "glimports.h" +//#include "mystdio.h" +//#include "myassert.h" +//#include "bufpool.h" #include "slicer.h" #include "backend.h" -#include "arc.h" -#include "gridtrimvertex.h" +//#include "arc.h" +//#include "gridtrimvertex.h" #include "simplemath.h" -#include "trimvertex.h" +//#include "trimvertex.h" #include "varray.h" #include "polyUtil.h" //for area() diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h index e1f5d22ff10..59457c59e81 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h @@ -36,10 +36,10 @@ #ifndef __gluslicer_h_ #define __gluslicer_h_ -#include "trimregion.h" +//#include "trimregion.h" #include "mesher.h" #include "coveandtiler.h" -#include "primitiveStream.h" +//#include "primitiveStream.h" #include "rectBlock.h" class Backend; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc index 7a79941492d..32ab241c152 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc @@ -39,7 +39,7 @@ #include "glimports.h" #include "sorter.h" -#include "mystdio.h" +//#include "mystdio.h" Sorter::Sorter( int _es ) { diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc index 1f79d543fbc..b1ac22ae0ed 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc @@ -37,14 +37,14 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mysetjmp.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mysetjmp.h" +//#include "mystdio.h" #include "subdivider.h" #include "arcsorter.h" -#include "arc.h" -#include "bin.h" +//#include "arc.h" +//#include "bin.h" /* local preprocessor definitions */ #define MAXARCS 10 diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc index ccddc270ff9..d003d1ebc46 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc @@ -37,21 +37,21 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "subdivider.h" -#include "arc.h" +//#include "arc.h" #include "bezierarc.h" -#include "bin.h" +//#include "bin.h" #include "renderhints.h" #include "backend.h" -#include "mapdesc.h" +//#include "mapdesc.h" #include "quilt.h" #include "patchlist.h" -#include "patch.h" -#include "nurbsconsts.h" -#include "trimvertpool.h" +//#include "patch.h" +//#include "nurbsconsts.h" +//#include "trimvertpool.h" #include "simplemath.h" #include "polyUtil.h" //for function area() diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h index 4d539518186..3648c77e82e 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h @@ -41,7 +41,7 @@ #include "flist.h" #include "slicer.h" #include "arctess.h" -#include "trimvertex.h" +//#include "trimvertex.h" #include "trimvertpool.h" class Arc; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc index 531f26bc783..1fcdc26df3b 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc @@ -38,9 +38,9 @@ */ #include "glimports.h" -#include "myassert.h" -#include "mystdio.h" -#include "mystring.h" +//#include "myassert.h" +//#include "mystdio.h" +//#include "mystring.h" #include "quilt.h" #include "knotvector.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc index 61f34cd38a0..26948b2bcca 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "trimline.h" #include "backend.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h index ecc884284cc..745b702efd9 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h @@ -39,7 +39,7 @@ class Arc; class Backend; -#include "trimvertex.h" +//#include "trimvertex.h" #include "jarcloc.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc index 4aeb5eeac16..c8c7027b7d2 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "trimregion.h" TrimRegion::TrimRegion( void ) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc index 3e5bd703806..49bc126c74a 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc @@ -37,13 +37,13 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" -#include "mystring.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" +//#include "mystring.h" #include "trimvertex.h" #include "trimvertpool.h" -#include "bufpool.h" +//#include "bufpool.h" /*---------------------------------------------------------------------------- * TrimVertexPool::TrimVertexPool diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc index 4b3329c0f27..1565bfeb1bd 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "uarray.h" #include "arc.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc b/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc index 1cb235443ad..41c49b524e3 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc @@ -37,9 +37,9 @@ * */ -#include "glimports.h" -#include "myassert.h" -#include "mystdio.h" +//#include "glimports.h" +//#include "myassert.h" +//#include "mystdio.h" #include "varray.h" #include "arc.h" #include "simplemath.h" // glu_abs() diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc index d942db7287e..1ec27de1a02 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc @@ -35,14 +35,14 @@ /* */ -#include -#include +//#include +//#include #include -#include "glimports.h" -#include "zlassert.h" +//#include "glimports.h" +//#include "zlassert.h" #include "quicksort.h" -#include "directedLine.h" +//#include "directedLine.h" #include "polyDBG.h" #ifdef __WATCOMC__ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h index 4ed0128ca6b..cc9b7ada46d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h @@ -33,7 +33,7 @@ #ifndef _DIRECTEDLINE_H #define _DIRECTEDLINE_H -#include "definitions.h" +//#include "definitions.h" #include "sampledLine.h" enum {INCREASING, DECREASING}; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc index 3c92039bae0..1c246e8b599 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc @@ -36,8 +36,8 @@ */ #include "gluos.h" -#include -#include +//#include +//#include #include #include "zlassert.h" #include "gridWrap.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h index b6428484f02..cf4c90e825e 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h @@ -33,11 +33,11 @@ #ifndef _GRIDWRAP_H #define _GRIDWRAP_H -#include -#include "definitions.h" +//#include +//#include "definitions.h" #include "primitiveStream.h" -#include "zlassert.h" +//#include "zlassert.h" class gridWrap{ Int n_ulines; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc index cb28129adfb..04dc8c04611 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc @@ -36,11 +36,11 @@ */ #include "gluos.h" -#include -#include -#include +//#include +//#include +//#include -#include "glimports.h" +//#include "glimports.h" #include "zlassert.h" #include "monoChain.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h index 999f1631902..6bcfc1a8a8d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h @@ -33,7 +33,7 @@ #ifndef _MONO_CHAIN_H #define _MONO_CHAIN_H -#include "directedLine.h" +//#include "directedLine.h" #include "partitionY.h" class monoChain; diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc index 8391205bf7c..9a905d8c0d1 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc @@ -46,9 +46,9 @@ */ #include -#include +//#include #include "directedLine.h" -#include "monoPolyPart.h" +//#include "monoPolyPart.h" /*a vertex is u_maximal if both of its two neightbors are to the left of this *vertex diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc index 8e8d49dda70..0dd91bf98ee 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc @@ -35,11 +35,11 @@ /* */ -#include -#include -#include "gluos.h" -#include "glimports.h" -#include "zlassert.h" +//#include +//#include +//#include "gluos.h" +//#include "glimports.h" +//#include "zlassert.h" #include "monoTriangulation.h" #include "polyUtil.h" /*for area*/ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h index f78b8f402e3..e105b4f0478 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h @@ -33,7 +33,7 @@ #ifndef _MONO_TRIANGULATION_H #define _MONO_TRIANGULATION_H -#include "definitions.h" +//#include "definitions.h" #include "primitiveStream.h" #include "directedLine.h" #include "arc.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc index e25e30b0f39..c8d8895aab7 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc @@ -36,7 +36,7 @@ */ #include -#include +//#include #include "partitionX.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc index e097461ac5e..e3320a34183 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc @@ -37,7 +37,7 @@ #include #include -#include +//#include #include "zlassert.h" #include "partitionY.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc index 4d04df73f69..da1f99fc3b6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc @@ -35,10 +35,10 @@ /* */ -#include -#include +//#include +//#include #include -#include "zlassert.h" +//#include "zlassert.h" #include "polyDBG.h" #ifdef __WATCOMC__ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h index 74843d88879..b095d1dfd00 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h @@ -33,8 +33,8 @@ #ifndef _POLYDBG_H #define _POLYDBG_H -#include "definitions.h" -#include "directedLine.h" +//#include "definitions.h" +//#include "directedLine.h" #include "monoTriangulation.h" Int DBG_edgesIntersectGen(Real A[2], Real B[2], Real C[2], Real D[2]); diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc index f9a27f402ca..3fc492666fd 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc @@ -35,8 +35,8 @@ /* */ -#include -#include +//#include +//#include #include "polyUtil.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc index dfdbd4e8448..59c3214b71d 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc @@ -36,8 +36,8 @@ */ #include "gluos.h" -#include -#include +//#include +//#include #include #include diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc index 9d0b290b393..db5bfb50481 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc @@ -35,8 +35,8 @@ /* */ -#include -#include +//#include +//#include static void swap(void *v[], int i, int j) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h index 3a8dcd6a2cf..e69876a76a3 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h @@ -33,8 +33,8 @@ #ifndef _QUICKSORT_H #define _QUICKSORT_H -#include -#include +//#include +//#include void quicksort(void *v[], int left, int right, int (*comp) (void *, void *)); diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc index f457b157336..76f71ef65a1 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc @@ -36,9 +36,9 @@ */ #include "gluos.h" -#include -#include -#include "glimports.h" +//#include +//#include +//#include "glimports.h" #include "zlassert.h" #include diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h index 8dbd7eb819d..e0c112bb0f7 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h @@ -33,7 +33,7 @@ #ifndef _RECTBLOCK_H #define _RECTBLOCK_H -#include "definitions.h" +//#include "definitions.h" #include "gridWrap.h" class rectBlock{ diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc index 861c71bb380..15f4c459348 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc @@ -35,9 +35,9 @@ /* */ -#include -#include -#include "glimports.h" +//#include +//#include +//#include "glimports.h" #include "sampleComp.h" #include "sampleCompTop.h" #include "sampleCompBot.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h index a3c1790254e..09b304a8404 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h @@ -34,7 +34,7 @@ #define _SAMPLECOMP_H #include "sampleMonoPoly.h" -#include "rectBlock.h" +//#include "rectBlock.h" void sampleConnectedComp(Real* topVertex, Real* botVertex, vertexArray* leftChain, diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc index 2e70f839363..22c746f4e34 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc @@ -35,9 +35,9 @@ /* */ -#include -#include -#include "zlassert.h" +//#include +//#include +//#include "zlassert.h" #include "sampleCompBot.h" #include "sampleCompRight.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc index d01e50018bf..f9ac27ac251 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc @@ -35,11 +35,11 @@ /* */ -#include -#include -#include "gluos.h" -#include "glimports.h" -#include "zlassert.h" +//#include +//#include +//#include "gluos.h" +//#include "glimports.h" +//#include "zlassert.h" #include "sampleCompRight.h" #define max(a,b) ((a>b)? a:b) diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc index 951e937c45f..3242f5ed964 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc @@ -35,10 +35,10 @@ /* */ -#include -#include +//#include +//#include #include -#include "zlassert.h" +//#include "zlassert.h" #include "sampleCompTop.h" #include "sampleCompRight.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc index 051f2410834..a5d37ea7fa6 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc @@ -36,8 +36,8 @@ */ #include "gluos.h" -#include -#include +//#include +//#include #include #ifndef max diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h index 3a5fa6c91ba..9a6efe66e0b 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h @@ -34,7 +34,7 @@ #define _SAMPLEMONOPOLY_H #include "monoTriangulation.h" -#include "gridWrap.h" +//#include "gridWrap.h" #include "rectBlock.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc index 89f6c6e23fe..9bc989a54da 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc @@ -38,7 +38,7 @@ #include #include #include //for fabs() -#include "glimports.h" +//#include "glimports.h" #include "zlassert.h" #include "sampledLine.h" diff --git a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc index 1865755a484..d8c1500d725 100644 --- a/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc +++ b/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc @@ -36,7 +36,7 @@ */ #include -#include +//#include #include "zlassert.h" #include "searchTree.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/dict.c b/reactos/dll/opengl/glu32/src/libtess/dict.c index 49d4f759e7e..712005a74dd 100644 --- a/reactos/dll/opengl/glu32/src/libtess/dict.c +++ b/reactos/dll/opengl/glu32/src/libtess/dict.c @@ -32,7 +32,7 @@ ** */ -#include +//#include #include "dict-list.h" #include "memalloc.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/geom.c b/reactos/dll/opengl/glu32/src/libtess/geom.c index 35b36a394c4..fde54797b9d 100644 --- a/reactos/dll/opengl/glu32/src/libtess/geom.c +++ b/reactos/dll/opengl/glu32/src/libtess/geom.c @@ -34,7 +34,7 @@ #include "gluos.h" #include -#include "mesh.h" +//#include "mesh.h" #include "geom.h" int __gl_vertLeq( GLUvertex *u, GLUvertex *v ) diff --git a/reactos/dll/opengl/glu32/src/libtess/memalloc.c b/reactos/dll/opengl/glu32/src/libtess/memalloc.c index 81879ef782f..887f15ece86 100644 --- a/reactos/dll/opengl/glu32/src/libtess/memalloc.c +++ b/reactos/dll/opengl/glu32/src/libtess/memalloc.c @@ -33,7 +33,7 @@ */ #include "memalloc.h" -#include "string.h" +//#include "string.h" int __gl_memInit( size_t maxFast ) { diff --git a/reactos/dll/opengl/glu32/src/libtess/mesh.c b/reactos/dll/opengl/glu32/src/libtess/mesh.c index 36cb3a7be29..74624cbe8a7 100644 --- a/reactos/dll/opengl/glu32/src/libtess/mesh.c +++ b/reactos/dll/opengl/glu32/src/libtess/mesh.c @@ -33,7 +33,7 @@ */ #include "gluos.h" -#include +//#include #include #include "mesh.h" #include "memalloc.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/normal.c b/reactos/dll/opengl/glu32/src/libtess/normal.c index 9a3bd43d3c9..8f035169334 100644 --- a/reactos/dll/opengl/glu32/src/libtess/normal.c +++ b/reactos/dll/opengl/glu32/src/libtess/normal.c @@ -33,11 +33,11 @@ */ #include "gluos.h" -#include "mesh.h" +//#include "mesh.h" #include "tess.h" -#include "normal.h" -#include -#include +//#include "normal.h" +//#include +//#include #ifndef TRUE #define TRUE 1 diff --git a/reactos/dll/opengl/glu32/src/libtess/normal.h b/reactos/dll/opengl/glu32/src/libtess/normal.h index c376ca44523..5a658369bc6 100644 --- a/reactos/dll/opengl/glu32/src/libtess/normal.h +++ b/reactos/dll/opengl/glu32/src/libtess/normal.h @@ -35,7 +35,7 @@ #ifndef __normal_h_ #define __normal_h_ -#include "tess.h" +//#include "tess.h" /* __gl_projectPolygon( tess ) determines the polygon normal * and project vertices onto the plane of the polygon. diff --git a/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c b/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c index 52698b59cc5..d8e40a38c1b 100644 --- a/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c +++ b/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c @@ -32,10 +32,10 @@ ** */ -#include -#include +//#include +//#include #include "priorityq-heap.h" -#include "memalloc.h" +//#include "memalloc.h" #define INIT_SIZE 32 diff --git a/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h b/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h index 746cf5fa69a..3874a13ebbf 100644 --- a/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h +++ b/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h @@ -35,7 +35,7 @@ #ifndef __priorityq_sort_h_ #define __priorityq_sort_h_ -#include "priorityq-heap.h" +//#include "priorityq-heap.h" #undef PQkey #undef PQhandle diff --git a/reactos/dll/opengl/glu32/src/libtess/priorityq.c b/reactos/dll/opengl/glu32/src/libtess/priorityq.c index c6b99cce552..a03c007bbe6 100644 --- a/reactos/dll/opengl/glu32/src/libtess/priorityq.c +++ b/reactos/dll/opengl/glu32/src/libtess/priorityq.c @@ -33,9 +33,9 @@ */ #include "gluos.h" -#include +//#include #include -#include /* LONG_MAX */ +//#include /* LONG_MAX */ #include "memalloc.h" /* Include all the code for the regular heap-based queue here. */ diff --git a/reactos/dll/opengl/glu32/src/libtess/render.c b/reactos/dll/opengl/glu32/src/libtess/render.c index bca836f0467..aca8ebbd4e2 100644 --- a/reactos/dll/opengl/glu32/src/libtess/render.c +++ b/reactos/dll/opengl/glu32/src/libtess/render.c @@ -34,10 +34,10 @@ #include "gluos.h" #include -#include -#include "mesh.h" +//#include +//#include "mesh.h" #include "tess.h" -#include "render.h" +//#include "render.h" #ifndef TRUE #define TRUE 1 diff --git a/reactos/dll/opengl/glu32/src/libtess/render.h b/reactos/dll/opengl/glu32/src/libtess/render.h index a298c9a9482..eb4f7945033 100644 --- a/reactos/dll/opengl/glu32/src/libtess/render.h +++ b/reactos/dll/opengl/glu32/src/libtess/render.h @@ -35,7 +35,7 @@ #ifndef __render_h_ #define __render_h_ -#include "mesh.h" +//#include "mesh.h" /* __gl_renderMesh( tess, mesh ) takes a mesh and breaks it into triangle * fans, strips, and separate triangles. A substantial effort is made diff --git a/reactos/dll/opengl/glu32/src/libtess/sweep.c b/reactos/dll/opengl/glu32/src/libtess/sweep.c index eca828ff67f..f18945b1d09 100644 --- a/reactos/dll/opengl/glu32/src/libtess/sweep.c +++ b/reactos/dll/opengl/glu32/src/libtess/sweep.c @@ -34,15 +34,15 @@ #include "gluos.h" #include -#include -#include /* longjmp */ -#include /* LONG_MAX */ +//#include +//#include /* longjmp */ +//#include /* LONG_MAX */ -#include "mesh.h" +//#include "mesh.h" #include "geom.h" #include "tess.h" -#include "dict.h" -#include "priorityq.h" +//#include "dict.h" +//#include "priorityq.h" #include "memalloc.h" #include "sweep.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/sweep.h b/reactos/dll/opengl/glu32/src/libtess/sweep.h index feb68b0ffe5..3f1e62256c7 100644 --- a/reactos/dll/opengl/glu32/src/libtess/sweep.h +++ b/reactos/dll/opengl/glu32/src/libtess/sweep.h @@ -35,7 +35,7 @@ #ifndef __sweep_h_ #define __sweep_h_ -#include "mesh.h" +//#include "mesh.h" /* __gl_computeInterior( tess ) computes the planar arrangement specified * by the given contours, and further subdivides this arrangement @@ -48,7 +48,7 @@ int __gl_computeInterior( GLUtesselator *tess ); /* The following is here *only* for access by debugging routines */ -#include "dict.h" +//#include "dict.h" /* For each pair of adjacent edges crossing the sweep line, there is * an ActiveRegion to represent the region between them. The active diff --git a/reactos/dll/opengl/glu32/src/libtess/tess.c b/reactos/dll/opengl/glu32/src/libtess/tess.c index 4a0e8dea7f7..1cfcac9aaaf 100644 --- a/reactos/dll/opengl/glu32/src/libtess/tess.c +++ b/reactos/dll/opengl/glu32/src/libtess/tess.c @@ -33,12 +33,12 @@ */ #include "gluos.h" -#include +//#include #include -#include +//#include #include "memalloc.h" #include "tess.h" -#include "mesh.h" +//#include "mesh.h" #include "normal.h" #include "sweep.h" #include "tessmono.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/tess.h b/reactos/dll/opengl/glu32/src/libtess/tess.h index 16249608814..2a49482dcb1 100644 --- a/reactos/dll/opengl/glu32/src/libtess/tess.h +++ b/reactos/dll/opengl/glu32/src/libtess/tess.h @@ -35,7 +35,7 @@ #ifndef __tess_h_ #define __tess_h_ -#include +//#include #include #include "mesh.h" #include "dict.h" diff --git a/reactos/dll/opengl/glu32/src/libtess/tessmono.c b/reactos/dll/opengl/glu32/src/libtess/tessmono.c index 4d084400594..8ac49c99dd0 100644 --- a/reactos/dll/opengl/glu32/src/libtess/tessmono.c +++ b/reactos/dll/opengl/glu32/src/libtess/tessmono.c @@ -33,10 +33,10 @@ */ #include "gluos.h" -#include +//#include #include "geom.h" -#include "mesh.h" -#include "tessmono.h" +//#include "mesh.h" +//#include "tessmono.h" #include #define AddWinding(eDst,eSrc) (eDst->winding += eSrc->winding, \ diff --git a/reactos/dll/opengl/glu32/src/libutil/glue.c b/reactos/dll/opengl/glu32/src/libutil/glue.c index cd65d65ad28..2cdc1c56083 100644 --- a/reactos/dll/opengl/glu32/src/libutil/glue.c +++ b/reactos/dll/opengl/glu32/src/libutil/glue.c @@ -28,8 +28,8 @@ * Silicon Graphics, Inc. */ -#include -#include "gluint.h" +//#include +//#include "gluint.h" static unsigned char *__gluNurbsErrors[] = { (unsigned char*) " ", diff --git a/reactos/dll/opengl/glu32/src/libutil/mipmap.c b/reactos/dll/opengl/glu32/src/libutil/mipmap.c index 8a45e39212d..29dce0c1119 100644 --- a/reactos/dll/opengl/glu32/src/libutil/mipmap.c +++ b/reactos/dll/opengl/glu32/src/libutil/mipmap.c @@ -31,10 +31,10 @@ #include "gluos.h" #include #include -#include -#include -#include -#include /* UINT_MAX */ +//#include +//#include +//#include +//#include /* UINT_MAX */ #include typedef union { diff --git a/reactos/dll/opengl/glu32/src/libutil/project.c b/reactos/dll/opengl/glu32/src/libutil/project.c index f4bf8839b66..32854c25a57 100644 --- a/reactos/dll/opengl/glu32/src/libutil/project.c +++ b/reactos/dll/opengl/glu32/src/libutil/project.c @@ -31,7 +31,7 @@ #include "gluos.h" #include #include -#include +//#include #include "gluint.h" /* diff --git a/reactos/dll/opengl/glu32/src/libutil/quad.c b/reactos/dll/opengl/glu32/src/libutil/quad.c index d88b20f5566..e2c0151d2eb 100644 --- a/reactos/dll/opengl/glu32/src/libutil/quad.c +++ b/reactos/dll/opengl/glu32/src/libutil/quad.c @@ -30,10 +30,10 @@ #include "gluos.h" #include "gluint.h" -#include -#include +//#include +//#include #include -#include +//#include #include /* Make it not a power of two to avoid cache thrashing on the chip */ diff --git a/reactos/dll/opengl/glu32/src/libutil/registry.c b/reactos/dll/opengl/glu32/src/libutil/registry.c index 2e3b574fb04..bcdd3d4fdf7 100644 --- a/reactos/dll/opengl/glu32/src/libutil/registry.c +++ b/reactos/dll/opengl/glu32/src/libutil/registry.c @@ -30,9 +30,9 @@ #include "gluos.h" #include -#include -#include -#include +//#include +//#include +//#include static const GLubyte versionString[] = "1.3"; static const GLubyte extensionString[] = diff --git a/reactos/dll/opengl/mesa/include/GL/gl.h b/reactos/dll/opengl/mesa/include/GL/gl.h index e65e1bc8a8f..b536becb247 100644 --- a/reactos/dll/opengl/mesa/include/GL/gl.h +++ b/reactos/dll/opengl/mesa/include/GL/gl.h @@ -88,7 +88,10 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif -#include +//#include +#include +#include +#include #endif #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_misc.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_misc.c index 5744dd5b4fc..43c00823342 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_misc.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_misc.c @@ -36,7 +36,10 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #endif -#include +//#include +#include +#include +#include #include #else diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_thread.h b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_thread.h index 3e1c273027b..3860c38b016 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_thread.h +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_thread.h @@ -125,7 +125,10 @@ typedef pthread_cond_t pipe_condvar; #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) -#include +//#include +#include +#include +#include /* pipe_thread */ diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_time.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_time.c index 3e9d50a598a..939b3876e91 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_time.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/os/os_time.c @@ -38,7 +38,10 @@ #if defined(PIPE_OS_UNIX) # include /* timeval */ #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) -# include +//# include +# include +# include +# include #else # error Unsupported OS #endif diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c index fbde1d191a4..5296e9c61a2 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -45,7 +45,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif -#include +//#include #endif #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_cpu_detect.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_cpu_detect.c index e0c8f73c7d3..b267daeeae3 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_cpu_detect.c @@ -66,7 +66,9 @@ #endif #if defined(PIPE_OS_WINDOWS) -#include +//#include +#include +#include #if defined(MSVC) #include #endif diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_debug_symbol.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_debug_symbol.c index bae9be87a26..ab300114dfe 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_debug_symbol.c @@ -42,7 +42,7 @@ #if defined(PIPE_OS_WINDOWS) && defined(PIPE_ARCH_X86) -#include +//#include #include #include "dbghelp.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_dl.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_dl.c index aca435d6cad..51b2600c05c 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_dl.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_dl.c @@ -34,7 +34,9 @@ #include #endif #if defined(PIPE_OS_WINDOWS) -#include +//#include +#include +#include #endif #include "u_dl.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_network.c b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_network.c index 45b3691f901..ddaa264ef29 100644 --- a/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_network.c +++ b/reactos/dll/opengl/mesa/src/gallium/auxiliary/util/u_network.c @@ -4,8 +4,11 @@ #include "util/u_debug.h" #if defined(PIPE_SUBSYSTEM_WINDOWS_USER) +# define WIN32_NO_STATUS +# define _INC_WINDOWS +# include # include -# include +//# include #elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \ defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) # include diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.c index abdcf1edfea..aca92004546 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.h index 07a5c7d15ec..435252e8ab6 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_context.h @@ -28,7 +28,7 @@ #ifndef STW_CONTEXT_H #define STW_CONTEXT_H -#include +//#include struct stw_framebuffer; struct st_context_iface; diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_device.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_device.c index e65e71dc15f..0dd11b20769 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_device.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_device.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #include "glapi/glapi.h" #include "util/u_debug.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_context.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_context.c index a3470ac35a5..3dafd3ce9d0 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_context.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_context.c @@ -22,7 +22,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +//#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c index 7cad49c9f84..1b3a0765016 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c @@ -26,7 +26,10 @@ * **************************************************************************/ -#include +//#include +#include +#include +#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_gallium.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_gallium.h index cc35f2bb7fe..901abc0942c 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_gallium.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_gallium.h @@ -29,7 +29,7 @@ #define STW_EXTGALLIUM_H_ -#include +//#include struct pipe_screen; diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pbuffer.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pbuffer.c index 252d07a90cc..247b31fbd16 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pbuffer.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pbuffer.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c index d0a95863bb4..b353be9e03a 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c @@ -34,7 +34,7 @@ */ -#include +//#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c index 9eac6a1d09d..c2f875558f0 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c @@ -26,7 +26,10 @@ * **************************************************************************/ -#include +//#include +#include +#include +#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.c index 72750b00dfa..8a5057a8fae 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #include "pipe/p_format.h" #include "pipe/p_screen.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.h index 6604e545cbc..135f8879e4a 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_framebuffer.h @@ -28,7 +28,7 @@ #ifndef STW_FRAMEBUFFER_H #define STW_FRAMEBUFFER_H -#include +//#include #include "os/os_thread.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_getprocaddress.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_getprocaddress.c index a1df44c53d4..e67a3e47d79 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_getprocaddress.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_getprocaddress.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #define WGL_WGLEXT_PROTOTYPES diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_icd.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_icd.h index 02eb543fef0..96101b1e340 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_icd.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_icd.h @@ -29,7 +29,10 @@ #define STW_ICD_H -#include +//#include +#include +#include +#include #include "GL/gl.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_pixelformat.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_pixelformat.h index 282c9f643c2..2c1e1198593 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_pixelformat.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_pixelformat.h @@ -28,7 +28,7 @@ #ifndef STW_PIXELFORMAT_H #define STW_PIXELFORMAT_H -#include +//#include #ifndef PFD_SUPPORT_COMPOSITION #define PFD_SUPPORT_COMPOSITION 0x00008000 diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_st.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_st.h index 945d3508b48..857f56faec6 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_st.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_st.h @@ -28,7 +28,8 @@ #ifndef STW_ST_H #define STW_ST_H -#include +//#include +#include #include "state_tracker/st_api.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.c index 4bd6a9289c9..e0da1f4d626 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #include "pipe/p_compiler.h" #include "util/u_memory.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.h index fbf8b1cbee4..786d044012a 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_tls.h @@ -28,7 +28,10 @@ #ifndef STW_TLS_H #define STW_TLS_H -#include +//#include +#include +#include +#include struct stw_tls_data { diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.c b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.c index d38bfbefdd7..5c6d995114e 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.c +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include +//#include #include "util/u_debug.h" #include "stw_icd.h" diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.h index 31a391d960e..5b7e021f512 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_wgl.h @@ -29,7 +29,7 @@ #define STW_WGL_H_ -#include +//#include #include diff --git a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_winsys.h b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_winsys.h index 397065fc159..ebcf01c3d6f 100644 --- a/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_winsys.h +++ b/reactos/dll/opengl/mesa/src/gallium/state_trackers/wgl/stw_winsys.h @@ -28,7 +28,7 @@ #ifndef STW_WINSYS_H #define STW_WINSYS_H -#include /* for HDC */ +//#include /* for HDC */ #include "pipe/p_compiler.h" diff --git a/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c b/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c index e5072e06e9a..4c327444c5f 100644 --- a/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c +++ b/reactos/dll/opengl/mesa/src/mapi/mapi/u_execmem.c @@ -87,8 +87,7 @@ init_map(void) #elif defined(_WIN32) -#include - +//#include /* * Avoid Data Execution Prevention. diff --git a/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.h b/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.h index 7db22b7936a..3f3dd3b3e48 100644 --- a/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.h +++ b/reactos/dll/opengl/mesa/src/mapi/mapi/u_thread.h @@ -48,7 +48,10 @@ #include /* POSIX threads headers */ #endif #ifdef _WIN32 -#include +//#include +#include +#include +#include #endif #if defined(PTHREADS) || defined(_WIN32) diff --git a/reactos/dll/opengl/mesa/src/mesa/main/dlopen.c b/reactos/dll/opengl/mesa/src/mesa/main/dlopen.c index 57a33292ed1..a6f0f0a61a2 100644 --- a/reactos/dll/opengl/mesa/src/mesa/main/dlopen.c +++ b/reactos/dll/opengl/mesa/src/mesa/main/dlopen.c @@ -35,7 +35,9 @@ #include #endif #if defined(_WIN32) -#include +//#include +#include +#include #endif diff --git a/reactos/dll/opengl/mesa/src/mesa/main/glheader.h b/reactos/dll/opengl/mesa/src/mesa/main/glheader.h index 315232371ed..d2bca9bf444 100644 --- a/reactos/dll/opengl/mesa/src/mesa/main/glheader.h +++ b/reactos/dll/opengl/mesa/src/mesa/main/glheader.h @@ -50,8 +50,8 @@ #define GL_GLEXT_PROTOTYPES -#include "GL/gl.h" -#include "GL/glext.h" +#include +#include #ifdef __cplusplus diff --git a/reactos/dll/opengl/opengl32/opengl32.h b/reactos/dll/opengl/opengl32/opengl32.h index 09d2687dfa1..24e1cec6545 100644 --- a/reactos/dll/opengl/opengl32/opengl32.h +++ b/reactos/dll/opengl/opengl32/opengl32.h @@ -28,18 +28,20 @@ extern "C" { #include #include -#include +//#include -#define WIN32_LEAN_AND_MEAN #define WIN32_NO_STATUS -#include +#include +#include #include +#include +#include +#include #define NTOS_MODE_USER -#include #include -#include +//#include #include /* gl function list */ diff --git a/reactos/dll/shellext/deskadp/deskadp.rc b/reactos/dll/shellext/deskadp/deskadp.rc index 3f7c2531386..26f2ac1d926 100644 --- a/reactos/dll/shellext/deskadp/deskadp.rc +++ b/reactos/dll/shellext/deskadp/deskadp.rc @@ -1,6 +1,6 @@ -/* $Id: slayer.rc 24931 2006-11-28 19:35:42Z janderwald $ */ +#include +#include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/shellext/deskadp/precomp.h b/reactos/dll/shellext/deskadp/precomp.h index 6dd1718e2d5..f8bad53e5c5 100644 --- a/reactos/dll/shellext/deskadp/precomp.h +++ b/reactos/dll/shellext/deskadp/precomp.h @@ -2,9 +2,14 @@ #define __PRECOMP__H #define COBJMACROS -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include -#include #include #include #include "deskadp.h" diff --git a/reactos/dll/shellext/deskadp/rsrc.rc b/reactos/dll/shellext/deskadp/rsrc.rc index d02933821f9..4ce4a897cdc 100644 --- a/reactos/dll/shellext/deskadp/rsrc.rc +++ b/reactos/dll/shellext/deskadp/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/shellext/deskmon/deskmon.rc b/reactos/dll/shellext/deskmon/deskmon.rc index 23b5675eefc..2ae2e6c6983 100644 --- a/reactos/dll/shellext/deskmon/deskmon.rc +++ b/reactos/dll/shellext/deskmon/deskmon.rc @@ -1,6 +1,6 @@ -/* $Id: slayer.rc 24931 2006-11-28 19:35:42Z janderwald $ */ +#include +#include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/shellext/deskmon/precomp.h b/reactos/dll/shellext/deskmon/precomp.h index a69d02aecec..564922a2a11 100644 --- a/reactos/dll/shellext/deskmon/precomp.h +++ b/reactos/dll/shellext/deskmon/precomp.h @@ -2,9 +2,14 @@ #define __PRECOMP__H #define COBJMACROS -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include -#include #include #include #include "deskmon.h" diff --git a/reactos/dll/shellext/deskmon/rsrc.rc b/reactos/dll/shellext/deskmon/rsrc.rc index d02933821f9..4ce4a897cdc 100644 --- a/reactos/dll/shellext/deskmon/rsrc.rc +++ b/reactos/dll/shellext/deskmon/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/shellext/devcpux/processor.c b/reactos/dll/shellext/devcpux/processor.c index 9083d985fb0..554c58fc4ef 100644 --- a/reactos/dll/shellext/devcpux/processor.c +++ b/reactos/dll/shellext/devcpux/processor.c @@ -7,7 +7,14 @@ * */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include #include diff --git a/reactos/dll/shellext/devcpux/processor.rc b/reactos/dll/shellext/devcpux/processor.rc index 5edd816af2a..33e7d7b0fb0 100644 --- a/reactos/dll/shellext/devcpux/processor.rc +++ b/reactos/dll/shellext/devcpux/processor.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/shellext/devcpux/resource.h b/reactos/dll/shellext/devcpux/resource.h index 29e66e5b545..7b45a3f6489 100644 --- a/reactos/dll/shellext/devcpux/resource.h +++ b/reactos/dll/shellext/devcpux/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define DLG_PROCESSORINFO 201 #define IDC_FEATURES 301 diff --git a/reactos/dll/shellext/fontext/fontext.h b/reactos/dll/shellext/fontext/fontext.h index aa965a6125e..21b61b517eb 100644 --- a/reactos/dll/shellext/fontext/fontext.h +++ b/reactos/dll/shellext/fontext/fontext.h @@ -1,7 +1,7 @@ #define COBJMACROS -#include -#include -#include -#include -#include +#define WIN32_NO_STATUS +#include +#include +#include + #include diff --git a/reactos/dll/shellext/fontext/fontext.rc b/reactos/dll/shellext/fontext/fontext.rc index 225de62168c..a61752f5efb 100644 --- a/reactos/dll/shellext/fontext/fontext.rc +++ b/reactos/dll/shellext/fontext/fontext.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/shellext/fontext/rsrc.rc b/reactos/dll/shellext/fontext/rsrc.rc index 015043ca010..f85211e15b9 100644 --- a/reactos/dll/shellext/fontext/rsrc.rc +++ b/reactos/dll/shellext/fontext/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif diff --git a/reactos/dll/shellext/slayer/precomp.h b/reactos/dll/shellext/slayer/precomp.h index f80ea832d5e..b5ea7d54401 100644 --- a/reactos/dll/shellext/slayer/precomp.h +++ b/reactos/dll/shellext/slayer/precomp.h @@ -1,12 +1,14 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include + #include "resource.h" #include "slayer.h" diff --git a/reactos/dll/shellext/slayer/rsrc.rc b/reactos/dll/shellext/slayer/rsrc.rc index 08bfe5297c3..0d65e9ea9a4 100644 --- a/reactos/dll/shellext/slayer/rsrc.rc +++ b/reactos/dll/shellext/slayer/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/reactos/dll/shellext/slayer/slayer.c b/reactos/dll/shellext/slayer/slayer.c index 5e06b4db607..68a8a42a48f 100644 --- a/reactos/dll/shellext/slayer/slayer.c +++ b/reactos/dll/shellext/slayer/slayer.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 09/25/2004 Created */ -#include +#include "precomp.h" HINSTANCE hInstance = NULL; static LONG dllrefs = 0; diff --git a/reactos/dll/shellext/slayer/slayer.rc b/reactos/dll/shellext/slayer/slayer.rc index 2647f00d83c..f613460b28c 100644 --- a/reactos/dll/shellext/slayer/slayer.rc +++ b/reactos/dll/shellext/slayer/slayer.rc @@ -1,6 +1,6 @@ -/* $Id$ */ +#include +#include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/acledit/acledit.rc b/reactos/dll/win32/acledit/acledit.rc index 85623bed8bc..f5e5ca28e95 100644 --- a/reactos/dll/win32/acledit/acledit.rc +++ b/reactos/dll/win32/acledit/acledit.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/acledit/acleditint.h b/reactos/dll/win32/acledit/acleditint.h index 9cb292f55b3..49e9ba721db 100644 --- a/reactos/dll/win32/acledit/acleditint.h +++ b/reactos/dll/win32/acledit/acleditint.h @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" extern HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/aclui/aclui.c b/reactos/dll/win32/aclui/aclui.c index 3057521e820..1802278ae0e 100644 --- a/reactos/dll/win32/aclui/aclui.c +++ b/reactos/dll/win32/aclui/aclui.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 08/10/2004 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/aclui/aclui.rc b/reactos/dll/win32/aclui/aclui.rc index c28a82a73e9..1ff0c11ddc3 100644 --- a/reactos/dll/win32/aclui/aclui.rc +++ b/reactos/dll/win32/aclui/aclui.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/aclui/checklist.c b/reactos/dll/win32/aclui/checklist.c index 7ba4f76c06c..a6d445e17fc 100644 --- a/reactos/dll/win32/aclui/checklist.c +++ b/reactos/dll/win32/aclui/checklist.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 07/01/2005 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/aclui/guid.c b/reactos/dll/win32/aclui/guid.c index 0d7c1d6478b..df6a998b3f5 100644 --- a/reactos/dll/win32/aclui/guid.c +++ b/reactos/dll/win32/aclui/guid.c @@ -19,8 +19,14 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include -#include #include #include diff --git a/reactos/dll/win32/aclui/misc.c b/reactos/dll/win32/aclui/misc.c index f7d098b2033..4ca54eb744e 100644 --- a/reactos/dll/win32/aclui/misc.c +++ b/reactos/dll/win32/aclui/misc.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 07/01/2005 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/aclui/precomp.h b/reactos/dll/win32/aclui/precomp.h index 95706946af4..f0826d55f01 100644 --- a/reactos/dll/win32/aclui/precomp.h +++ b/reactos/dll/win32/aclui/precomp.h @@ -1,12 +1,18 @@ #define _ACLUI_ + #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include + #define NTOS_MODE_USER #include -#include -#include + #include -#include #include #include #include @@ -14,6 +20,7 @@ #include #include #endif + #include "resource.h" #define EnableRedrawWindow(hwnd) \ diff --git a/reactos/dll/win32/aclui/rsrc.rc b/reactos/dll/win32/aclui/rsrc.rc index 06aa0828c32..9e4e9cc0562 100644 --- a/reactos/dll/win32/aclui/rsrc.rc +++ b/reactos/dll/win32/aclui/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/win32/aclui/sidcache.c b/reactos/dll/win32/aclui/sidcache.c index f98a8c6a73c..7e5ab9b514d 100644 --- a/reactos/dll/win32/aclui/sidcache.c +++ b/reactos/dll/win32/aclui/sidcache.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 12/10/2005 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/activeds/activeds_main.c b/reactos/dll/win32/activeds/activeds_main.c index 2fa4ec73d80..983f13b6a1e 100644 --- a/reactos/dll/win32/activeds/activeds_main.c +++ b/reactos/dll/win32/activeds/activeds_main.c @@ -21,21 +21,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +#include +#include +//#include "winuser.h" -#include "objbase.h" -#include "iads.h" -#include "adshlp.h" +#include +#include +//#include "adshlp.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(activeds); diff --git a/reactos/dll/win32/activeds/stubs.c b/reactos/dll/win32/activeds/stubs.c index fbcb1148add..4393f40feac 100644 --- a/reactos/dll/win32/activeds/stubs.c +++ b/reactos/dll/win32/activeds/stubs.c @@ -1,4 +1,10 @@ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include #include diff --git a/reactos/dll/win32/actxprxy/usrmarshal.c b/reactos/dll/win32/actxprxy/usrmarshal.c index 1683f2cfb0e..9b3bb8b6ff6 100644 --- a/reactos/dll/win32/actxprxy/usrmarshal.c +++ b/reactos/dll/win32/actxprxy/usrmarshal.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "objbase.h" -#include "servprov.h" -#include "comcat.h" -#include "docobj.h" -#include "shobjidl.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "winerror.h" +#include +//#include "servprov.h" +//#include "comcat.h" +//#include "docobj.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(actxprxy); diff --git a/reactos/dll/win32/advapi32/advapi32.h b/reactos/dll/win32/advapi32/advapi32.h index 22c87c49843..c2b57d2b641 100644 --- a/reactos/dll/win32/advapi32/advapi32.h +++ b/reactos/dll/win32/advapi32/advapi32.h @@ -16,9 +16,10 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #define _WMI_SOURCE_ #include -#include +#include #include #include #include @@ -39,11 +40,9 @@ #include #include -#include "svcctl_c.h" -#include "lsa_c.h" -#include "eventlogrpc_c.h" - -#include +#include +#include +#include #include "crypt/crypt.h" #include diff --git a/reactos/dll/win32/advapi32/advapi32.rc b/reactos/dll/win32/advapi32/advapi32.rc index fbf00a0c776..a15f82dbad9 100644 --- a/reactos/dll/win32/advapi32/advapi32.rc +++ b/reactos/dll/win32/advapi32/advapi32.rc @@ -1,4 +1,4 @@ -#include +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Advanced W32 Base API\0" diff --git a/reactos/dll/win32/advapi32/crypt/crypt.h b/reactos/dll/win32/advapi32/crypt/crypt.h index 902346caf2b..cfbb98758c3 100644 --- a/reactos/dll/win32/advapi32/crypt/crypt.h +++ b/reactos/dll/win32/advapi32/crypt/crypt.h @@ -21,11 +21,11 @@ #ifndef __WINE_CRYPT_H #define __WINE_CRYPT_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wincrypt.h" typedef struct tagPROVFUNCS { diff --git a/reactos/dll/win32/advpack/advpack.c b/reactos/dll/win32/advpack/advpack.c index 919c0bce52d..9942ee9a9b2 100644 --- a/reactos/dll/win32/advpack/advpack.c +++ b/reactos/dll/win32/advpack/advpack.c @@ -19,18 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winternl.h" -#include "winnls.h" -#include "setupapi.h" -#include "advpub.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +//#include "winnls.h" +//#include "setupapi.h" +#include +#include +#include #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c index c34f6d566cc..3fb3e063ee8 100644 --- a/reactos/dll/win32/advpack/files.c +++ b/reactos/dll/win32/advpack/files.c @@ -18,20 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winternl.h" -#include "setupapi.h" -#include "advpub.h" -#include "fdi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include + +#include +#include +#include +#include +#include +#include +//#include "setupapi.h" +#include +#include +#include +#include #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c index 6079625a04f..1a45e75653a 100644 --- a/reactos/dll/win32/advpack/install.c +++ b/reactos/dll/win32/advpack/install.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winternl.h" -#include "winnls.h" -#include "setupapi.h" -#include "advpub.h" -#include "ole2.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include + +#include +#include +#include +#include +#include +//#include "winnls.h" +//#include "setupapi.h" +#include +#include +#include +#include #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); diff --git a/reactos/dll/win32/advpack/reg.c b/reactos/dll/win32/advpack/reg.c index 9a430159ecc..b01438f4515 100644 --- a/reactos/dll/win32/advpack/reg.c +++ b/reactos/dll/win32/advpack/reg.c @@ -18,16 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winerror.h" -#include "winuser.h" -#include "winternl.h" -#include "advpub.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +//#include "winerror.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(advpack); diff --git a/reactos/dll/win32/atl/atl_main.c b/reactos/dll/win32/atl/atl_main.c index 775859f1059..1d36390a9b8 100644 --- a/reactos/dll/win32/atl/atl_main.c +++ b/reactos/dll/win32/atl/atl_main.c @@ -18,16 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "objidl.h" -#include "atlbase.h" -#include "atlwin.h" +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "objidl.h" +#include +#include + +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/reactos/dll/win32/atl/registrar.c b/reactos/dll/win32/atl/registrar.c index 6e5ce7b7af4..8907c6fe0ee 100644 --- a/reactos/dll/win32/atl/registrar.c +++ b/reactos/dll/win32/atl/registrar.c @@ -16,14 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "oaidl.h" -#include "rpcproxy.h" -#include "atlbase.h" +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "oaidl.h" +//#include "rpcproxy.h" +#include + +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/reactos/dll/win32/atl100/atl.c b/reactos/dll/win32/atl100/atl.c index f1b76a5c4f1..6bf50ab2080 100644 --- a/reactos/dll/win32/atl100/atl.c +++ b/reactos/dll/win32/atl100/atl.c @@ -16,11 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "atlbase.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/reactos/dll/win32/atl100/atl_ax.c b/reactos/dll/win32/atl100/atl_ax.c index bd0881fa709..7fccb3a1329 100644 --- a/reactos/dll/win32/atl100/atl_ax.c +++ b/reactos/dll/win32/atl100/atl_ax.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "wine/debug.h" -#include "objbase.h" -#include "objidl.h" -#include "ole2.h" -#include "exdisp.h" -#include "atlbase.h" -#include "atliface.h" -#include "atlwin.h" +#include +#include +//#include "winerror.h" +//#include "winuser.h" +#include +//#include "objbase.h" +//#include "objidl.h" +#include +#include +#include +//#include "atliface.h" +#include -#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/reactos/dll/win32/atl100/registrar.c b/reactos/dll/win32/atl100/registrar.c index f9f5b3c66b5..c42039d109f 100644 --- a/reactos/dll/win32/atl100/registrar.c +++ b/reactos/dll/win32/atl100/registrar.c @@ -16,12 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "atlbase.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include + +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(atl); diff --git a/reactos/dll/win32/authz/authz.c b/reactos/dll/win32/authz/authz.c index 2a17c93cc50..c6191bda3c8 100644 --- a/reactos/dll/win32/authz/authz.c +++ b/reactos/dll/win32/authz/authz.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 09/30/2005 Created */ -#include +#include "precomp.h" HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/authz/authz.rc b/reactos/dll/win32/authz/authz.rc index 94a29998116..7bd7534c03c 100644 --- a/reactos/dll/win32/authz/authz.rc +++ b/reactos/dll/win32/authz/authz.rc @@ -1,4 +1,4 @@ -#include +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Authorization Framework\0" diff --git a/reactos/dll/win32/authz/clictx.c b/reactos/dll/win32/authz/clictx.c index 47659f6fb65..6f4aaa05101 100644 --- a/reactos/dll/win32/authz/clictx.c +++ b/reactos/dll/win32/authz/clictx.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 10/07/2005 Created */ -#include +#include "precomp.h" /* diff --git a/reactos/dll/win32/authz/precomp.h b/reactos/dll/win32/authz/precomp.h index d3af8f2b6cc..fe124a6d2e7 100644 --- a/reactos/dll/win32/authz/precomp.h +++ b/reactos/dll/win32/authz/precomp.h @@ -2,7 +2,15 @@ #define __AUTHZ_PRECOMP_H #define _AUTHZ_ -#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include + #include #include diff --git a/reactos/dll/win32/authz/resman.c b/reactos/dll/win32/authz/resman.c index 1e5597acef2..ae66700e96a 100644 --- a/reactos/dll/win32/authz/resman.c +++ b/reactos/dll/win32/authz/resman.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 10/07/2005 Created */ -#include +#include "precomp.h" static BOOL diff --git a/reactos/dll/win32/avicap32/avicap32.c b/reactos/dll/win32/avicap32/avicap32.c index f4ed19b6e11..cb6a94bbc9c 100644 --- a/reactos/dll/win32/avicap32/avicap32.c +++ b/reactos/dll/win32/avicap32/avicap32.c @@ -5,12 +5,20 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include +#include +#include +#include #include #include -#include - -#include "wine/debug.h" +#include #define CAP_DESC_MAX 32 diff --git a/reactos/dll/win32/avicap32/avicap32.rc b/reactos/dll/win32/avicap32/avicap32.rc index 64627cd4750..292d54c96cc 100644 --- a/reactos/dll/win32/avicap32/avicap32.rc +++ b/reactos/dll/win32/avicap32/avicap32.rc @@ -1,4 +1,4 @@ -#include +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "LAN Manager\0" diff --git a/reactos/dll/win32/avifil32/acmstream.c b/reactos/dll/win32/avifil32/acmstream.c index 50e868b9619..7f2db0487af 100644 --- a/reactos/dll/win32/avifil32/acmstream.c +++ b/reactos/dll/win32/avifil32/acmstream.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "mmsystem.h" -#include "vfw.h" -#include "msacm.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +//#include "mmsystem.h" +#include +//#include "msacm.h" -#include "avifile_private.h" +//#include "avifile_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/api.c b/reactos/dll/win32/avifil32/api.c index c53897adca2..39d67b3688a 100644 --- a/reactos/dll/win32/avifil32/api.c +++ b/reactos/dll/win32/avifil32/api.c @@ -17,28 +17,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "winnls.h" +#include +//#include "winuser.h" +#include +//#include "winerror.h" -#include "ole2.h" -#include "shellapi.h" -#include "shlobj.h" -#include "vfw.h" -#include "msacm.h" +//#include "ole2.h" +//#include "shellapi.h" +//#include "shlobj.h" +#include +//#include "msacm.h" #include "avifile_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/avifile.c b/reactos/dll/win32/avifil32/avifile.c index 885d23903c1..e5fd3b26d9d 100644 --- a/reactos/dll/win32/avifil32/avifile.c +++ b/reactos/dll/win32/avifil32/avifile.c @@ -30,23 +30,27 @@ * When index is missing it works, but index seems to be okay. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winerror.h" -#include "mmsystem.h" -#include "vfw.h" +#include +#include +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "winerror.h" +//#include "mmsystem.h" +#include #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/avifile_private.h b/reactos/dll/win32/avifil32/avifile_private.h index b9390c61e1d..f274104d0b8 100644 --- a/reactos/dll/win32/avifil32/avifile_private.h +++ b/reactos/dll/win32/avifil32/avifile_private.h @@ -19,8 +19,8 @@ #ifndef __AVIFILE_PRIVATE_H #define __AVIFILE_PRIVATE_H -#include -#include +//#include "windef.h" +//#include "winuser.h" #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 diff --git a/reactos/dll/win32/avifil32/editstream.c b/reactos/dll/win32/avifil32/editstream.c index 6d387250e3e..0f8ef2f7aad 100644 --- a/reactos/dll/win32/avifil32/editstream.c +++ b/reactos/dll/win32/avifil32/editstream.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winerror.h" -#include "mmsystem.h" -#include "vfw.h" +#include +#include +//#include "winuser.h" +#include +//#include "winerror.h" +//#include "mmsystem.h" +#include #include "avifile_private.h" -#include "extrachunk.h" +//#include "extrachunk.h" -#include "wine/debug.h" -#include "initguid.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/extrachunk.c b/reactos/dll/win32/avifil32/extrachunk.c index 48ea77eb644..d590c12a659 100644 --- a/reactos/dll/win32/avifil32/extrachunk.c +++ b/reactos/dll/win32/avifil32/extrachunk.c @@ -16,15 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include "extrachunk.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfw.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/extrachunk.h b/reactos/dll/win32/avifil32/extrachunk.h index 843a73c7b59..d8f98720528 100644 --- a/reactos/dll/win32/avifil32/extrachunk.h +++ b/reactos/dll/win32/avifil32/extrachunk.h @@ -19,11 +19,13 @@ #ifndef __WINE_EXTRACHUNK_H #define __WINE_EXTRACHUNK_H +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" +#include +//#include "winbase.h" +#include #ifdef __cplusplus extern "C" { diff --git a/reactos/dll/win32/avifil32/factory.c b/reactos/dll/win32/avifil32/factory.c index 295f11fd986..fa1ee0530af 100644 --- a/reactos/dll/win32/avifil32/factory.c +++ b/reactos/dll/win32/avifil32/factory.c @@ -16,23 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "ole2.h" -#include "rpcproxy.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +#include -#include "initguid.h" -#include "vfw.h" +#include +#include #include "avifile_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/getframe.c b/reactos/dll/win32/avifil32/getframe.c index 547f3401d17..57d9de19cfd 100644 --- a/reactos/dll/win32/avifil32/getframe.c +++ b/reactos/dll/win32/avifil32/getframe.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfw.h" +#include +#include +#include +//#include "winuser.h" +#include #include "avifile_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/icmstream.c b/reactos/dll/win32/avifil32/icmstream.c index 31dd2bebbd8..872d1282161 100644 --- a/reactos/dll/win32/avifil32/icmstream.c +++ b/reactos/dll/win32/avifil32/icmstream.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "mmsystem.h" -#include "vfw.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +//#include "mmsystem.h" +#include #include "avifile_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/rsrc.rc b/reactos/dll/win32/avifil32/rsrc.rc index cff6d56cfc3..65818d83e50 100644 --- a/reactos/dll/win32/avifil32/rsrc.rc +++ b/reactos/dll/win32/avifil32/rsrc.rc @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "avifile_private.h" +#include +#include + +//#include "avifile_private.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -32,7 +35,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" -#include "avifile_private.h" +//#include "avifile_private.h" /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/avifil32/tmpfile.c b/reactos/dll/win32/avifil32/tmpfile.c index 3bdd50a3ea0..5c4cfb80711 100644 --- a/reactos/dll/win32/avifil32/tmpfile.c +++ b/reactos/dll/win32/avifil32/tmpfile.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "vfw.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include -#include "avifile_private.h" -#include "extrachunk.h" +//#include "avifile_private.h" +//#include "extrachunk.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/avifil32/wavfile.c b/reactos/dll/win32/avifil32/wavfile.c index fd6d9ecca48..53da121fa91 100644 --- a/reactos/dll/win32/avifil32/wavfile.c +++ b/reactos/dll/win32/avifil32/wavfile.c @@ -16,24 +16,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winerror.h" -#include "mmsystem.h" -#include "vfw.h" -#include "msacm.h" +#include +#include +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "winerror.h" +//#include "mmsystem.h" +#include +//#include "msacm.h" #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(avifile); diff --git a/reactos/dll/win32/batt/batt.c b/reactos/dll/win32/batt/batt.c index b5e6c4ed199..03695e319be 100644 --- a/reactos/dll/win32/batt/batt.c +++ b/reactos/dll/win32/batt/batt.c @@ -7,7 +7,12 @@ */ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include #include #define NDEBUG diff --git a/reactos/dll/win32/batt/batt.rc b/reactos/dll/win32/batt/batt.rc index 5d3f1c71eff..89bd2bc8dd1 100644 --- a/reactos/dll/win32/batt/batt.rc +++ b/reactos/dll/win32/batt/batt.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/batt/resource.h b/reactos/dll/win32/batt/resource.h index 3f16329ea9a..661282e86d5 100644 --- a/reactos/dll/win32/batt/resource.h +++ b/reactos/dll/win32/batt/resource.h @@ -1 +1,3 @@ +#pragma once + #define IDI_BATTERY 2 diff --git a/reactos/dll/win32/bcrypt/bcrypt_main.c b/reactos/dll/win32/bcrypt/bcrypt_main.c index 3cd73163ddb..9336cd58fe5 100644 --- a/reactos/dll/win32/bcrypt/bcrypt_main.c +++ b/reactos/dll/win32/bcrypt/bcrypt_main.c @@ -17,12 +17,14 @@ * */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS -#include "winbase.h" -#include "bcrypt.h" +#include +//#include "wine/port.h" +#include + +#include +#include typedef LONG NTSTATUS; diff --git a/reactos/dll/win32/beepmidi/beepmidi.c b/reactos/dll/win32/beepmidi/beepmidi.c index 54cf7d375e7..ef74fa588ae 100644 --- a/reactos/dll/win32/beepmidi/beepmidi.c +++ b/reactos/dll/win32/beepmidi/beepmidi.c @@ -41,17 +41,18 @@ #define CONTINUOUS_NOTES #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #define NTOS_MODE_USER #include #include #include -#include #include #include - #include -#include /*#define DPRINT printf*/ #define DPRINT FakePrintf diff --git a/reactos/dll/win32/browseui/browseui.rc b/reactos/dll/win32/browseui/browseui.rc index 84ce6a4d914..6cec9e56396 100644 --- a/reactos/dll/win32/browseui/browseui.rc +++ b/reactos/dll/win32/browseui/browseui.rc @@ -20,8 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "shlobj.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include + #include "resource.h" #include "version.rc" diff --git a/reactos/dll/win32/browseui/dllinstall.c b/reactos/dll/win32/browseui/dllinstall.c index 7d9bfeed362..a24eb4478b9 100644 --- a/reactos/dll/win32/browseui/dllinstall.c +++ b/reactos/dll/win32/browseui/dllinstall.c @@ -1,4 +1,4 @@ -#include +#include HRESULT WINAPI @@ -8,4 +8,3 @@ DllInstall( { return S_OK; } - diff --git a/reactos/dll/win32/browseui/precomp.h b/reactos/dll/win32/browseui/precomp.h index 263499d0325..76bfac8db0a 100644 --- a/reactos/dll/win32/browseui/precomp.h +++ b/reactos/dll/win32/browseui/precomp.h @@ -1,22 +1,29 @@ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include #include #include #include -#include #include #include #include -#include #include +#include #include "resource.h" -#include "wine/debug.h" + #include "aclmulti.h" #include "addressband.h" #include "addresseditbox.h" @@ -29,4 +36,4 @@ #include "globalfoldersettings.h" #include "regtreeoptions.h" #include "newatlinterfaces.h" -#include "utility.h" +//#include "utility.h" diff --git a/reactos/dll/win32/browseui/resource.h b/reactos/dll/win32/browseui/resource.h index ee214c7eee2..5a214cf9bb2 100644 --- a/reactos/dll/win32/browseui/resource.h +++ b/reactos/dll/win32/browseui/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#pragma once + #define IDM_FILE_CLOSE 0xA021 #define IDM_FILE_EXPLORE_MENU 0xA027 #define IDM_EXPLORE_ITEM_FIRST 0xA470 diff --git a/reactos/dll/win32/cabinet/cabinet.h b/reactos/dll/win32/cabinet/cabinet.h index b84c3a7c5d7..d397f0d01d7 100644 --- a/reactos/dll/win32/cabinet/cabinet.h +++ b/reactos/dll/win32/cabinet/cabinet.h @@ -21,13 +21,17 @@ #ifndef __WINE_CABINET_H #define __WINE_CABINET_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "fdi.h" -#include "fci.h" +#include +#include +#include +#include +#include /* from msvcrt/sys/stat.h */ #define _S_IWRITE 0x0080 diff --git a/reactos/dll/win32/cabinet/cabinet_main.c b/reactos/dll/win32/cabinet/cabinet_main.c index ef6698d691c..ec0e360da8f 100644 --- a/reactos/dll/win32/cabinet/cabinet_main.c +++ b/reactos/dll/win32/cabinet/cabinet_main.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include #undef NO_SHLWAPI_REG #include "cabinet.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(cabinet); diff --git a/reactos/dll/win32/cabinet/fci.c b/reactos/dll/win32/cabinet/fci.c index 70d4f3f170f..faf660a159d 100644 --- a/reactos/dll/win32/cabinet/fci.c +++ b/reactos/dll/win32/cabinet/fci.c @@ -30,26 +30,24 @@ There is still some work to be done: */ - - -#include "config.h" +#include #include -#include -#include -#include +//#include +//#include +//#include #ifdef HAVE_ZLIB # include #endif -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winternl.h" -#include "fci.h" +//#include +//#include +//#include "winerror.h" +//#include "winternl.h" +//#include #include "cabinet.h" -#include "wine/list.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(cabinet); diff --git a/reactos/dll/win32/cabinet/fdi.c b/reactos/dll/win32/cabinet/fdi.c index fb675fc5d33..e4959e6e8b0 100644 --- a/reactos/dll/win32/cabinet/fdi.c +++ b/reactos/dll/win32/cabinet/fdi.c @@ -58,18 +58,18 @@ * -gmt */ -#include "config.h" +#include -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "fdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "fdi.h" #include "cabinet.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(cabinet); diff --git a/reactos/dll/win32/cabinet/stubs.c b/reactos/dll/win32/cabinet/stubs.c index e0469cb5ae4..30e62793a9b 100644 --- a/reactos/dll/win32/cabinet/stubs.c +++ b/reactos/dll/win32/cabinet/stubs.c @@ -1,4 +1,4 @@ -#include +#include #include typedef PVOID PSESSION; diff --git a/reactos/dll/win32/cards/cards.c b/reactos/dll/win32/cards/cards.c index a9c87925f70..20de5a754b8 100644 --- a/reactos/dll/win32/cards/cards.c +++ b/reactos/dll/win32/cards/cards.c @@ -19,8 +19,10 @@ */ #include +#include +#include +#include -#include "windows.h" #include "cards.h" HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; diff --git a/reactos/dll/win32/cards/cards.rc b/reactos/dll/win32/cards/cards.rc index e983d6e1949..7ae700cd66b 100644 --- a/reactos/dll/win32/cards/cards.rc +++ b/reactos/dll/win32/cards/cards.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Cardplaying Helper DLL\0" diff --git a/reactos/dll/win32/clusapi/clusapi.c b/reactos/dll/win32/clusapi/clusapi.c index f782d43708b..a2e79b9ff32 100644 --- a/reactos/dll/win32/clusapi/clusapi.c +++ b/reactos/dll/win32/clusapi/clusapi.c @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "clusapi.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(clusapi); diff --git a/reactos/dll/win32/comcat/comcat_main.c b/reactos/dll/win32/comcat/comcat_main.c index 83fc0eefe22..5a76aec16f5 100644 --- a/reactos/dll/win32/comcat/comcat_main.c +++ b/reactos/dll/win32/comcat/comcat_main.c @@ -18,16 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "ole2.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "winreg.h" +//#include "winerror.h" +//#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@) diff --git a/reactos/dll/win32/comctl32/animate.c b/reactos/dll/win32/comctl32/animate.c index a86ff851ba4..0cfa6d83a92 100644 --- a/reactos/dll/win32/comctl32/animate.c +++ b/reactos/dll/win32/comctl32/animate.c @@ -33,18 +33,22 @@ * - check for the 'rec ' list in some AVI files */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "vfw.h" -#include "mmsystem.h" +//#include +#include +#include +#include +//#include "winuser.h" +#include +//#include "commctrl.h" +#include +//#include "mmsystem.h" #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(animate); diff --git a/reactos/dll/win32/comctl32/comboex.c b/reactos/dll/win32/comctl32/comboex.c index d92da3d8a46..fdc4815c7d8 100644 --- a/reactos/dll/win32/comctl32/comboex.c +++ b/reactos/dll/win32/comctl32/comboex.c @@ -30,17 +30,17 @@ * */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(comboex); diff --git a/reactos/dll/win32/comctl32/comctl32.h b/reactos/dll/win32/comctl32/comctl32.h index 129ab0cf0f0..fc28880cd77 100644 --- a/reactos/dll/win32/comctl32/comctl32.h +++ b/reactos/dll/win32/comctl32/comctl32.h @@ -24,16 +24,20 @@ #ifndef __WINE_COMCTL32_H #define __WINE_COMCTL32_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #ifndef RC_INVOKED #include #endif -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +#include +#include +#include +#include +//#include "winnls.h" +#include extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; diff --git a/reactos/dll/win32/comctl32/comctl32undoc.c b/reactos/dll/win32/comctl32/comctl32undoc.c index 5892d7639a4..54d5ca8a643 100644 --- a/reactos/dll/win32/comctl32/comctl32undoc.c +++ b/reactos/dll/win32/comctl32/comctl32undoc.c @@ -26,32 +26,36 @@ * COMCTL32.DLL (internally). * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include -#include -#include +#include +//#include "wine/port.h" + +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "commctrl.h" -#include "objbase.h" -#include "winerror.h" +#include +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +#include +//#include "commctrl.h" +//#include "objbase.h" +//#include "winerror.h" -#include "wine/unicode.h" +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/commctrl.c b/reactos/dll/win32/comctl32/commctrl.c index 42c8009097d..dbafe7aa96f 100644 --- a/reactos/dll/win32/comctl32/commctrl.c +++ b/reactos/dll/win32/comctl32/commctrl.c @@ -52,22 +52,26 @@ * -- ICC_WIN95_CLASSES */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "winerror.h" -#include "winreg.h" +#include +//#include +//#include + +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "commctrl.h" +//#include "winerror.h" +#include #define NO_SHLWAPI_STREAM -#include "shlwapi.h" +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/datetime.c b/reactos/dll/win32/comctl32/datetime.c index 748e0fc3918..ff2edede88f 100644 --- a/reactos/dll/win32/comctl32/datetime.c +++ b/reactos/dll/win32/comctl32/datetime.c @@ -40,20 +40,20 @@ */ #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(datetime); diff --git a/reactos/dll/win32/comctl32/dpa.c b/reactos/dll/win32/comctl32/dpa.c index 96823442864..9566c610658 100644 --- a/reactos/dll/win32/comctl32/dpa.c +++ b/reactos/dll/win32/comctl32/dpa.c @@ -29,19 +29,23 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "objbase.h" +#include +#include +//#include "winuser.h" +//#include "commctrl.h" +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dpa); diff --git a/reactos/dll/win32/comctl32/draglist.c b/reactos/dll/win32/comctl32/draglist.c index 2097edb42fd..4b82f259422 100644 --- a/reactos/dll/win32/comctl32/draglist.c +++ b/reactos/dll/win32/comctl32/draglist.c @@ -29,16 +29,16 @@ * */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/dsa.c b/reactos/dll/win32/comctl32/dsa.c index 13f63e23de4..88a83c93686 100644 --- a/reactos/dll/win32/comctl32/dsa.c +++ b/reactos/dll/win32/comctl32/dsa.c @@ -31,13 +31,13 @@ #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dsa); diff --git a/reactos/dll/win32/comctl32/flatsb.c b/reactos/dll/win32/comctl32/flatsb.c index 174e22d3dcd..e4173974ec2 100644 --- a/reactos/dll/win32/comctl32/flatsb.c +++ b/reactos/dll/win32/comctl32/flatsb.c @@ -31,13 +31,13 @@ #include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "commctrl.h" +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/header.c b/reactos/dll/win32/comctl32/header.c index d1386e35e7b..dc0c2faaff5 100644 --- a/reactos/dll/win32/comctl32/header.c +++ b/reactos/dll/win32/comctl32/header.c @@ -27,21 +27,25 @@ * - New Windows Vista features */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +#include +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "wine/unicode.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "vssym32.h" -#include "uxtheme.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(header); diff --git a/reactos/dll/win32/comctl32/hotkey.c b/reactos/dll/win32/comctl32/hotkey.c index a72b48752ec..94ccae5ce02 100644 --- a/reactos/dll/win32/comctl32/hotkey.c +++ b/reactos/dll/win32/comctl32/hotkey.c @@ -28,16 +28,16 @@ * */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(hotkey); diff --git a/reactos/dll/win32/comctl32/imagelist.c b/reactos/dll/win32/comctl32/imagelist.c index 6142ba7c016..75825764618 100644 --- a/reactos/dll/win32/comctl32/imagelist.c +++ b/reactos/dll/win32/comctl32/imagelist.c @@ -37,23 +37,27 @@ * - Thread-safe locking */ +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include +//#include +//#include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commctrl.h" +//#include "winerror.h" +#include +#include +#include +//#include "wingdi.h" +#include +//#include "winuser.h" +//#include "commctrl.h" #include "comctl32.h" -#include "commoncontrols.h" -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(imagelist); diff --git a/reactos/dll/win32/comctl32/ipaddress.c b/reactos/dll/win32/comctl32/ipaddress.c index 97b6a0f3118..4310f6f7663 100644 --- a/reactos/dll/win32/comctl32/ipaddress.c +++ b/reactos/dll/win32/comctl32/ipaddress.c @@ -32,21 +32,21 @@ * */ -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); diff --git a/reactos/dll/win32/comctl32/listview.c b/reactos/dll/win32/comctl32/listview.c index 33084ae2cd8..c2869528c0e 100644 --- a/reactos/dll/win32/comctl32/listview.c +++ b/reactos/dll/win32/comctl32/listview.c @@ -143,28 +143,28 @@ * processing for "USEDOUBLECLICKTIME". */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnt.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(listview); diff --git a/reactos/dll/win32/comctl32/monthcal.c b/reactos/dll/win32/comctl32/monthcal.c index f27eee3de3e..a9b76d47627 100644 --- a/reactos/dll/win32/comctl32/monthcal.c +++ b/reactos/dll/win32/comctl32/monthcal.c @@ -39,23 +39,23 @@ * -- search for FIXME */ -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(monthcal); diff --git a/reactos/dll/win32/comctl32/nativefont.c b/reactos/dll/win32/comctl32/nativefont.c index 2e11a9e665a..0ea3ec9d797 100644 --- a/reactos/dll/win32/comctl32/nativefont.c +++ b/reactos/dll/win32/comctl32/nativefont.c @@ -29,13 +29,13 @@ #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commctrl.h" +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(nativefont); diff --git a/reactos/dll/win32/comctl32/pager.c b/reactos/dll/win32/comctl32/pager.c index 3b2c11c2c2d..9685acca7e9 100644 --- a/reactos/dll/win32/comctl32/pager.c +++ b/reactos/dll/win32/comctl32/pager.c @@ -52,16 +52,16 @@ * Robert Shearman */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(pager); diff --git a/reactos/dll/win32/comctl32/progress.c b/reactos/dll/win32/comctl32/progress.c index aba53027873..8836ac67eda 100644 --- a/reactos/dll/win32/comctl32/progress.c +++ b/reactos/dll/win32/comctl32/progress.c @@ -34,18 +34,18 @@ * */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(progress); diff --git a/reactos/dll/win32/comctl32/propsheet.c b/reactos/dll/win32/comctl32/propsheet.c index 6547e3f1217..a1c5673e58f 100644 --- a/reactos/dll/win32/comctl32/propsheet.c +++ b/reactos/dll/win32/comctl32/propsheet.c @@ -52,23 +52,23 @@ * o PSP_USEREFPARENT */ -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "prsht.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" +//#include "prsht.h" #include "comctl32.h" -#include "uxtheme.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include /****************************************************************************** * Data structures diff --git a/reactos/dll/win32/comctl32/rebar.c b/reactos/dll/win32/comctl32/rebar.c index d15c7361fa4..2dc99cd784f 100644 --- a/reactos/dll/win32/comctl32/rebar.c +++ b/reactos/dll/win32/comctl32/rebar.c @@ -78,21 +78,21 @@ */ #include -#include +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/unicode.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "wine/unicode.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(rebar); diff --git a/reactos/dll/win32/comctl32/rsrc.rc b/reactos/dll/win32/comctl32/rsrc.rc index b279e7ca40f..3dbaee18884 100644 --- a/reactos/dll/win32/comctl32/rsrc.rc +++ b/reactos/dll/win32/comctl32/rsrc.rc @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" #include "comctl32.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/comctl32/smoothscroll.c b/reactos/dll/win32/comctl32/smoothscroll.c index e71fac330e3..8527407ae12 100644 --- a/reactos/dll/win32/comctl32/smoothscroll.c +++ b/reactos/dll/win32/comctl32/smoothscroll.c @@ -23,12 +23,12 @@ #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winerror.h" -#include "winuser.h" -#include "wine/debug.h" +#include +//#include "winbase.h" +#include +//#include "winerror.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/status.c b/reactos/dll/win32/comctl32/status.c index 19d671d8324..d16e16372a0 100644 --- a/reactos/dll/win32/comctl32/status.c +++ b/reactos/dll/win32/comctl32/status.c @@ -43,17 +43,17 @@ #include #include -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +#include +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(statusbar); diff --git a/reactos/dll/win32/comctl32/string.c b/reactos/dll/win32/comctl32/string.c index a9544fa8d23..8a579a57a4a 100644 --- a/reactos/dll/win32/comctl32/string.c +++ b/reactos/dll/win32/comctl32/string.c @@ -22,23 +22,23 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include -#include /* atoi */ +//#include +//#include +//#include /* atoi */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" #include "comctl32.h" -#include "wine/unicode.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commctrl); diff --git a/reactos/dll/win32/comctl32/stubs.c b/reactos/dll/win32/comctl32/stubs.c index 8d41afebd18..ab4f6e7b4dd 100644 --- a/reactos/dll/win32/comctl32/stubs.c +++ b/reactos/dll/win32/comctl32/stubs.c @@ -1,4 +1,4 @@ -#include +#include #include typedef PVOID PREADERMODEINFO; diff --git a/reactos/dll/win32/comctl32/syslink.c b/reactos/dll/win32/comctl32/syslink.c index a5ba3dd422d..385a335fee8 100644 --- a/reactos/dll/win32/comctl32/syslink.c +++ b/reactos/dll/win32/comctl32/syslink.c @@ -27,17 +27,17 @@ * If you discover missing features, or bugs, please note them below. */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(syslink); diff --git a/reactos/dll/win32/comctl32/tab.c b/reactos/dll/win32/comctl32/tab.c index 43d8cdf353c..56be60ca94a 100644 --- a/reactos/dll/win32/comctl32/tab.c +++ b/reactos/dll/win32/comctl32/tab.c @@ -53,20 +53,20 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" -#include +#include +#include +#include +//#include WINE_DEFAULT_DEBUG_CHANNEL(tab); diff --git a/reactos/dll/win32/comctl32/theme_button.c b/reactos/dll/win32/comctl32/theme_button.c index 01f16fb5931..64f4deff71c 100644 --- a/reactos/dll/win32/comctl32/theme_button.c +++ b/reactos/dll/win32/comctl32/theme_button.c @@ -20,15 +20,15 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" +#include +#include +#include +#include +#include +#include #include "comctl32.h" #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ diff --git a/reactos/dll/win32/comctl32/theme_combo.c b/reactos/dll/win32/comctl32/theme_combo.c index 9482a3b2f7a..7a49b0791f9 100644 --- a/reactos/dll/win32/comctl32/theme_combo.c +++ b/reactos/dll/win32/comctl32/theme_combo.c @@ -20,17 +20,17 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); diff --git a/reactos/dll/win32/comctl32/theme_dialog.c b/reactos/dll/win32/comctl32/theme_dialog.c index cdca2dd604d..bbb7975b204 100644 --- a/reactos/dll/win32/comctl32/theme_dialog.c +++ b/reactos/dll/win32/comctl32/theme_dialog.c @@ -20,17 +20,17 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include /********************************************************************** * The dialog subclass window proc. diff --git a/reactos/dll/win32/comctl32/theme_edit.c b/reactos/dll/win32/comctl32/theme_edit.c index c6fd34cc01f..28e89a92fde 100644 --- a/reactos/dll/win32/comctl32/theme_edit.c +++ b/reactos/dll/win32/comctl32/theme_edit.c @@ -20,17 +20,17 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) diff --git a/reactos/dll/win32/comctl32/theme_listbox.c b/reactos/dll/win32/comctl32/theme_listbox.c index 91772144aa8..00de62006f9 100644 --- a/reactos/dll/win32/comctl32/theme_listbox.c +++ b/reactos/dll/win32/comctl32/theme_listbox.c @@ -20,17 +20,17 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "wine/debug.h" +#include /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) diff --git a/reactos/dll/win32/comctl32/theming.c b/reactos/dll/win32/comctl32/theming.c index aa99fc1c802..862f87e6d8c 100644 --- a/reactos/dll/win32/comctl32/theming.c +++ b/reactos/dll/win32/comctl32/theming.c @@ -21,13 +21,13 @@ #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +#include #include "comctl32.h" -#include "uxtheme.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(theming); diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c index c26d70e6063..9923cdb76ef 100644 --- a/reactos/dll/win32/comctl32/toolbar.c +++ b/reactos/dll/win32/comctl32/toolbar.c @@ -71,18 +71,18 @@ #include #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "winnls.h" -#include "commctrl.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(toolbar); diff --git a/reactos/dll/win32/comctl32/tooltips.c b/reactos/dll/win32/comctl32/tooltips.c index c09b9b8cbe5..34da653c05f 100644 --- a/reactos/dll/win32/comctl32/tooltips.c +++ b/reactos/dll/win32/comctl32/tooltips.c @@ -91,18 +91,18 @@ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(tooltips); diff --git a/reactos/dll/win32/comctl32/trackbar.c b/reactos/dll/win32/comctl32/trackbar.c index 99fde1b16b4..2c9767550c1 100644 --- a/reactos/dll/win32/comctl32/trackbar.c +++ b/reactos/dll/win32/comctl32/trackbar.c @@ -31,19 +31,19 @@ */ #include -#include +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/debug.h" +#include +#include +#include +#include +//#include "winnls.h" +//#include "commctrl.h" +#include +#include +#include #include "comctl32.h" diff --git a/reactos/dll/win32/comctl32/treeview.c b/reactos/dll/win32/comctl32/treeview.c index a4800d06229..8dd0dcabee4 100644 --- a/reactos/dll/win32/comctl32/treeview.c +++ b/reactos/dll/win32/comctl32/treeview.c @@ -40,29 +40,29 @@ * Scroll (instead of repaint) as much as possible. */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(treeview); diff --git a/reactos/dll/win32/comctl32/updown.c b/reactos/dll/win32/comctl32/updown.c index 2c5fc60bbca..d3be2898c54 100644 --- a/reactos/dll/win32/comctl32/updown.c +++ b/reactos/dll/win32/comctl32/updown.c @@ -28,22 +28,22 @@ * */ -#include -#include -#include -#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "commctrl.h" #include "comctl32.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(updown); diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h index 91491d32290..5f3ac59786e 100644 --- a/reactos/dll/win32/comdlg32/cdlg.h +++ b/reactos/dll/win32/comdlg32/cdlg.h @@ -21,7 +21,7 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H -#include "dlgs.h" +#include /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ diff --git a/reactos/dll/win32/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c index 364ec06e826..82f7f6b0d2f 100644 --- a/reactos/dll/win32/comdlg32/cdlg32.c +++ b/reactos/dll/win32/comdlg32/cdlg32.c @@ -19,19 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "commdlg.h" -#include "cderr.h" -#include "wine/debug.h" +#include +//#include "winbase.h" +#include +#include +//#include "objbase.h" +//#include "rpcproxy.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c index ed806acf16e..041742c08dc 100644 --- a/reactos/dll/win32/comdlg32/colordlg.c +++ b/reactos/dll/win32/comdlg32/colordlg.c @@ -23,19 +23,23 @@ sometimes, especially when 2 instances of the dialog are loaded at the same time */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +//#include +//#include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" -#include "wine/debug.h" -#include "cderr.h" +//#include +#include +//#include "winbase.h" +#include +#include +#include +//#include "dlgs.h" +#include +#include #include "cdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c index 150e29df516..cb2b07673d7 100644 --- a/reactos/dll/win32/comdlg32/filedlg.c +++ b/reactos/dll/win32/comdlg32/filedlg.c @@ -49,38 +49,42 @@ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include +#include +//#include "wine/port.h" + +//#include +//#include #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "winnls.h" -#include "wingdi.h" -#include "winreg.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" +#include +#include +#include +#include +//#include "dlgs.h" #include "cdlg.h" #include "filedlg31.h" -#include "cderr.h" -#include "shellapi.h" -#include "shlobj.h" +#include +//#include "shellapi.h" +//#include "shlobj.h" #include "filedlgbrowser.h" -#include "shlwapi.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/filedlg31.c b/reactos/dll/win32/comdlg32/filedlg31.c index b3d1c51a28e..302a432ba1d 100644 --- a/reactos/dll/win32/comdlg32/filedlg31.c +++ b/reactos/dll/win32/comdlg32/filedlg31.c @@ -18,22 +18,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +//#include #include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winreg.h" -#include "winternl.h" -#include "commdlg.h" -#include "shlwapi.h" +//#include +//#include +#include +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c index 776abfcef2f..e7a4ed9b171 100644 --- a/reactos/dll/win32/comdlg32/filedlgbrowser.c +++ b/reactos/dll/win32/comdlg32/filedlgbrowser.c @@ -19,28 +19,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" +#include +#include +//#include "winnls.h" +#include +#include +#include +#include #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "filedlgbrowser.h" +#include +#include #include "cdlg.h" -#include "shlguid.h" -#include "servprov.h" -#include "wine/debug.h" +//#include "shlguid.h" +//#include "servprov.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.h b/reactos/dll/win32/comdlg32/filedlgbrowser.h index e01c5a06a7d..90402b9d8a3 100644 --- a/reactos/dll/win32/comdlg32/filedlgbrowser.h +++ b/reactos/dll/win32/comdlg32/filedlgbrowser.h @@ -22,16 +22,20 @@ #ifndef SHBROWSER_H #define SHBROWSER_H -#ifndef RC_INVOKED -#include -#endif +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "shlobj.h" -#include "objbase.h" -#include "commdlg.h" +//#ifndef RC_INVOKED +//#include +//#endif + +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +#include +//#include "objbase.h" +//#include "commdlg.h" /*********************************************************************** * Defines and global variables diff --git a/reactos/dll/win32/comdlg32/finddlg.c b/reactos/dll/win32/comdlg32/finddlg.c index bc4a31c6050..aedaee7311e 100644 --- a/reactos/dll/win32/comdlg32/finddlg.c +++ b/reactos/dll/win32/comdlg32/finddlg.c @@ -19,17 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cderr.h" -#include "dlgs.h" -#include "wine/debug.h" +//#include +#include +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include +#include +//#include "dlgs.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c index 8068e823dc1..912ab2dda09 100644 --- a/reactos/dll/win32/comdlg32/fontdlg.c +++ b/reactos/dll/win32/comdlg32/fontdlg.c @@ -19,20 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +//#include #include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" -#include "wine/debug.h" -#include "cderr.h" +//#include +//#include +#include +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include +//#include "dlgs.h" +#include +#include #include "cdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c index aea5224202d..6e6802a5023 100644 --- a/reactos/dll/win32/comdlg32/printdlg.c +++ b/reactos/dll/win32/comdlg32/printdlg.c @@ -21,28 +21,32 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +//#include +//#include #include -#include +//#include #include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winspool.h" -#include "winerror.h" +#include +#include +#include +#include +#include +//#include "winerror.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include -#include "commdlg.h" -#include "dlgs.h" -#include "cderr.h" +#include +//#include "dlgs.h" +#include #include "cdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/rsrc.rc b/reactos/dll/win32/comdlg32/rsrc.rc index 0795c40484b..bba3fca39d1 100644 --- a/reactos/dll/win32/comdlg32/rsrc.rc +++ b/reactos/dll/win32/comdlg32/rsrc.rc @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "cdlg.h" -#include "winspool.h" -#include "filedlgbrowser.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "cdlg.h" +//#include "winspool.h" +//#include "filedlgbrowser.h" /* * Everything that does not depend on language, diff --git a/reactos/dll/win32/compstui/compstui_main.c b/reactos/dll/win32/compstui/compstui_main.c index 41b24416176..a2433059276 100644 --- a/reactos/dll/win32/compstui/compstui_main.c +++ b/reactos/dll/win32/compstui/compstui_main.c @@ -18,18 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ddk/compstui.h" +#include +#include +#include +#include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(compstui); diff --git a/reactos/dll/win32/credui/credui.rc b/reactos/dll/win32/credui/credui.rc index 7f82498d694..4360ec802e9 100644 --- a/reactos/dll/win32/credui/credui.rc +++ b/reactos/dll/win32/credui/credui.rc @@ -19,9 +19,9 @@ */ #include "windef.h" -#include "winbase.h" +//#include "winbase.h" #include "winuser.h" -#include "winnls.h" +//#include "winnls.h" #include "credui_resources.h" /* @makedep: banner.bmp */ diff --git a/reactos/dll/win32/credui/credui_main.c b/reactos/dll/win32/credui/credui_main.c index 9d09b03cf5c..96f4d64b4fa 100644 --- a/reactos/dll/win32/credui/credui_main.c +++ b/reactos/dll/win32/credui/credui_main.c @@ -18,20 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winuser.h" -#include "wincred.h" -#include "commctrl.h" +#include +#include +//#include "winnt.h" +#include +#include +#include #include "credui_resources.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(credui); diff --git a/reactos/dll/win32/credui/credui_resources.h b/reactos/dll/win32/credui/credui_resources.h index 0a6ab72b092..64768b390cb 100644 --- a/reactos/dll/win32/credui/credui_resources.h +++ b/reactos/dll/win32/credui/credui_resources.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 diff --git a/reactos/dll/win32/crtdll/dllmain.c b/reactos/dll/win32/crtdll/dllmain.c index 7f7aa429664..c5d804a1841 100644 --- a/reactos/dll/win32/crtdll/dllmain.c +++ b/reactos/dll/win32/crtdll/dllmain.c @@ -15,15 +15,15 @@ * */ -#include -#include +#include "precomp.h" +//#include #include #include #include -#include +//#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(crtdll); /* from msvcrt */ diff --git a/reactos/dll/win32/crtdll/precomp.h b/reactos/dll/win32/crtdll/precomp.h index d30dfa7109e..1e68d9cfe0f 100644 --- a/reactos/dll/win32/crtdll/precomp.h +++ b/reactos/dll/win32/crtdll/precomp.h @@ -1,9 +1,10 @@ #ifndef _CRT_PRECOMP_H #define _CRT_PRECOMP_H -#include -#include +//#include +//#include +#include #include -#include +//#include #endif /* _CRT_PRECOMP_H */ diff --git a/reactos/dll/win32/crypt32/base64.c b/reactos/dll/win32/crypt32/base64.c index a01a7b6459c..23491672574 100644 --- a/reactos/dll/win32/crypt32/base64.c +++ b/reactos/dll/win32/crypt32/base64.c @@ -19,13 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +//#include "winerror.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/reactos/dll/win32/crypt32/cert.c b/reactos/dll/win32/crypt32/cert.c index 63107e18f28..c037b702415 100644 --- a/reactos/dll/win32/crypt32/cert.c +++ b/reactos/dll/win32/crypt32/cert.c @@ -17,17 +17,21 @@ * */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winnls.h" -#include "rpc.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +//#include "winnls.h" +#include +#include +#include #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/reactos/dll/win32/crypt32/crypt32.rc b/reactos/dll/win32/crypt32/crypt32.rc index 3d11d93be0e..0f35fe0bf97 100644 --- a/reactos/dll/win32/crypt32/crypt32.rc +++ b/reactos/dll/win32/crypt32/crypt32.rc @@ -17,10 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "cryptres.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "cryptres.h" #include "version.rc" diff --git a/reactos/dll/win32/crypt32/cryptres.h b/reactos/dll/win32/crypt32/cryptres.h index 0bbffcc58f1..d7367223188 100644 --- a/reactos/dll/win32/crypt32/cryptres.h +++ b/reactos/dll/win32/crypt32/cryptres.h @@ -18,7 +18,7 @@ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ -#include +//#include #define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001 diff --git a/reactos/dll/win32/cryptdlg/cryptdlg.rc b/reactos/dll/win32/cryptdlg/cryptdlg.rc index 1c3b222a758..d1410a96dd3 100644 --- a/reactos/dll/win32/cryptdlg/cryptdlg.rc +++ b/reactos/dll/win32/cryptdlg/cryptdlg.rc @@ -17,10 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "cryptres.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "cryptres.h" #ifdef LANGUAGE_DA_DK #include "cryptdlg_Da.rc" diff --git a/reactos/dll/win32/cryptdlg/cryptres.h b/reactos/dll/win32/cryptdlg/cryptres.h index 4d3c2d2ffb3..821fda378f1 100644 --- a/reactos/dll/win32/cryptdlg/cryptres.h +++ b/reactos/dll/win32/cryptdlg/cryptres.h @@ -18,7 +18,7 @@ #ifndef __CRYPTRES_H__ #define __CRYPTRES_H__ -#include +//#include #define IDS_CERT_POLICY 100 #define IDS_POLICY_ID 101 diff --git a/reactos/dll/win32/cryptdlg/main.c b/reactos/dll/win32/cryptdlg/main.c index 04311fdb4fd..2c92013bd2e 100644 --- a/reactos/dll/win32/cryptdlg/main.c +++ b/reactos/dll/win32/cryptdlg/main.c @@ -16,25 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #define NONAMELESSUNION -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wincrypt.h" -#include "wintrust.h" -#include "winuser.h" -#include "objbase.h" -#include "cryptdlg.h" -#include "cryptuiapi.h" +#include +#include +//#include "winnls.h" +#include +#include +//#include "wintrust.h" +#include +//#include "objbase.h" +#include +#include #include "cryptres.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg); diff --git a/reactos/dll/win32/cryptdll/cryptdll.c b/reactos/dll/win32/cryptdll/cryptdll.c index 72fcf680213..ed892a6919f 100644 --- a/reactos/dll/win32/cryptdll/cryptdll.c +++ b/reactos/dll/win32/cryptdll/cryptdll.c @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +//#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); diff --git a/reactos/dll/win32/cryptdll/stubs.c b/reactos/dll/win32/cryptdll/stubs.c index 86bee19fa34..e597d42a7f1 100644 --- a/reactos/dll/win32/cryptdll/stubs.c +++ b/reactos/dll/win32/cryptdll/stubs.c @@ -1,5 +1,4 @@ - -#include +#include #define NDEBUG #include @@ -68,4 +67,3 @@ CDRegisterRng(DWORD Unknown1) { UNIMPLEMENTED; } - diff --git a/reactos/dll/win32/cryptnet/cryptnet_main.c b/reactos/dll/win32/cryptnet/cryptnet_main.c index 5d063968974..04284914896 100644 --- a/reactos/dll/win32/cryptnet/cryptnet_main.c +++ b/reactos/dll/win32/cryptnet/cryptnet_main.c @@ -18,25 +18,27 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS + +#include +//#include "wine/port.h" #define NONAMELESSUNION #define NONAMELESSSTRUCT #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winnls.h" -#include "wininet.h" -#include "objbase.h" -#include "wincrypt.h" +#include +#include +//#include "winnt.h" +#include +#include +//#include "objbase.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); diff --git a/reactos/dll/win32/cryptui/cryptui.rc b/reactos/dll/win32/cryptui/cryptui.rc index 6e8de9029c4..89b64364a8b 100644 --- a/reactos/dll/win32/cryptui/cryptui.rc +++ b/reactos/dll/win32/cryptui/cryptui.rc @@ -17,11 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "dlgs.h" +#include +//#include "winbase.h" +#include +#include +//#include "dlgs.h" #include "cryptuires.h" diff --git a/reactos/dll/win32/cryptui/cryptuires.h b/reactos/dll/win32/cryptui/cryptuires.h index df321df4632..9b3edafb7cf 100644 --- a/reactos/dll/win32/cryptui/cryptuires.h +++ b/reactos/dll/win32/cryptui/cryptuires.h @@ -18,9 +18,9 @@ #ifndef __CRYPTUIRES_H_ #define __CRYPTUIRES_H_ -#include -#include -#include +//#include +//#include +//#include #define IDS_CERTIFICATE 1000 #define IDS_CERTIFICATEINFORMATION 1001 diff --git a/reactos/dll/win32/cryptui/main.c b/reactos/dll/win32/cryptui/main.c index 387b6c635a9..70eac91935e 100644 --- a/reactos/dll/win32/cryptui/main.c +++ b/reactos/dll/win32/cryptui/main.c @@ -16,31 +16,35 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" -#include "softpub.h" -#include "wingdi.h" -#include "richedit.h" -#include "ole2.h" -#include "richole.h" -#include "commdlg.h" -#include "commctrl.h" -#include "cryptuiapi.h" +#include +#include +//#include "winnls.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "cryptuires.h" -#include "urlmon.h" -#include "hlink.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "urlmon.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(cryptui); diff --git a/reactos/dll/win32/dbghelp/coff.c b/reactos/dll/win32/dbghelp/coff.c index 54bd278b936..01f667f3011 100644 --- a/reactos/dll/win32/dbghelp/coff.c +++ b/reactos/dll/win32/dbghelp/coff.c @@ -32,26 +32,26 @@ * Add symbol size to internal symbol table. */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include +//#include #include #ifdef HAVE_UNISTD_H # include #endif -#include -#include "windef.h" -#include "winbase.h" -#include "winternl.h" +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "winternl.h" -#include "wine/exception.h" -#include "wine/debug.h" +//#include "wine/exception.h" +#include #include "dbghelp_private.h" -#include "wine/mscvpdb.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_coff); diff --git a/reactos/dll/win32/dbghelp/cpu_arm.c b/reactos/dll/win32/dbghelp/cpu_arm.c index 413a492c1ae..58c2ff8777d 100644 --- a/reactos/dll/win32/dbghelp/cpu_arm.c +++ b/reactos/dll/win32/dbghelp/cpu_arm.c @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "ntstatus.h" +//#include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" +//#include "winternl.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dbghelp/dbghelp_private.h b/reactos/dll/win32/dbghelp/dbghelp_private.h index 0e2aae7f2ba..b4804b919fa 100644 --- a/reactos/dll/win32/dbghelp/dbghelp_private.h +++ b/reactos/dll/win32/dbghelp/dbghelp_private.h @@ -21,19 +21,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "windef.h" -#include "winbase.h" -#include "winver.h" -#include "dbghelp.h" -#include "objbase.h" -#include "oaidl.h" -#include "winnls.h" -#include "wine/list.h" -#include "wine/unicode.h" -#include "wine/rbtree.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "cvconst.h" +#include +#include +#include +#include +#include +#include +//#include "oaidl.h" +//#include "winnls.h" +#include +#include +#include + +#include /* #define USE_STATS */ diff --git a/reactos/dll/win32/dbghelp/dwarf.c b/reactos/dll/win32/dbghelp/dwarf.c index 2a16650bccd..78ff4c0412b 100644 --- a/reactos/dll/win32/dbghelp/dwarf.c +++ b/reactos/dll/win32/dbghelp/dwarf.c @@ -22,36 +22,36 @@ #define NONAMELESSUNION -#include "config.h" +#include -#include -#include +//#include +//#include #ifdef HAVE_SYS_STAT_H # include #endif #ifdef HAVE_SYS_MMAN_H #include #endif -#include -#include -#include +//#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif -#include +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "oleauto.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "ole2.h" +//#include "oleauto.h" #include "dbghelp_private.h" #include "image_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf); diff --git a/reactos/dll/win32/dbghelp/image.c b/reactos/dll/win32/dbghelp/image.c index ef94ef66386..954a0ee21b3 100644 --- a/reactos/dll/win32/dbghelp/image.c +++ b/reactos/dll/win32/dbghelp/image.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dbghelp/module.c b/reactos/dll/win32/dbghelp/module.c index 2a1471ffdec..3848a45d10e 100644 --- a/reactos/dll/win32/dbghelp/module.c +++ b/reactos/dll/win32/dbghelp/module.c @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #include #include "dbghelp_private.h" -#include "psapi.h" -#include "winternl.h" -#include "wine/debug.h" +#include +//#include "winternl.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dbghelp/path.c b/reactos/dll/win32/dbghelp/path.c index 1b494da92f1..207d257974d 100644 --- a/reactos/dll/win32/dbghelp/path.c +++ b/reactos/dll/win32/dbghelp/path.c @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #include "dbghelp_private.h" -#include "winnls.h" -#include "winternl.h" -#include "wine/debug.h" +//#include "winnls.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dbghelp/source.c b/reactos/dll/win32/dbghelp/source.c index 693ba78c1bd..ad3b1b534c1 100644 --- a/reactos/dll/win32/dbghelp/source.c +++ b/reactos/dll/win32/dbghelp/source.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include #include #include "dbghelp_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dbghelp/stabs.c b/reactos/dll/win32/dbghelp/stabs.c index 7c363365418..a6eff7eb9e5 100644 --- a/reactos/dll/win32/dbghelp/stabs.c +++ b/reactos/dll/win32/dbghelp/stabs.c @@ -29,38 +29,38 @@ * available (hopefully) from http://sources.redhat.com/gdb/onlinedocs */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #ifdef HAVE_SYS_STAT_H # include #endif #ifdef HAVE_SYS_MMAN_H #include #endif -#include -#include -#include +//#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif -#include +//#include #include -#include +//#include #ifdef HAVE_MACH_O_NLIST_H # include #endif -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #include "dbghelp_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); diff --git a/reactos/dll/win32/dbghelp/stack.c b/reactos/dll/win32/dbghelp/stack.c index 3e1ff725470..39df9feff1e 100644 --- a/reactos/dll/win32/dbghelp/stack.c +++ b/reactos/dll/win32/dbghelp/stack.c @@ -21,14 +21,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include -#include +#include +//#include +//#include +//#include +//#include #include "dbghelp_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/reactos/dll/win32/dciman32/dciman_main.c b/reactos/dll/win32/dciman32/dciman_main.c index fe559940e26..eb65c21fe5a 100644 --- a/reactos/dll/win32/dciman32/dciman_main.c +++ b/reactos/dll/win32/dciman32/dciman_main.c @@ -19,12 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS -#include "windows.h" -#include "dciman.h" -#include "wine/debug.h" +#include +//#include + +//#include + +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dciman); diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c index b5af0625e74..b4d483461e3 100644 --- a/reactos/dll/win32/devmgr/advprop.c +++ b/reactos/dll/win32/devmgr/advprop.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/devmgr.rc b/reactos/dll/win32/devmgr/devmgr.rc index 854848621b8..f26b3a879be 100644 --- a/reactos/dll/win32/devmgr/devmgr.rc +++ b/reactos/dll/win32/devmgr/devmgr.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/devmgr/devprblm.c b/reactos/dll/win32/devmgr/devprblm.c index bdc73d15443..ac432499128 100644 --- a/reactos/dll/win32/devmgr/devprblm.c +++ b/reactos/dll/win32/devmgr/devprblm.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c index 57b52d22e0f..794725f4e5e 100644 --- a/reactos/dll/win32/devmgr/hwpage.c +++ b/reactos/dll/win32/devmgr/hwpage.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/misc.c b/reactos/dll/win32/devmgr/misc.c index 9723fb782de..a4a70c534ff 100644 --- a/reactos/dll/win32/devmgr/misc.c +++ b/reactos/dll/win32/devmgr/misc.c @@ -25,7 +25,7 @@ * UPDATE HISTORY: * 2005/11/24 Created */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/devmgr/precomp.h b/reactos/dll/win32/devmgr/precomp.h index 1094d57eea8..6bffcfd0b89 100644 --- a/reactos/dll/win32/devmgr/precomp.h +++ b/reactos/dll/win32/devmgr/precomp.h @@ -1,13 +1,15 @@ #ifndef __DEVMGR_H #define __DEVMGR_H +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #include +#include #include #include #include -#include -#include #include + #include "resource.h" extern HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/devmgr/stubs.c b/reactos/dll/win32/devmgr/stubs.c index 982c0fc8d1d..f70acbd2549 100644 --- a/reactos/dll/win32/devmgr/stubs.c +++ b/reactos/dll/win32/devmgr/stubs.c @@ -15,7 +15,7 @@ * UPDATE HISTORY: * 04-04-2004 Created */ -#include +#include #define NDEBUG #include diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c b/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c index 2888db16a87..5b58ed76465 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c @@ -1,4 +1,4 @@ -#include "rosdhcp.h" +#include SOCKET DhcpSocket = INVALID_SOCKET; static LIST_ENTRY AdapterList; diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c b/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c index afcd6469b98..47989a34118 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c @@ -40,7 +40,7 @@ * Enterprises, see ``http://www.vix.com''. */ -#include "rosdhcp.h" +#include struct string_list * new_string_list(size_t size) diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/api.c b/reactos/dll/win32/dhcpcsvc/dhcp/api.c index 2a9ba0fd5e3..7e8a2b9f4cc 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/api.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/api.c @@ -7,7 +7,7 @@ * PROGRAMMER: arty */ -#include "rosdhcp.h" +#include #define NDEBUG #include diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/compat.c b/reactos/dll/win32/dhcpcsvc/dhcp/compat.c index 20db25cc13f..31aec07fab6 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/compat.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/compat.c @@ -1,4 +1,4 @@ -#include "rosdhcp.h" +#include size_t strlcpy(char *d, const char *s, size_t bufsize) { diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c index b8a49f4ccdd..c1e3f560524 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c @@ -53,7 +53,7 @@ * purpose. */ -#include "rosdhcp.h" +#include #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c b/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c index 0215a0e70c4..d9ef98271ad 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c @@ -39,7 +39,7 @@ * Enterprises, see ``http://www.vix.com''. */ -#include "rosdhcp.h" +#include //#include diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/hash.c b/reactos/dll/win32/dhcpcsvc/dhcp/hash.c index 84c8c6a7ade..6bfa8c3d92e 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/hash.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/hash.c @@ -46,7 +46,7 @@ static char copyright[] = "$Id: hash.c,v 1.9.2.3 1999/04/09 17:39:41 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ -#include "rosdhcp.h" +#include static __inline int do_hash PROTO ((unsigned char *, int, int)); diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/options.c b/reactos/dll/win32/dhcpcsvc/dhcp/options.c index 03cdd477e9a..d7572fbee7a 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/options.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/options.c @@ -41,7 +41,7 @@ */ #define DHCP_OPTION_DATA -#include "rosdhcp.h" +#include int bad_options = 0; int bad_options_max = 5; diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/socket.c b/reactos/dll/win32/dhcpcsvc/dhcp/socket.c index 849d04943b5..4b406f51cce 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/socket.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/socket.c @@ -1,4 +1,4 @@ -#include "rosdhcp.h" +#include SOCKET ServerSocket; diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/tables.c b/reactos/dll/win32/dhcpcsvc/dhcp/tables.c index 3de26b7cef6..d4a105b5bd6 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/tables.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/tables.c @@ -45,7 +45,7 @@ static char copyright[] = "$Id: tables.c,v 1.13.2.4 1999/04/24 16:46:44 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ -#include "rosdhcp.h" +#include /* DHCP Option names, formats and codes, from RFC1533. diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/tree.c b/reactos/dll/win32/dhcpcsvc/dhcp/tree.c index f721d08f897..8586e077aff 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/tree.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/tree.c @@ -45,7 +45,7 @@ static char copyright[] = "$Id: tree.c,v 1.10 1997/05/09 08:14:57 mellon Exp $ Copyright (c) 1995, 1996, 1997 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ -#include "rosdhcp.h" +#include static TIME tree_evaluate_recurse PROTO ((int *, unsigned char **, int *, struct tree *)); diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/util.c b/reactos/dll/win32/dhcpcsvc/dhcp/util.c index c9a1a3af1f6..7f1fba3375c 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcp/util.c +++ b/reactos/dll/win32/dhcpcsvc/dhcp/util.c @@ -1,4 +1,4 @@ -#include "rosdhcp.h" +#include #define NDEBUG #include diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc index dcff3bad44b..725c1aec2b0 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "DHCP Client Service\0" #define REACTOS_STR_INTERNAL_NAME "dhcpcsvc\0" diff --git a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h index 07d5bf13c07..3875dc21beb 100644 --- a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h +++ b/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h @@ -2,15 +2,22 @@ #define ROSDHCP_H #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include #define NTOS_MODE_USER #include -#include -#include +//#include +//#include #include #include -#include -#include +//#include +//#include #include "debug.h" #define IFNAMSIZ MAX_INTERFACE_NAME_LEN #undef interface /* wine/objbase.h -- Grrr */ diff --git a/reactos/dll/win32/dnsapi/dnsapi/precomp.h b/reactos/dll/win32/dnsapi/dnsapi/precomp.h index cf50fb6a353..591fec20b5c 100644 --- a/reactos/dll/win32/dnsapi/dnsapi/precomp.h +++ b/reactos/dll/win32/dnsapi/dnsapi/precomp.h @@ -9,11 +9,12 @@ /* INCLUDES ******************************************************************/ #define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #define NTOS_MODE_USER /* PSDK/NDK Headers */ #include -#include +//#include #include #include diff --git a/reactos/dll/win32/dnsapi/include/internal/windns.h b/reactos/dll/win32/dnsapi/include/internal/windns.h index 569017f8739..6e28bdc3e12 100644 --- a/reactos/dll/win32/dnsapi/include/internal/windns.h +++ b/reactos/dll/win32/dnsapi/include/internal/windns.h @@ -1,7 +1,7 @@ #ifndef WINDNS_INTERNAL_H #define WINDNS_INTERNAL_H -#include "adns.h" +#include typedef struct { diff --git a/reactos/dll/win32/dwmapi/dwmapi_main.c b/reactos/dll/win32/dwmapi/dwmapi_main.c index 39a99188a06..0ab69f143e1 100644 --- a/reactos/dll/win32/dwmapi/dwmapi_main.c +++ b/reactos/dll/win32/dwmapi/dwmapi_main.c @@ -19,18 +19,22 @@ * */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "dwmapi.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h index 17b4a023435..426380830fe 100644 --- a/reactos/dll/win32/fmifs/precomp.h +++ b/reactos/dll/win32/fmifs/precomp.h @@ -18,7 +18,9 @@ #include /* PSDK/NDK Headers */ -#include +#include +#include +#include #include #include #include @@ -27,7 +29,7 @@ #include /* VFATLIB Public Header */ -#include +//#include extern LIST_ENTRY ProviderListHead; diff --git a/reactos/dll/win32/fusion/asmcache.c b/reactos/dll/win32/fusion/asmcache.c index e6a2a653deb..df89800dc41 100644 --- a/reactos/dll/win32/fusion/asmcache.c +++ b/reactos/dll/win32/fusion/asmcache.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" -#include "wincrypt.h" -#include "winreg.h" -#include "shlwapi.h" -#include "dbghelp.h" -#include "ole2.h" -#include "fusion.h" -#include "corerror.h" +#include +#include +//#include "winuser.h" +//#include "winver.h" +//#include "wincrypt.h" +#include +#include +//#include "dbghelp.h" +//#include "ole2.h" +#include +#include #include "fusionpriv.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(fusion); diff --git a/reactos/dll/win32/fusion/asmenum.c b/reactos/dll/win32/fusion/asmenum.c index 52229a8697f..89e11057ffd 100644 --- a/reactos/dll/win32/fusion/asmenum.c +++ b/reactos/dll/win32/fusion/asmenum.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "guiddef.h" -#include "fusion.h" -#include "corerror.h" +#include +#include +//#include "winuser.h" +#include +//#include "guiddef.h" +#include +//#include "corerror.h" #include "fusionpriv.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(fusion); diff --git a/reactos/dll/win32/fusion/asmname.c b/reactos/dll/win32/fusion/asmname.c index 4957ae84770..f41933ea35a 100644 --- a/reactos/dll/win32/fusion/asmname.c +++ b/reactos/dll/win32/fusion/asmname.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define COBJMACROS #define INITGUID -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "guiddef.h" -#include "fusion.h" -#include "corerror.h" +#include +#include +//#include "winuser.h" +#include +//#include "guiddef.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "fusionpriv.h" WINE_DEFAULT_DEBUG_CHANNEL(fusion); diff --git a/reactos/dll/win32/fusion/assembly.c b/reactos/dll/win32/fusion/assembly.c index a3abc4e98d8..c9ec1764815 100644 --- a/reactos/dll/win32/fusion/assembly.c +++ b/reactos/dll/win32/fusion/assembly.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" -#include "wincrypt.h" -#include "dbghelp.h" -#include "ole2.h" -#include "fusion.h" -#include "corhdr.h" +#include +//#include + +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include +#include #include "fusionpriv.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #define TableFromToken(tk) (TypeFromToken(tk) >> 24) #define TokenFromTable(idx) (idx << 24) diff --git a/reactos/dll/win32/fusion/fusion.c b/reactos/dll/win32/fusion/fusion.c index ad772330487..1543ed73fad 100644 --- a/reactos/dll/win32/fusion/fusion.c +++ b/reactos/dll/win32/fusion/fusion.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "fusion.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(fusion); diff --git a/reactos/dll/win32/fusion/fusion_main.c b/reactos/dll/win32/fusion/fusion_main.c index 5c9d77646e0..8af1fc86d21 100644 --- a/reactos/dll/win32/fusion/fusion_main.c +++ b/reactos/dll/win32/fusion/fusion_main.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(fusion); diff --git a/reactos/dll/win32/fusion/fusionpriv.h b/reactos/dll/win32/fusion/fusionpriv.h index 8d51f5d0404..374b14abb8b 100644 --- a/reactos/dll/win32/fusion/fusionpriv.h +++ b/reactos/dll/win32/fusion/fusionpriv.h @@ -21,12 +21,12 @@ #ifndef __WINE_FUSION_PRIVATE__ #define __WINE_FUSION_PRIVATE__ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +#include #include diff --git a/reactos/dll/win32/gdiplus/brush.c b/reactos/dll/win32/gdiplus/brush.c index 2ada393f5df..8fff98ff304 100644 --- a/reactos/dll/win32/gdiplus/brush.c +++ b/reactos/dll/win32/gdiplus/brush.c @@ -16,21 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" #define COBJMACROS -#include "objbase.h" -#include "olectl.h" -#include "ole2.h" +//#include "objbase.h" +//#include "olectl.h" +//#include "ole2.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/customlinecap.c b/reactos/dll/win32/gdiplus/customlinecap.c index 00c228bf3cf..2fb3f020d65 100644 --- a/reactos/dll/win32/gdiplus/customlinecap.c +++ b/reactos/dll/win32/gdiplus/customlinecap.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/font.c b/reactos/dll/win32/gdiplus/font.c index 6e313314017..51d4e41e58a 100644 --- a/reactos/dll/win32/gdiplus/font.c +++ b/reactos/dll/win32/gdiplus/font.c @@ -17,25 +17,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winnls.h" +//#include "winreg.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" /* PANOSE is 10 bytes in size, need to pack the structure properly */ -#include "pshpack2.h" +#include typedef struct { USHORT version; @@ -100,7 +100,7 @@ typedef struct SHORT metricDataFormat; USHORT numberOfHMetrics; } TT_HHEA; -#include "poppack.h" +#include #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) diff --git a/reactos/dll/win32/gdiplus/gdiplus.c b/reactos/dll/win32/gdiplus/gdiplus.c index 1c016be27f7..1eebacb4e81 100644 --- a/reactos/dll/win32/gdiplus/gdiplus.c +++ b/reactos/dll/win32/gdiplus/gdiplus.c @@ -16,21 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winreg.h" +//#include "shlwapi.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/gdiplus_private.h b/reactos/dll/win32/gdiplus/gdiplus_private.h index cb7330ef88a..37e4dfb1ca7 100644 --- a/reactos/dll/win32/gdiplus/gdiplus_private.h +++ b/reactos/dll/win32/gdiplus/gdiplus_private.h @@ -19,20 +19,24 @@ #ifndef __WINE_GP_PRIVATE_H_ #define __WINE_GP_PRIVATE_H_ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include -#include "windef.h" -#include "wingdi.h" -#include "winbase.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" -#include "objbase.h" -#include "ocidl.h" -#include "wincodecsdk.h" -#include "wine/list.h" +#include +//#include "ocidl.h" +#include +#include -#include "gdiplus.h" +#include #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) diff --git a/reactos/dll/win32/gdiplus/graphics.c b/reactos/dll/win32/gdiplus/graphics.c index e9b21eb12e9..fe4285180bd 100644 --- a/reactos/dll/win32/gdiplus/graphics.c +++ b/reactos/dll/win32/gdiplus/graphics.c @@ -16,29 +16,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" +#include #define COBJMACROS -#include "objbase.h" -#include "ocidl.h" -#include "olectl.h" -#include "ole2.h" +//#include "objbase.h" +//#include "ocidl.h" +//#include "olectl.h" +//#include "ole2.h" -#include "winreg.h" -#include "shlwapi.h" +#include -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +#include +//#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/graphicspath.c b/reactos/dll/win32/gdiplus/graphicspath.c index 1fbebba6d4c..bd2f8ca162c 100644 --- a/reactos/dll/win32/gdiplus/graphicspath.c +++ b/reactos/dll/win32/gdiplus/graphicspath.c @@ -17,19 +17,19 @@ * */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/image.c b/reactos/dll/win32/gdiplus/image.c index 9d886295b8b..c3a46afe510 100644 --- a/reactos/dll/win32/gdiplus/image.c +++ b/reactos/dll/win32/gdiplus/image.c @@ -17,26 +17,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" #define COBJMACROS -#include "objbase.h" -#include "olectl.h" -#include "ole2.h" +//#include "objbase.h" +#include +//#include "ole2.h" -#include "initguid.h" -#include "wincodec.h" -#include "gdiplus.h" +#include +//#include "wincodec.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/imageattributes.c b/reactos/dll/win32/gdiplus/imageattributes.c index bd5c0826cec..55841d69690 100644 --- a/reactos/dll/win32/gdiplus/imageattributes.c +++ b/reactos/dll/win32/gdiplus/imageattributes.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "wingdi.h" +//#include "windef.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/matrix.c b/reactos/dll/win32/gdiplus/matrix.c index fe03e65c0eb..56c8c9b9562 100644 --- a/reactos/dll/win32/gdiplus/matrix.c +++ b/reactos/dll/win32/gdiplus/matrix.c @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/metafile.c b/reactos/dll/win32/gdiplus/metafile.c index 4345ece9b90..88afcfe7387 100644 --- a/reactos/dll/win32/gdiplus/metafile.c +++ b/reactos/dll/win32/gdiplus/metafile.c @@ -16,27 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "wine/unicode.h" #define COBJMACROS -#include "objbase.h" -#include "ocidl.h" -#include "olectl.h" -#include "ole2.h" +//#include "objbase.h" +//#include "ocidl.h" +//#include "olectl.h" +//#include "ole2.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winreg.h" +//#include "shlwapi.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +//#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/pathiterator.c b/reactos/dll/win32/gdiplus/pathiterator.c index d0a4ed19c7f..b3ab403d771 100644 --- a/reactos/dll/win32/gdiplus/pathiterator.c +++ b/reactos/dll/win32/gdiplus/pathiterator.c @@ -17,17 +17,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/pen.c b/reactos/dll/win32/gdiplus/pen.c index a022cfb64e0..1525983742f 100644 --- a/reactos/dll/win32/gdiplus/pen.c +++ b/reactos/dll/win32/gdiplus/pen.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/region.c b/reactos/dll/win32/gdiplus/region.c index f62b59941a1..3fb306506a6 100644 --- a/reactos/dll/win32/gdiplus/region.c +++ b/reactos/dll/win32/gdiplus/region.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/gdiplus/stringformat.c b/reactos/dll/win32/gdiplus/stringformat.c index 7d6bcb0e3fb..9c1b558b72c 100644 --- a/reactos/dll/win32/gdiplus/stringformat.c +++ b/reactos/dll/win32/gdiplus/stringformat.c @@ -17,18 +17,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winnls.h" -#include "objbase.h" +//#include "objbase.h" -#include "gdiplus.h" +//#include "gdiplus.h" #include "gdiplus_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); diff --git a/reactos/dll/win32/getuname/getuname.c b/reactos/dll/win32/getuname/getuname.c index 6a16af1f5c9..2e39ef97ec3 100644 --- a/reactos/dll/win32/getuname/getuname.c +++ b/reactos/dll/win32/getuname/getuname.c @@ -5,7 +5,7 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */ -#include +#include int WINAPI diff --git a/reactos/dll/win32/getuname/getuname.rc b/reactos/dll/win32/getuname/getuname.rc index 98d30174e98..e033ccc792d 100644 --- a/reactos/dll/win32/getuname/getuname.rc +++ b/reactos/dll/win32/getuname/getuname.rc @@ -1,4 +1,4 @@ -#include +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Unicode name DLL\0" diff --git a/reactos/dll/win32/hhctrl.ocx/chm.c b/reactos/dll/win32/hhctrl.ocx/chm.c index f0452fab67a..1d1838c4993 100644 --- a/reactos/dll/win32/hhctrl.ocx/chm.c +++ b/reactos/dll/win32/hhctrl.ocx/chm.c @@ -21,9 +21,9 @@ #include "hhctrl.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/content.c b/reactos/dll/win32/hhctrl.ocx/content.c index bfe25cf9453..5a042c8cea3 100644 --- a/reactos/dll/win32/hhctrl.ocx/content.c +++ b/reactos/dll/win32/hhctrl.ocx/content.c @@ -22,7 +22,7 @@ #include "hhctrl.h" #include "stream.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/help.c b/reactos/dll/win32/hhctrl.ocx/help.c index 2ea01321043..8f8f545a483 100644 --- a/reactos/dll/win32/hhctrl.ocx/help.c +++ b/reactos/dll/win32/hhctrl.ocx/help.c @@ -21,9 +21,9 @@ #include "hhctrl.h" -#include "wingdi.h" -#include "commctrl.h" -#include "wininet.h" +//#include "wingdi.h" +//#include "commctrl.h" +#include #include "wine/debug.h" diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.c b/reactos/dll/win32/hhctrl.ocx/hhctrl.c index 9ab66de4344..5aa5e720760 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.c +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #define INIT_GUID #include "hhctrl.h" diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.h b/reactos/dll/win32/hhctrl.ocx/hhctrl.h index 91d3a775ace..4027ab59190 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h @@ -20,26 +20,30 @@ #ifndef HHCTRL_H #define HHCTRL_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "htmlhelp.h" -#include "ole2.h" -#include "exdisp.h" -#include "mshtmhst.h" -#include "commctrl.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef INIT_GUID -#include "initguid.h" +#include #endif -#include "wine/itss.h" -#include "wine/unicode.h" +#include +#include #define WB_GOBACK 0 #define WB_GOFORWARD 1 diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc index 1522ec8e1b1..4c7ab5b75ab 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "htmlhelp.h" -#include "resource.h" +#define WIN32_NO_STATUS +#include +//#include "winbase.h" +//#include "wingdi.h" +//#include "winnls.h" +//#include "htmlhelp.h" +//#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/hhctrl.ocx/index.c b/reactos/dll/win32/hhctrl.ocx/index.c index e9385c35429..b0496c17201 100644 --- a/reactos/dll/win32/hhctrl.ocx/index.c +++ b/reactos/dll/win32/hhctrl.ocx/index.c @@ -23,7 +23,7 @@ #include "hhctrl.h" #include "stream.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/regsvr.c b/reactos/dll/win32/hhctrl.ocx/regsvr.c index d2fb310cd1b..2922ad588e7 100644 --- a/reactos/dll/win32/hhctrl.ocx/regsvr.c +++ b/reactos/dll/win32/hhctrl.ocx/regsvr.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +//#include "wingdi.h" +#include +//#include "winerror.h" -#include "ole2.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/resource.h b/reactos/dll/win32/hhctrl.ocx/resource.h index a08fdd96eb8..17521f98ae1 100644 --- a/reactos/dll/win32/hhctrl.ocx/resource.h +++ b/reactos/dll/win32/hhctrl.ocx/resource.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include #include #include diff --git a/reactos/dll/win32/hhctrl.ocx/search.c b/reactos/dll/win32/hhctrl.ocx/search.c index f81e46cbf79..29e03c9cc97 100644 --- a/reactos/dll/win32/hhctrl.ocx/search.c +++ b/reactos/dll/win32/hhctrl.ocx/search.c @@ -22,7 +22,7 @@ #include "hhctrl.h" #include "stream.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/stream.c b/reactos/dll/win32/hhctrl.ocx/stream.c index 317eeebabcf..7b06b3a1dc6 100644 --- a/reactos/dll/win32/hhctrl.ocx/stream.c +++ b/reactos/dll/win32/hhctrl.ocx/stream.c @@ -19,7 +19,7 @@ #include "hhctrl.h" #include "stream.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hhctrl.ocx/webbrowser.c b/reactos/dll/win32/hhctrl.ocx/webbrowser.c index 5033197c0a8..abf86a280e4 100644 --- a/reactos/dll/win32/hhctrl.ocx/webbrowser.c +++ b/reactos/dll/win32/hhctrl.ocx/webbrowser.c @@ -20,7 +20,7 @@ #include "hhctrl.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/reactos/dll/win32/hid/hid.c b/reactos/dll/win32/hid/hid.c index bf5bb5fe173..bd693d7e000 100644 --- a/reactos/dll/win32/hid/hid.c +++ b/reactos/dll/win32/hid/hid.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 07/12/2004 Created */ -#include +#include "precomp.h" HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/hid/precomp.h b/reactos/dll/win32/hid/precomp.h index 7f544a3b707..770d39df1fb 100644 --- a/reactos/dll/win32/hid/precomp.h +++ b/reactos/dll/win32/hid/precomp.h @@ -1,5 +1,7 @@ +#include #define WIN32_NO_STATUS -#include +#include +#include #include #define NTOS_MODE_USER #include @@ -13,9 +15,9 @@ typedef VOID (WINAPI *PINTERFACE_DEREFERENCE)( PVOID Context); -#include +//#include #include -#include +//#include extern HINSTANCE hDllInstance; extern const GUID HidClassGuid; diff --git a/reactos/dll/win32/hid/stubs.c b/reactos/dll/win32/hid/stubs.c index 1e37efaa166..abd58df21cf 100644 --- a/reactos/dll/win32/hid/stubs.c +++ b/reactos/dll/win32/hid/stubs.c @@ -9,7 +9,7 @@ * UPDATE HISTORY: * 07/12/2004 Created */ -#include +#include "precomp.h" /* * @unimplemented diff --git a/reactos/dll/win32/hlink/browse_ctx.c b/reactos/dll/win32/hlink/browse_ctx.c index 4e91398f498..3774fa5288e 100644 --- a/reactos/dll/win32/hlink/browse_ctx.c +++ b/reactos/dll/win32/hlink/browse_ctx.c @@ -20,7 +20,7 @@ #include "hlink_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/reactos/dll/win32/hlink/extserv.c b/reactos/dll/win32/hlink/extserv.c index 670bac233fc..0f96fb48539 100644 --- a/reactos/dll/win32/hlink/extserv.c +++ b/reactos/dll/win32/hlink/extserv.c @@ -18,8 +18,8 @@ #include "hlink_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/reactos/dll/win32/hlink/hlink_main.c b/reactos/dll/win32/hlink/hlink_main.c index 9823a5d9320..29f38aafde3 100644 --- a/reactos/dll/win32/hlink/hlink_main.c +++ b/reactos/dll/win32/hlink/hlink_main.c @@ -20,11 +20,11 @@ #include "hlink_private.h" -#include "winreg.h" -#include "rpcproxy.h" -#include "hlguids.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/reactos/dll/win32/hlink/hlink_private.h b/reactos/dll/win32/hlink/hlink_private.h index e0ff09eaa78..987fd150d4e 100644 --- a/reactos/dll/win32/hlink/hlink_private.h +++ b/reactos/dll/win32/hlink/hlink_private.h @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "hlink.h" +//#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/unicode.h" +#include extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/reactos/dll/win32/hlink/link.c b/reactos/dll/win32/hlink/link.c index 2ea4e2ca50a..ecdccce4fff 100644 --- a/reactos/dll/win32/hlink/link.c +++ b/reactos/dll/win32/hlink/link.c @@ -20,10 +20,10 @@ #include "hlink_private.h" -#include "shellapi.h" -#include "hlguids.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/reactos/dll/win32/hnetcfg/apps.c b/reactos/dll/win32/hnetcfg/apps.c index 90a18079019..45a69532eb7 100644 --- a/reactos/dll/win32/hnetcfg/apps.c +++ b/reactos/dll/win32/hnetcfg/apps.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/hnetcfg.c b/reactos/dll/win32/hnetcfg/hnetcfg.c index fe65a78a3f7..09a484d75f3 100644 --- a/reactos/dll/win32/hnetcfg/hnetcfg.c +++ b/reactos/dll/win32/hnetcfg/hnetcfg.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "netfw.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/manager.c b/reactos/dll/win32/hnetcfg/manager.c index 6192c2dd687..4495f647790 100644 --- a/reactos/dll/win32/hnetcfg/manager.c +++ b/reactos/dll/win32/hnetcfg/manager.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "initguid.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +//#include "initguid.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/policy.c b/reactos/dll/win32/hnetcfg/policy.c index dd5a1fecc12..32eccf9aa5c 100644 --- a/reactos/dll/win32/hnetcfg/policy.c +++ b/reactos/dll/win32/hnetcfg/policy.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/port.c b/reactos/dll/win32/hnetcfg/port.c index b81456f6a93..d52aecc7e25 100644 --- a/reactos/dll/win32/hnetcfg/port.c +++ b/reactos/dll/win32/hnetcfg/port.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/profile.c b/reactos/dll/win32/hnetcfg/profile.c index f1d724d74b1..163ad2387cb 100644 --- a/reactos/dll/win32/hnetcfg/profile.c +++ b/reactos/dll/win32/hnetcfg/profile.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/hnetcfg/service.c b/reactos/dll/win32/hnetcfg/service.c index fa214b67601..344a70e596e 100644 --- a/reactos/dll/win32/hnetcfg/service.c +++ b/reactos/dll/win32/hnetcfg/service.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "netfw.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/reactos/dll/win32/httpapi/httpapi_main.c b/reactos/dll/win32/httpapi/httpapi_main.c index 3375cb6fdc4..1d7a2027cc4 100644 --- a/reactos/dll/win32/httpapi/httpapi_main.c +++ b/reactos/dll/win32/httpapi/httpapi_main.c @@ -18,14 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include "windef.h" -#include "winbase.h" -#include "http.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(httpapi); diff --git a/reactos/dll/win32/iccvid/iccvid.c b/reactos/dll/win32/iccvid/iccvid.c index 1a1b33e2ae9..bdca8123159 100644 --- a/reactos/dll/win32/iccvid/iccvid.c +++ b/reactos/dll/win32/iccvid/iccvid.c @@ -40,17 +40,21 @@ * Tim Ferguson: http://www.csse.monash.edu.au/~timf/ * ------------------------------------------------------------------------ */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "vfw.h" -#include "mmsystem.h" +#include +#include +#include +//#include "winuser.h" +//#include "commdlg.h" +#include +//#include "mmsystem.h" #include "iccvid_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(iccvid); diff --git a/reactos/dll/win32/iccvid/iccvid_private.h b/reactos/dll/win32/iccvid/iccvid_private.h index 56b082d844d..40319c23769 100644 --- a/reactos/dll/win32/iccvid/iccvid_private.h +++ b/reactos/dll/win32/iccvid/iccvid_private.h @@ -19,7 +19,7 @@ #ifndef __ICCVID_PRIVATE_H #define __ICCVID_PRIVATE_H -#include +//#include #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/reactos/dll/win32/iccvid/rsrc.rc b/reactos/dll/win32/iccvid/rsrc.rc index 1d023bef1ea..888231fc0aa 100644 --- a/reactos/dll/win32/iccvid/rsrc.rc +++ b/reactos/dll/win32/iccvid/rsrc.rc @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "iccvid_private.h" +#include +//#include "iccvid_private.h" #ifdef LANGUAGE_DA_DK #include "iccvid_Da.rc" diff --git a/reactos/dll/win32/icmp/icmp_main.c b/reactos/dll/win32/icmp/icmp_main.c index afe0f3e576a..8257c1156b1 100644 --- a/reactos/dll/win32/icmp/icmp_main.c +++ b/reactos/dll/win32/icmp/icmp_main.c @@ -33,7 +33,11 @@ * - Using the winsock functions has not been tested. */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #ifdef HAVE_SYS_SOCKET_H @@ -53,8 +57,8 @@ # include #endif #include -#include -#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif @@ -62,13 +66,13 @@ # include #endif -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "ipexport.h" -#include -#include "icmpapi.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +//#include +//#include "icmpapi.h" +#include /* Set up endiannes macros for the ip and ip_icmp BSD headers */ #ifndef BIG_ENDIAN diff --git a/reactos/dll/win32/imaadp32.acm/imaadp32.c b/reactos/dll/win32/imaadp32.acm/imaadp32.c index f7b6ab13040..4c001a427fe 100644 --- a/reactos/dll/win32/imaadp32.acm/imaadp32.c +++ b/reactos/dll/win32/imaadp32.acm/imaadp32.c @@ -19,19 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" -#include "wine/debug.h" +//#include +#include +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include +#include /* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */ diff --git a/reactos/dll/win32/imagehlp/access.c b/reactos/dll/win32/imagehlp/access.c index cf19e6c90cd..0084f71c73a 100644 --- a/reactos/dll/win32/imagehlp/access.c +++ b/reactos/dll/win32/imagehlp/access.c @@ -18,15 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winternl.h" -#include "winerror.h" -#include "wine/debug.h" -#include "imagehlp.h" +//#include +#include +#include +//#include "winnt.h" +#include +//#include "winerror.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); diff --git a/reactos/dll/win32/imagehlp/imagehlp_main.c b/reactos/dll/win32/imagehlp/imagehlp_main.c index 3ddae7aa5c4..c7b3326eeb4 100644 --- a/reactos/dll/win32/imagehlp/imagehlp_main.c +++ b/reactos/dll/win32/imagehlp/imagehlp_main.c @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "imagehlp.h" -#include "wine/debug.h" +#include +#include +//#include "imagehlp.h" +//#include /**********************************************************************/ DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; diff --git a/reactos/dll/win32/imagehlp/integrity.c b/reactos/dll/win32/imagehlp/integrity.c index d86ec11bd59..5c56847da05 100644 --- a/reactos/dll/win32/imagehlp/integrity.c +++ b/reactos/dll/win32/imagehlp/integrity.c @@ -22,15 +22,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winternl.h" -#include "winnt.h" -#include "imagehlp.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +//#include "winternl.h" +//#include "winnt.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); diff --git a/reactos/dll/win32/imagehlp/modify.c b/reactos/dll/win32/imagehlp/modify.c index debccc00f88..a6fa890ff84 100644 --- a/reactos/dll/win32/imagehlp/modify.c +++ b/reactos/dll/win32/imagehlp/modify.c @@ -18,14 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "winerror.h" -#include "wine/debug.h" -#include "imagehlp.h" +#include +#include +//#include "winternl.h" +//#include "winerror.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); diff --git a/reactos/dll/win32/imm32/imm.c b/reactos/dll/win32/imm32/imm.c index 73941016bb8..b787e6e01ca 100644 --- a/reactos/dll/win32/imm32/imm.c +++ b/reactos/dll/win32/imm32/imm.c @@ -19,20 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS + +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "wine/debug.h" -#include "imm.h" -#include "ddk/imm.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/list.h" +#include +#include +//#include "wingdi.h" +#include +//#include "winerror.h" +#include +//#include "imm.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/reactos/dll/win32/inetcomm/imaptransport.c b/reactos/dll/win32/inetcomm/imaptransport.c index 4cef0838d23..896117e5beb 100644 --- a/reactos/dll/win32/inetcomm/imaptransport.c +++ b/reactos/dll/win32/inetcomm/imaptransport.c @@ -18,18 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winuser.h" -#include "objbase.h" -#include "mimeole.h" -#include "wine/debug.h" +#include +#include +//#include "winnt.h" +//#include "winuser.h" +#include +#include +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetcomm/inetcomm_main.c b/reactos/dll/win32/inetcomm/inetcomm_main.c index 8f5eca6ecc1..c0b5fe0d515 100644 --- a/reactos/dll/win32/inetcomm/inetcomm_main.c +++ b/reactos/dll/win32/inetcomm/inetcomm_main.c @@ -18,23 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winuser.h" -#include "ole2.h" -#include "ocidl.h" -#include "rpcproxy.h" -#include "initguid.h" -#include "mimeole.h" +#include +#include +//#include "winnt.h" +//#include "winuser.h" +#include +//#include "ocidl.h" +#include +#include +#include #include "inetcomm_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); diff --git a/reactos/dll/win32/inetcomm/inetcomm_private.h b/reactos/dll/win32/inetcomm/inetcomm_private.h index 55aaf47dc25..499ffae9732 100644 --- a/reactos/dll/win32/inetcomm/inetcomm_private.h +++ b/reactos/dll/win32/inetcomm/inetcomm_private.h @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "winsock2.h" -#include "winuser.h" -#include "objbase.h" -#include "imnxport.h" +#include +//#include "winuser.h" +//#include "objbase.h" +#include typedef struct InternetTransport InternetTransport; diff --git a/reactos/dll/win32/inetcomm/internettransport.c b/reactos/dll/win32/inetcomm/internettransport.c index dcce0d9df17..c5e474a1943 100644 --- a/reactos/dll/win32/inetcomm/internettransport.c +++ b/reactos/dll/win32/inetcomm/internettransport.c @@ -18,18 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "ws2tcpip.h" -#include "windef.h" -#include "winnt.h" -#include "objbase.h" -#include "ole2.h" -#include "mimeole.h" +#include +#include +#include +#include +//#include "winnt.h" +#include +//#include "ole2.h" +#include #include -#include "wine/debug.h" +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetcomm/mimeintl.c b/reactos/dll/win32/inetcomm/mimeintl.c index 07d3ae5f038..5c2b7f0ed4e 100644 --- a/reactos/dll/win32/inetcomm/mimeintl.c +++ b/reactos/dll/win32/inetcomm/mimeintl.c @@ -18,24 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSUNION #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "objbase.h" -#include "ole2.h" -#include "mimeole.h" -#include "mlang.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "objbase.h" +#include +#include +#include -#include "wine/list.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c index 8a1e3d4d266..df889694079 100644 --- a/reactos/dll/win32/inetcomm/mimeole.c +++ b/reactos/dll/win32/inetcomm/mimeole.c @@ -19,21 +19,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSUNION #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "mimeole.h" +#include +#include +//#include "winuser.h" +//#include "objbase.h" +#include +#include -#include "wine/list.h" -#include "wine/debug.h" +#include +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetcomm/pop3transport.c b/reactos/dll/win32/inetcomm/pop3transport.c index af7d1bf91c5..68b5340b12a 100644 --- a/reactos/dll/win32/inetcomm/pop3transport.c +++ b/reactos/dll/win32/inetcomm/pop3transport.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSUNION -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winuser.h" -#include "objbase.h" -#include "mimeole.h" -#include "wine/debug.h" +#include +#include +//#include "winnt.h" +//#include "winuser.h" +#include +#include +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetcomm/smtptransport.c b/reactos/dll/win32/inetcomm/smtptransport.c index d17419f295b..42a6927b097 100644 --- a/reactos/dll/win32/inetcomm/smtptransport.c +++ b/reactos/dll/win32/inetcomm/smtptransport.c @@ -20,18 +20,22 @@ * */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winuser.h" -#include "objbase.h" -#include "mimeole.h" -#include "wine/debug.h" +#include +#include +//#include "winnt.h" +//#include "winuser.h" +#include +#include +#include #include "inetcomm_private.h" diff --git a/reactos/dll/win32/inetmib1/main.c b/reactos/dll/win32/inetmib1/main.c index 59d738959de..d56c2b37d7c 100644 --- a/reactos/dll/win32/inetmib1/main.c +++ b/reactos/dll/win32/inetmib1/main.c @@ -16,19 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include #include #include -#include +//#include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "snmp.h" -#include "iphlpapi.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(inetmib1); diff --git a/reactos/dll/win32/initpki/main.c b/reactos/dll/win32/initpki/main.c index caa00365649..ee757614481 100644 --- a/reactos/dll/win32/initpki/main.c +++ b/reactos/dll/win32/initpki/main.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(initpki); diff --git a/reactos/dll/win32/inseng/inseng_main.c b/reactos/dll/win32/inseng/inseng_main.c index 94e19101dff..7362d7480fb 100644 --- a/reactos/dll/win32/inseng/inseng_main.c +++ b/reactos/dll/win32/inseng/inseng_main.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "initguid.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "initguid.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(inseng); diff --git a/reactos/dll/win32/iologmsg/iologmsg.rc b/reactos/dll/win32/iologmsg/iologmsg.rc index f0084f0eabe..343586638d1 100644 --- a/reactos/dll/win32/iologmsg/iologmsg.rc +++ b/reactos/dll/win32/iologmsg/iologmsg.rc @@ -1,9 +1,7 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "I/O Log Message Dll\0" #define REACTOS_STR_INTERNAL_NAME "iologmsg\0" #define REACTOS_STR_ORIGINAL_FILENAME "iologmsg.dll\0" #include -#include "ntiologc.rc" +#include diff --git a/reactos/dll/win32/iphlpapi/ifenum.h b/reactos/dll/win32/iphlpapi/ifenum.h index f46369ee384..0f5d2212f9b 100644 --- a/reactos/dll/win32/iphlpapi/ifenum.h +++ b/reactos/dll/win32/iphlpapi/ifenum.h @@ -38,11 +38,11 @@ #ifndef WINE_IFENUM_H_ #define WINE_IFENUM_H_ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "iprtrmib.h" +//#include "windef.h" +//#include "winbase.h" +//#include "iprtrmib.h" #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_main.c b/reactos/dll/win32/iphlpapi/iphlpapi_main.c index d03bcee7471..d085d2a1f24 100644 --- a/reactos/dll/win32/iphlpapi/iphlpapi_main.c +++ b/reactos/dll/win32/iphlpapi/iphlpapi_main.c @@ -20,7 +20,7 @@ #define DEBUG -#include "config.h" +#include #include "iphlpapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_private.h b/reactos/dll/win32/iphlpapi/iphlpapi_private.h index b721c0eca55..ac83ff0ddf5 100644 --- a/reactos/dll/win32/iphlpapi/iphlpapi_private.h +++ b/reactos/dll/win32/iphlpapi/iphlpapi_private.h @@ -3,10 +3,9 @@ #define NtCurrentTeb NtXCurrentTeb -#include #include #include -#include +//#include #ifdef HAVE_NETINET_IN_H # include #endif @@ -21,32 +20,32 @@ #endif #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include #include -#include #define NTOS_MODE_USER #include #include #include -#include -#include -#include "iphlpapi.h" +#include #include "resinfo.h" -#include "wine/debug.h" +#include #include "dhcp.h" -#include "dhcpcsdk.h" -#include "dhcpcapi.h" -#include +#include +#include -//#include "ntddndis.h" -#include "tdiinfo.h" -#include "tcpioctl.h" +#include +#include -#include "tdilib.h" +#include #include "ifenum.h" - #include "ipstats.h" #include "route.h" diff --git a/reactos/dll/win32/iphlpapi/ipstats.h b/reactos/dll/win32/iphlpapi/ipstats.h index 2aa6b0e7222..428bafc3a22 100644 --- a/reactos/dll/win32/iphlpapi/ipstats.h +++ b/reactos/dll/win32/iphlpapi/ipstats.h @@ -22,11 +22,11 @@ #ifndef WINE_IPSTATS_H_ #define WINE_IPSTATS_H_ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "iprtrmib.h" +//#include "windef.h" +//#include "winbase.h" +//#include "iprtrmib.h" /* Fills in entry's interface stats, using name to find them. * Returns ERROR_INVALID_PARAMETER if name or entry is NULL, NO_ERROR otherwise. diff --git a/reactos/dll/win32/iphlpapi/resinfo_reactos.c b/reactos/dll/win32/iphlpapi/resinfo_reactos.c index d2f6fe3b385..0969214008a 100644 --- a/reactos/dll/win32/iphlpapi/resinfo_reactos.c +++ b/reactos/dll/win32/iphlpapi/resinfo_reactos.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" +#include #include "iphlpapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); diff --git a/reactos/dll/win32/iphlpapi/route_reactos.c b/reactos/dll/win32/iphlpapi/route_reactos.c index 453ddab43f7..350604477de 100644 --- a/reactos/dll/win32/iphlpapi/route_reactos.c +++ b/reactos/dll/win32/iphlpapi/route_reactos.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" +#include #include "iphlpapi_private.h" #define IP_FORWARD_ADD 3 diff --git a/reactos/dll/win32/itircl/itircl_main.c b/reactos/dll/win32/itircl/itircl_main.c index e2f1ed35035..65426590ed9 100644 --- a/reactos/dll/win32/itircl/itircl_main.c +++ b/reactos/dll/win32/itircl/itircl_main.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(itircl); diff --git a/reactos/dll/win32/itss/chm_lib.c b/reactos/dll/win32/itss/chm_lib.c index ada9be118a8..22ba6e8a6a8 100644 --- a/reactos/dll/win32/itss/chm_lib.c +++ b/reactos/dll/win32/itss/chm_lib.c @@ -54,17 +54,17 @@ * * ***************************************************************************/ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +#include #include "chm_lib.h" #include "lzx.h" diff --git a/reactos/dll/win32/itss/itss.c b/reactos/dll/win32/itss/itss.c index fc2eb37d31c..de76cdc2171 100644 --- a/reactos/dll/win32/itss/itss.c +++ b/reactos/dll/win32/itss/itss.c @@ -21,28 +21,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "advpub.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +#include +//#include "advpub.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include #include "itsstor.h" -#include "initguid.h" -#include "wine/itss.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(itss); diff --git a/reactos/dll/win32/itss/lzx.c b/reactos/dll/win32/itss/lzx.c index 01a94924115..969e3948b2a 100644 --- a/reactos/dll/win32/itss/lzx.c +++ b/reactos/dll/win32/itss/lzx.c @@ -37,12 +37,12 @@ #include "lzx.h" #include -#include -#include -#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" +#include +#include /* sized types */ typedef unsigned char UBYTE; /* 8 bits exactly */ diff --git a/reactos/dll/win32/itss/moniker.c b/reactos/dll/win32/itss/moniker.c index 02edd49d268..f45e9385df1 100644 --- a/reactos/dll/win32/itss/moniker.c +++ b/reactos/dll/win32/itss/moniker.c @@ -20,21 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/itss.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include #include "itsstor.h" diff --git a/reactos/dll/win32/itss/protocol.c b/reactos/dll/win32/itss/protocol.c index fa2ad8bd5af..dca3858c457 100644 --- a/reactos/dll/win32/itss/protocol.c +++ b/reactos/dll/win32/itss/protocol.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "urlmon.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include #include "itsstor.h" #include "chm_lib.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(itss); diff --git a/reactos/dll/win32/itss/storage.c b/reactos/dll/win32/itss/storage.c index c53b0c27a7c..be72428a4dd 100644 --- a/reactos/dll/win32/itss/storage.c +++ b/reactos/dll/win32/itss/storage.c @@ -20,24 +20,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "chm_lib.h" #include "itsstor.h" -#include "wine/itss.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(itss); diff --git a/reactos/dll/win32/jscript/activex.c b/reactos/dll/win32/jscript/activex.c index 947e4cfd289..8ca24b76e97 100644 --- a/reactos/dll/win32/jscript/activex.c +++ b/reactos/dll/win32/jscript/activex.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "jscript.h" -#include "objsafe.h" -#include "mshtmhst.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/array.c b/reactos/dll/win32/jscript/array.c index e366790f1df..cad795eed90 100644 --- a/reactos/dll/win32/jscript/array.c +++ b/reactos/dll/win32/jscript/array.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/bool.c b/reactos/dll/win32/jscript/bool.c index 4f23678a2e3..5d3aea23ec1 100644 --- a/reactos/dll/win32/jscript/bool.c +++ b/reactos/dll/win32/jscript/bool.c @@ -19,7 +19,7 @@ #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/date.c b/reactos/dll/win32/jscript/date.c index 71d37519fd7..ebd5012ac8c 100644 --- a/reactos/dll/win32/jscript/date.c +++ b/reactos/dll/win32/jscript/date.c @@ -17,15 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include +//#include +//#include #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/dispex.c b/reactos/dll/win32/jscript/dispex.c index 07880bcff5b..60b5c141cf7 100644 --- a/reactos/dll/win32/jscript/dispex.c +++ b/reactos/dll/win32/jscript/dispex.c @@ -18,8 +18,8 @@ #include "jscript.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/engine.c b/reactos/dll/win32/jscript/engine.c index b40a88eb591..10581ec7c4b 100644 --- a/reactos/dll/win32/jscript/engine.c +++ b/reactos/dll/win32/jscript/engine.c @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include "jscript.h" #include "engine.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/error.c b/reactos/dll/win32/jscript/error.c index e3cfce634ee..8b7a90df68f 100644 --- a/reactos/dll/win32/jscript/error.c +++ b/reactos/dll/win32/jscript/error.c @@ -15,14 +15,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/function.c b/reactos/dll/win32/jscript/function.c index df46f1d996d..07887331263 100644 --- a/reactos/dll/win32/jscript/function.c +++ b/reactos/dll/win32/jscript/function.c @@ -19,7 +19,7 @@ #include "jscript.h" #include "engine.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/global.c b/reactos/dll/win32/jscript/global.c index 92a0cbecd61..50d6c412a16 100644 --- a/reactos/dll/win32/jscript/global.c +++ b/reactos/dll/win32/jscript/global.c @@ -16,16 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include +//#include +//#include #include "jscript.h" #include "engine.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/jscript.c b/reactos/dll/win32/jscript/jscript.c index c7c77e3aa39..e5427e02bff 100644 --- a/reactos/dll/win32/jscript/jscript.c +++ b/reactos/dll/win32/jscript/jscript.c @@ -18,9 +18,9 @@ #include "jscript.h" #include "engine.h" -#include "objsafe.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/jscript.h b/reactos/dll/win32/jscript/jscript.h index 901f25d8b08..d61db97e64b 100644 --- a/reactos/dll/win32/jscript/jscript.h +++ b/reactos/dll/win32/jscript/jscript.h @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "dispex.h" -#include "activscp.h" +#include +#include +#include +#include +#include +#include #include "resource.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include #define JSCRIPT_ERROR 0x800A0000 diff --git a/reactos/dll/win32/jscript/jscript_main.c b/reactos/dll/win32/jscript/jscript_main.c index 78f8f00e754..25556e54fec 100644 --- a/reactos/dll/win32/jscript/jscript_main.c +++ b/reactos/dll/win32/jscript/jscript_main.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" +#include #include "jscript.h" -#include "winreg.h" -#include "advpub.h" -#include "activaut.h" -#include "objsafe.h" -#include "mshtmhst.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/jsutils.c b/reactos/dll/win32/jscript/jsutils.c index 9e49cc7b8a3..c0987c48ec8 100644 --- a/reactos/dll/win32/jscript/jsutils.c +++ b/reactos/dll/win32/jscript/jsutils.c @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include "jscript.h" -#include "engine.h" +//#include "engine.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); WINE_DECLARE_DEBUG_CHANNEL(heap); diff --git a/reactos/dll/win32/jscript/lex.c b/reactos/dll/win32/jscript/lex.c index 2e79db9878a..80810b43585 100644 --- a/reactos/dll/win32/jscript/lex.c +++ b/reactos/dll/win32/jscript/lex.c @@ -17,17 +17,17 @@ */ #include -#include +//#include #include "jscript.h" -#include "activscp.h" -#include "objsafe.h" +//#include "activscp.h" +//#include "objsafe.h" #include "engine.h" #include "parser.tab.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/math.c b/reactos/dll/win32/jscript/math.c index 8de9df91bd6..106842636bc 100644 --- a/reactos/dll/win32/jscript/math.c +++ b/reactos/dll/win32/jscript/math.c @@ -17,16 +17,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include -#include +//#include +//#include #include "jscript.h" -#include "ntsecapi.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/number.c b/reactos/dll/win32/jscript/number.c index 00de9abba85..bbf9df1b8ef 100644 --- a/reactos/dll/win32/jscript/number.c +++ b/reactos/dll/win32/jscript/number.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +#include -#include +//#include #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/object.c b/reactos/dll/win32/jscript/object.c index 8dbae52053a..e039ee34437 100644 --- a/reactos/dll/win32/jscript/object.c +++ b/reactos/dll/win32/jscript/object.c @@ -18,7 +18,7 @@ #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/regexp.c b/reactos/dll/win32/jscript/regexp.c index fb541891a56..4d0544cdad0 100644 --- a/reactos/dll/win32/jscript/regexp.c +++ b/reactos/dll/win32/jscript/regexp.c @@ -36,7 +36,7 @@ #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/jscript/string.c b/reactos/dll/win32/jscript/string.c index 05b9eba26e1..ff999d985a8 100644 --- a/reactos/dll/win32/jscript/string.c +++ b/reactos/dll/win32/jscript/string.c @@ -18,7 +18,7 @@ #include "jscript.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(jscript); diff --git a/reactos/dll/win32/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h index d791465e56f..3023d00568e 100644 --- a/reactos/dll/win32/kernel32/k32.h +++ b/reactos/dll/win32/kernel32/k32.h @@ -13,7 +13,14 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include +#include +#include +#include +#include #include /* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */ @@ -39,15 +46,15 @@ #include /* C Headers */ -#include -#include -#include -#include +//#include +//#include +//#include +//#include /* DDK Driver Headers */ #include #include -#include +//#include /* Internal Kernel32 Header */ #include "include/kernel32.h" diff --git a/reactos/dll/win32/kernel32/kernel32.rc b/reactos/dll/win32/kernel32/kernel32.rc index 19373b64889..dc77120ebfe 100644 --- a/reactos/dll/win32/kernel32/kernel32.rc +++ b/reactos/dll/win32/kernel32/kernel32.rc @@ -4,8 +4,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "kernel32.dll\0" #include -#include "windows.h" -#include "errcodes.rc" +//#include "windows.h" +#include #include "winnls/locale_rc.rc" diff --git a/reactos/dll/win32/kernel32/winnls/locale_rc.rc b/reactos/dll/win32/kernel32/winnls/locale_rc.rc index 309caf1596e..007676bde4c 100644 --- a/reactos/dll/win32/kernel32/winnls/locale_rc.rc +++ b/reactos/dll/win32/kernel32/winnls/locale_rc.rc @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include +//#include "winbase.h" +#include #define LGRPID_RES_BASE 0x2000 diff --git a/reactos/dll/win32/loadperf/loadperf_main.c b/reactos/dll/win32/loadperf/loadperf_main.c index 35ce891cebc..2de6d04b674 100644 --- a/reactos/dll/win32/loadperf/loadperf_main.c +++ b/reactos/dll/win32/loadperf/loadperf_main.c @@ -18,17 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +#include -#include "loadperf.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(loadperf); diff --git a/reactos/dll/win32/loadperf/stubs.c b/reactos/dll/win32/loadperf/stubs.c index e319f10ecfc..03ec0f7d809 100644 --- a/reactos/dll/win32/loadperf/stubs.c +++ b/reactos/dll/win32/loadperf/stubs.c @@ -1,5 +1,4 @@ - -#include +#include #define NDEBUG #include @@ -82,4 +81,3 @@ UpdatePerfNameFilesW( UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } - diff --git a/reactos/dll/win32/localspl/localmon.c b/reactos/dll/win32/localspl/localmon.c index f4e1739d5cb..05ba58c0226 100644 --- a/reactos/dll/win32/localspl/localmon.c +++ b/reactos/dll/win32/localspl/localmon.c @@ -18,24 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" +#include +#include +#include +#include +#include -#include "winspool.h" -#include "ddk/winsplp.h" +#include +#include #include "localspl_private.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(localspl); diff --git a/reactos/dll/win32/localspl/localspl.rc b/reactos/dll/win32/localspl/localspl.rc index 76dee7f1d2f..096898a811e 100644 --- a/reactos/dll/win32/localspl/localspl.rc +++ b/reactos/dll/win32/localspl/localspl.rc @@ -19,10 +19,10 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winver.h" -#include "localspl_private.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winver.h" +//#include "localspl_private.h" #define WINE_FILENAME_STR "localspl.dll" #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component" @@ -34,7 +34,7 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include #ifdef LANGUAGE_DA_DK #include "spl_Da.rc" diff --git a/reactos/dll/win32/localspl/localspl_main.c b/reactos/dll/win32/localspl/localspl_main.c index d4a3c33ca01..a555f432d2c 100644 --- a/reactos/dll/win32/localspl/localspl_main.c +++ b/reactos/dll/win32/localspl/localspl_main.c @@ -18,15 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" +#include +#include -#include "wine/debug.h" +#include #include "localspl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); diff --git a/reactos/dll/win32/localspl/localspl_private.h b/reactos/dll/win32/localspl/localspl_private.h index 952c1f6652d..115c5cc7532 100644 --- a/reactos/dll/win32/localspl/localspl_private.h +++ b/reactos/dll/win32/localspl/localspl_private.h @@ -21,7 +21,7 @@ #ifndef __WINE_LOCALSPL_PRIVATE__ #define __WINE_LOCALSPL_PRIVATE__ -#include +//#include /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance; diff --git a/reactos/dll/win32/localspl/provider.c b/reactos/dll/win32/localspl/provider.c index 322418804c3..8e2038f5490 100644 --- a/reactos/dll/win32/localspl/provider.c +++ b/reactos/dll/win32/localspl/provider.c @@ -18,23 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winspool.h" -#include "winuser.h" -#include "ddk/winddiui.h" -#include "ddk/winsplp.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include #include "localspl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); diff --git a/reactos/dll/win32/localui/localui.c b/reactos/dll/win32/localui/localui.c index b9e4c4ee324..97c83d30061 100644 --- a/reactos/dll/win32/localui/localui.c +++ b/reactos/dll/win32/localui/localui.c @@ -18,21 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winuser.h" +#include +#include +#include +#include +#include -#include "winspool.h" -#include "ddk/winsplp.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "localui.h" WINE_DEFAULT_DEBUG_CHANNEL(localui); diff --git a/reactos/dll/win32/localui/localui.h b/reactos/dll/win32/localui/localui.h index 25424da568c..7b59a262104 100644 --- a/reactos/dll/win32/localui/localui.h +++ b/reactos/dll/win32/localui/localui.h @@ -21,8 +21,8 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__ -#include -#include +//#include +//#include /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 diff --git a/reactos/dll/win32/lpk/ros_lpk.h b/reactos/dll/win32/lpk/ros_lpk.h index 1c11e06e813..a2330f48daa 100644 --- a/reactos/dll/win32/lpk/ros_lpk.h +++ b/reactos/dll/win32/lpk/ros_lpk.h @@ -8,7 +8,9 @@ #define WIN32_NO_STATUS #define NTOS_MODE_USER -#include +#include +#include +#include #include /* FIXME USP10 api that does not have prototype in any include file */ diff --git a/reactos/dll/win32/lsasrv/lsasrv.h b/reactos/dll/win32/lsasrv/lsasrv.h index 4a4fa3cb8e7..d75a19106ad 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.h +++ b/reactos/dll/win32/lsasrv/lsasrv.h @@ -8,7 +8,12 @@ */ #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #define NTOS_MODE_USER #include #include @@ -20,13 +25,13 @@ #include #include -#include +//#include #include -#include +//#include -#include "lsass.h" -#include "lsa_s.h" +#include +#include #include diff --git a/reactos/dll/win32/lz32/version.rc b/reactos/dll/win32/lz32/version.rc index 5f35c4f8e31..6504322ccca 100644 --- a/reactos/dll/win32/lz32/version.rc +++ b/reactos/dll/win32/lz32/version.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/mapi32/imalloc.c b/reactos/dll/win32/mapi32/imalloc.c index 351c38b6bb0..15c3425eaac 100644 --- a/reactos/dll/win32/mapi32/imalloc.c +++ b/reactos/dll/win32/mapi32/imalloc.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "winerror.h" -#include "winternl.h" -#include "objbase.h" -#include "shlwapi.h" -#include "mapiutil.h" +#include +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "winternl.h" +//#include "objbase.h" +//#include "shlwapi.h" +#include #include "util.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/reactos/dll/win32/mapi32/mapi32_main.c b/reactos/dll/win32/mapi32/mapi32_main.c index 6c35563a448..324d53d3866 100644 --- a/reactos/dll/win32/mapi32/mapi32_main.c +++ b/reactos/dll/win32/mapi32/mapi32_main.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "initguid.h" -#include "mapix.h" -#include "mapiform.h" -#include "mapi.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +//#include "objbase.h" +#include +#include +//#include "mapiform.h" +//#include "mapi.h" +#include #include "util.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/reactos/dll/win32/mapi32/prop.c b/reactos/dll/win32/mapi32/prop.c index 5a7e8db0565..1611c377174 100644 --- a/reactos/dll/win32/mapi32/prop.c +++ b/reactos/dll/win32/mapi32/prop.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "winerror.h" -#include "winternl.h" -#include "objbase.h" -#include "shlwapi.h" -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "mapival.h" +//#include "winerror.h" +//#include "winternl.h" +//#include "objbase.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/reactos/dll/win32/mapi32/res.h b/reactos/dll/win32/mapi32/res.h index 658f8f609b0..023eea88b36 100644 --- a/reactos/dll/win32/mapi32/res.h +++ b/reactos/dll/win32/mapi32/res.h @@ -19,7 +19,7 @@ * */ -#include +//#include /* Strings */ #define IDS_NO_MAPI_CLIENT 1 diff --git a/reactos/dll/win32/mapi32/sendmail.c b/reactos/dll/win32/mapi32/sendmail.c index e1156498cd1..85bcde37984 100644 --- a/reactos/dll/win32/mapi32/sendmail.c +++ b/reactos/dll/win32/mapi32/sendmail.c @@ -19,28 +19,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include +//#include "wine/port.h" + +//#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "objbase.h" -#include "objidl.h" -#include "mapi.h" -#include "mapix.h" -#include "mapiutil.h" -#include "mapidefs.h" -#include "winreg.h" -#include "shellapi.h" -#include "shlwapi.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +//#include "objbase.h" +//#include "objidl.h" +//#include "mapi.h" +//#include "mapix.h" +#include +//#include "mapidefs.h" +//#include "winreg.h" +//#include "shellapi.h" +//#include "shlwapi.h" +#include #include "util.h" #include "res.h" diff --git a/reactos/dll/win32/mapi32/stubs.c b/reactos/dll/win32/mapi32/stubs.c index 57b0628897c..9c23025b418 100644 --- a/reactos/dll/win32/mapi32/stubs.c +++ b/reactos/dll/win32/mapi32/stubs.c @@ -1,4 +1,9 @@ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include #include diff --git a/reactos/dll/win32/mapi32/util.c b/reactos/dll/win32/mapi32/util.c index 90cfa6ecd67..949ce2d9b4a 100644 --- a/reactos/dll/win32/mapi32/util.c +++ b/reactos/dll/win32/mapi32/util.c @@ -19,25 +19,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "winerror.h" -#include "winternl.h" -#include "objbase.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "mapival.h" -#include "xcmc.h" -#include "msi.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +//#include "objbase.h" +#include +#include +#include +#include +#include +#include #include "util.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/reactos/dll/win32/mapi32/util.h b/reactos/dll/win32/mapi32/util.h index df03d6e5f9a..26680d7f05b 100644 --- a/reactos/dll/win32/mapi32/util.h +++ b/reactos/dll/win32/mapi32/util.h @@ -23,7 +23,7 @@ #define _MAPI_UTIL_H #include -#include +//#include extern void load_mapi_providers(void); extern void unload_mapi_providers(void); diff --git a/reactos/dll/win32/mciavi32/info.c b/reactos/dll/win32/mciavi32/info.c index 668464cded1..7923a68b2b6 100644 --- a/reactos/dll/win32/mciavi32/info.c +++ b/reactos/dll/win32/mciavi32/info.c @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "private_mciavi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/reactos/dll/win32/mciavi32/mciavi.c b/reactos/dll/win32/mciavi32/mciavi.c index c78ddc058be..fd51e8196d8 100644 --- a/reactos/dll/win32/mciavi32/mciavi.c +++ b/reactos/dll/win32/mciavi32/mciavi.c @@ -37,10 +37,10 @@ * audio is played... still should be stopped ASAP */ -#include +//#include #include "private_mciavi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/reactos/dll/win32/mciavi32/mciavi_res.rc b/reactos/dll/win32/mciavi32/mciavi_res.rc index e2e4caa805c..8290f14b581 100644 --- a/reactos/dll/win32/mciavi32/mciavi_res.rc +++ b/reactos/dll/win32/mciavi32/mciavi_res.rc @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "mmddk.h" -#include "digitalv.h" +//#include "windef.h" +//#include "winbase.h" +#include +#include #ifdef MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64 diff --git a/reactos/dll/win32/mciavi32/mmoutput.c b/reactos/dll/win32/mciavi32/mmoutput.c index 2cd33398ead..8c86441d364 100644 --- a/reactos/dll/win32/mciavi32/mmoutput.c +++ b/reactos/dll/win32/mciavi32/mmoutput.c @@ -20,7 +20,7 @@ */ #include "private_mciavi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/reactos/dll/win32/mciavi32/private_mciavi.h b/reactos/dll/win32/mciavi32/private_mciavi.h index 1ee0eb3432a..804702f1b51 100644 --- a/reactos/dll/win32/mciavi32/private_mciavi.h +++ b/reactos/dll/win32/mciavi32/private_mciavi.h @@ -21,16 +21,20 @@ #ifndef __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "digitalv.h" -#include "vfw.h" -#include "wownt32.h" -#include "mciavi.h" +#include +//#include "winbase.h" +#include +//#include "winuser.h" +#include +#include +#include +#include +#include struct MMIOPos { DWORD dwOffset; diff --git a/reactos/dll/win32/mciavi32/wnd.c b/reactos/dll/win32/mciavi32/wnd.c index c7dcf61d07c..3443ece0377 100644 --- a/reactos/dll/win32/mciavi32/wnd.c +++ b/reactos/dll/win32/mciavi32/wnd.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "private_mciavi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/reactos/dll/win32/mcicda/mcicda.c b/reactos/dll/win32/mcicda/mcicda.c index 1ea9a58f25d..00d7bb4a776 100644 --- a/reactos/dll/win32/mcicda/mcicda.c +++ b/reactos/dll/win32/mcicda/mcicda.c @@ -20,24 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +//#include #include -#include -#include +//#include +//#include #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wownt32.h" -#include "mmddk.h" -#include "winioctl.h" -#include "ntddcdrm.h" -#include "winternl.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "dsound.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +//#include "winbase.h" +//#include "wingdi.h" +#include +#include +#include +#include +#include +//#include "winternl.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mcicda); diff --git a/reactos/dll/win32/mciqtz32/mciavi_res.rc b/reactos/dll/win32/mciqtz32/mciavi_res.rc index e2e4caa805c..8290f14b581 100644 --- a/reactos/dll/win32/mciqtz32/mciavi_res.rc +++ b/reactos/dll/win32/mciqtz32/mciavi_res.rc @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "mmddk.h" -#include "digitalv.h" +//#include "windef.h" +//#include "winbase.h" +#include +#include #ifdef MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64 diff --git a/reactos/dll/win32/mciqtz32/mciqtz.c b/reactos/dll/win32/mciqtz32/mciqtz.c index b05e681099d..fec6b77b633 100644 --- a/reactos/dll/win32/mciqtz32/mciqtz.c +++ b/reactos/dll/win32/mciqtz32/mciqtz.c @@ -18,15 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mmddk.h" -#include "wine/debug.h" +#include +//#include "winbase.h" +//#include "winuser.h" +#include +#include #include "mciqtz_private.h" -#include "digitalv.h" -#include "wownt32.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); diff --git a/reactos/dll/win32/mciqtz32/mciqtz_private.h b/reactos/dll/win32/mciqtz32/mciqtz_private.h index 35adc42120c..9ed972fc53b 100644 --- a/reactos/dll/win32/mciqtz32/mciqtz_private.h +++ b/reactos/dll/win32/mciqtz32/mciqtz_private.h @@ -23,7 +23,7 @@ #define COBJMACROS -#include "dshow.h" +#include typedef struct { MCIDEVICEID wDevID; diff --git a/reactos/dll/win32/mciseq/mcimidi.c b/reactos/dll/win32/mciseq/mcimidi.c index 2783c079a86..4249f68f234 100644 --- a/reactos/dll/win32/mciseq/mcimidi.c +++ b/reactos/dll/win32/mciseq/mcimidi.c @@ -25,19 +25,21 @@ * + better implement non waiting command (without the MCI_WAIT flag). */ -#include -#include -#include -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wownt32.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include +#include +//#include +//#include + +#include +//#include "winbase.h" +//#include "wingdi.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mcimidi); diff --git a/reactos/dll/win32/mciwave/mciwave.c b/reactos/dll/win32/mciwave/mciwave.c index 4f24169f480..2c9e3b5ec55 100644 --- a/reactos/dll/win32/mciwave/mciwave.c +++ b/reactos/dll/win32/mciwave/mciwave.c @@ -21,18 +21,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "wownt32.h" -#include "digitalv.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "winbase.h" +//#include "wingdi.h" +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mciwave); diff --git a/reactos/dll/win32/mlang/mlang.c b/reactos/dll/win32/mlang/mlang.c index 2c6e6f748c7..eb677e038f5 100644 --- a/reactos/dll/win32/mlang/mlang.c +++ b/reactos/dll/win32/mlang/mlang.c @@ -21,28 +21,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "mlang.h" +#include +#include +#include +//#include "winuser.h" +#include +//#include "objbase.h" +#include +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mlang); -#include "initguid.h" +//#include "initguid.h" #define CP_UNICODE 1200 diff --git a/reactos/dll/win32/mmdrv/common.c b/reactos/dll/win32/mmdrv/common.c index bb32b8052a9..0ca7e501b50 100644 --- a/reactos/dll/win32/mmdrv/common.c +++ b/reactos/dll/win32/mmdrv/common.c @@ -9,7 +9,7 @@ * Jan 14, 2007: Created */ -#include +#include "mmdrv.h" /* Translates errors to MMRESULT codes. diff --git a/reactos/dll/win32/mmdrv/entry.c b/reactos/dll/win32/mmdrv/entry.c index 6edb1a270f8..6285652e9b1 100644 --- a/reactos/dll/win32/mmdrv/entry.c +++ b/reactos/dll/win32/mmdrv/entry.c @@ -9,7 +9,7 @@ * Jan 14, 2007: Created */ -#include +#include "mmdrv.h" /* diff --git a/reactos/dll/win32/mmdrv/kernel.c b/reactos/dll/win32/mmdrv/kernel.c index 07ae0be2556..7436e66a653 100644 --- a/reactos/dll/win32/mmdrv/kernel.c +++ b/reactos/dll/win32/mmdrv/kernel.c @@ -9,7 +9,7 @@ * Jan 14, 2007: Created */ -#include +#include "mmdrv.h" /* Devices that we provide access to follow a standard naming convention. diff --git a/reactos/dll/win32/mmdrv/mmddk.h b/reactos/dll/win32/mmdrv/mmddk.h index 5f0ac31081b..80317f4d7cb 100644 --- a/reactos/dll/win32/mmdrv/mmddk.h +++ b/reactos/dll/win32/mmdrv/mmddk.h @@ -27,7 +27,7 @@ #define __MMDDK_H #include -#include +//#include typedef VOID (TASKCALLBACK) (DWORD dwInst); diff --git a/reactos/dll/win32/mmdrv/mmdrv.h b/reactos/dll/win32/mmdrv/mmdrv.h index e35f845b072..7cf6aa60d8d 100644 --- a/reactos/dll/win32/mmdrv/mmdrv.h +++ b/reactos/dll/win32/mmdrv/mmdrv.h @@ -14,10 +14,13 @@ #ifndef MMDRV_H #define MMDRV_H -#include -#include +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN -#include +#include "mmioctl.h" +#include "mmddk.h" + +//#include #include /* Need to check these */ diff --git a/reactos/dll/win32/mmdrv/mme.c b/reactos/dll/win32/mmdrv/mme.c index 9d9960c16b2..23639ababcd 100644 --- a/reactos/dll/win32/mmdrv/mme.c +++ b/reactos/dll/win32/mmdrv/mme.c @@ -10,7 +10,7 @@ * Jan 14, 2007: Rewritten and tidied up */ -#include +#include "mmdrv.h" /* Sends a message to the client (application), such as WOM_DONE. This diff --git a/reactos/dll/win32/mmdrv/mmioctl.h b/reactos/dll/win32/mmdrv/mmioctl.h index 977b91540e4..4b7b93fa35c 100644 --- a/reactos/dll/win32/mmdrv/mmioctl.h +++ b/reactos/dll/win32/mmdrv/mmioctl.h @@ -12,10 +12,9 @@ #ifndef MMDRV_IOCTLS #define MMDRV_IOCTLS - #include -#include -#include +//#include +//#include #include diff --git a/reactos/dll/win32/mmdrv/session.c b/reactos/dll/win32/mmdrv/session.c index cc79771ce81..edb36d117e5 100644 --- a/reactos/dll/win32/mmdrv/session.c +++ b/reactos/dll/win32/mmdrv/session.c @@ -9,7 +9,7 @@ * Jan 14, 2007: Created */ -#include +#include "mmdrv.h" /* Each session is tracked, but the list must be locked when in use */ diff --git a/reactos/dll/win32/mmdrv/utils.c b/reactos/dll/win32/mmdrv/utils.c index fbe81061389..943191ad4be 100644 --- a/reactos/dll/win32/mmdrv/utils.c +++ b/reactos/dll/win32/mmdrv/utils.c @@ -9,7 +9,7 @@ * Jan 30, 2004: Imported into ReactOS tree */ -#include "mmdrv.h" +//#include "mmdrv.h" #define NDEBUG #include diff --git a/reactos/dll/win32/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c index 408eb86b871..011aad1c93b 100644 --- a/reactos/dll/win32/mmdrv/wave.c +++ b/reactos/dll/win32/mmdrv/wave.c @@ -10,7 +10,7 @@ * Jan 14, 2007: Rewritten and tidied up */ -#include +#include "mmdrv.h" #define MAX_WAVE_BUFFER_SIZE 65536 diff --git a/reactos/dll/win32/mmdrv/wave_io.c b/reactos/dll/win32/mmdrv/wave_io.c index a7923cb29dd..9773f7ab880 100644 --- a/reactos/dll/win32/mmdrv/wave_io.c +++ b/reactos/dll/win32/mmdrv/wave_io.c @@ -2,7 +2,7 @@ Don't use this. */ -#include +#include "mmdrv.h" /* Complete a partial wave buffer transaction diff --git a/reactos/dll/win32/modemui/modemui.c b/reactos/dll/win32/modemui/modemui.c index 619c5ad44f1..0b75ba3c4af 100644 --- a/reactos/dll/win32/modemui/modemui.c +++ b/reactos/dll/win32/modemui/modemui.c @@ -7,8 +7,13 @@ * */ -#include -#include "resource.h" +#define WIN32_NO_STATUS +#include +#include +#include +#include + +//#include "resource.h" static HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/modemui/modemui.rc b/reactos/dll/win32/modemui/modemui.rc index 92050a80c43..cf84441db1b 100644 --- a/reactos/dll/win32/modemui/modemui.rc +++ b/reactos/dll/win32/modemui/modemui.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/mpr/auth.c b/reactos/dll/win32/mpr/auth.c index e2a28a3d83e..a112e114ff7 100644 --- a/reactos/dll/win32/mpr/auth.c +++ b/reactos/dll/win32/mpr/auth.c @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winnetwk.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mpr); diff --git a/reactos/dll/win32/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc index cd478f0ddee..ced4d3a4f1e 100644 --- a/reactos/dll/win32/mpr/mpr.rc +++ b/reactos/dll/win32/mpr/mpr.rc @@ -17,10 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mprres.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "mprres.h" #include "version.rc" diff --git a/reactos/dll/win32/mpr/mpr_main.c b/reactos/dll/win32/mpr/mpr_main.c index 5ec6b2209d0..9a1f9882140 100644 --- a/reactos/dll/win32/mpr/mpr_main.c +++ b/reactos/dll/win32/mpr/mpr_main.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "winnetwk.h" -#include "wine/debug.h" +#include +#include +//#include "objbase.h" +//#include "winnetwk.h" +#include #include "wnetpriv.h" WINE_DEFAULT_DEBUG_CHANNEL(mpr); diff --git a/reactos/dll/win32/mpr/mprres.h b/reactos/dll/win32/mpr/mprres.h index 5c42e565477..f8a86254bee 100644 --- a/reactos/dll/win32/mpr/mprres.h +++ b/reactos/dll/win32/mpr/mprres.h @@ -18,7 +18,7 @@ #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ -#include +//#include #include #define IDS_ENTIRENETWORK 1 diff --git a/reactos/dll/win32/mpr/multinet.c b/reactos/dll/win32/mpr/multinet.c index f05cd214ef5..dc19f8e6ea2 100644 --- a/reactos/dll/win32/mpr/multinet.c +++ b/reactos/dll/win32/mpr/multinet.c @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winnetwk.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mpr); diff --git a/reactos/dll/win32/mpr/netspi.h b/reactos/dll/win32/mpr/netspi.h index 0a82475931a..e00b1a0dfaf 100644 --- a/reactos/dll/win32/mpr/netspi.h +++ b/reactos/dll/win32/mpr/netspi.h @@ -24,8 +24,8 @@ #ifndef _NETSPI_H_ #define _NETSPI_H_ -#include "windef.h" -#include "winnetwk.h" +//#include "windef.h" +#include /* * Note: The Unicode variants of all these routines/structures diff --git a/reactos/dll/win32/mpr/nps.c b/reactos/dll/win32/mpr/nps.c index f8a143363f2..590bb4fda3c 100644 --- a/reactos/dll/win32/mpr/nps.c +++ b/reactos/dll/win32/mpr/nps.c @@ -19,20 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "netspi.h" -#include "wine/debug.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "winerror.h" WINE_DEFAULT_DEBUG_CHANNEL(mpr); -#include "wine/unicode.h" +//#include "wine/unicode.h" #include "mprres.h" diff --git a/reactos/dll/win32/mpr/pwcache.c b/reactos/dll/win32/mpr/pwcache.c index 0ed65b66ac4..fb2821882a4 100644 --- a/reactos/dll/win32/mpr/pwcache.c +++ b/reactos/dll/win32/mpr/pwcache.c @@ -19,14 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS + +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnetwk.h" -#include "winreg.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mpr); diff --git a/reactos/dll/win32/mpr/version.rc b/reactos/dll/win32/mpr/version.rc index c27f9c78889..a2cc94aa98d 100644 --- a/reactos/dll/win32/mpr/version.rc +++ b/reactos/dll/win32/mpr/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,0,2195,6611 #define WINE_PRODUCTVERSION_STR "5.00.2195.6611" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c index 66d165f8b8c..b398affc24a 100644 --- a/reactos/dll/win32/mpr/wnet.c +++ b/reactos/dll/win32/mpr/wnet.c @@ -20,21 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winioctl.h" -#include "winnetwk.h" -#include "npapi.h" -#include "winreg.h" -#include "winuser.h" +#define WIN32_NO_STATUS + +//#include +#include +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include +#include +//#include "winuser.h" #define WINE_MOUNTMGR_EXTENSIONS -#include "ddk/mountmgr.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include #include "mprres.h" -#include "wnetpriv.h" +//#include "wnetpriv.h" WINE_DEFAULT_DEBUG_CHANNEL(mpr); diff --git a/reactos/dll/win32/mprapi/mprapi.c b/reactos/dll/win32/mprapi/mprapi.c index 715f1b8cada..5ff5dfc62ad 100644 --- a/reactos/dll/win32/mprapi/mprapi.c +++ b/reactos/dll/win32/mprapi/mprapi.c @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "mprapi.h" -#include "wine/debug.h" +#include +#include +//#include "mprapi.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mprapi); diff --git a/reactos/dll/win32/msacm32/driver.c b/reactos/dll/win32/msacm32/driver.c index d0b543c314e..c8f398e77fe 100644 --- a/reactos/dll/win32/msacm32/driver.c +++ b/reactos/dll/win32/msacm32/driver.c @@ -21,24 +21,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS -#include -#include +#include +//#include "wine/port.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +//#include +//#include + +#include +//#include "winbase.h" +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/filter.c b/reactos/dll/win32/msacm32/filter.c index 53db82777de..73eb30aad43 100644 --- a/reactos/dll/win32/msacm32/filter.c +++ b/reactos/dll/win32/msacm32/filter.c @@ -20,19 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "mmsystem.h" +//#include +#include +#include +#include +//#include "winerror.h" +//#include "mmsystem.h" #define NOBITMAP -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/format.c b/reactos/dll/win32/msacm32/format.c index 9866139af35..748fd3ce862 100644 --- a/reactos/dll/win32/msacm32/format.c +++ b/reactos/dll/win32/msacm32/format.c @@ -21,20 +21,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +//#include +#include +//#include "winbase.h" +//#include "winnls.h" +//#include "winerror.h" +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/internal.c b/reactos/dll/win32/msacm32/internal.c index b9b80c1cf60..911d8c7162d 100644 --- a/reactos/dll/win32/msacm32/internal.c +++ b/reactos/dll/win32/msacm32/internal.c @@ -21,22 +21,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "winreg.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +#include +//#include + +#include +//#include "winbase.h" +#include +#include +//#include "winerror.h" +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c index 556b0c07534..c2b2a06b579 100644 --- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c +++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c @@ -28,17 +28,19 @@ * those should be taken care of... */ +#define WIN32_NO_STATUS + #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "mmreg.h" -#include "msacm.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +#include +//#include "winbase.h" +#include +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wavemap); diff --git a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc index e2fa8516093..e6bb63c9477 100644 --- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc +++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.rc @@ -1,5 +1,3 @@ -/* $Id: wavemap.rc 11297 2004-10-16 20:27:43Z gvg $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/WINE Wave Mapper\0" #define REACTOS_STR_INTERNAL_NAME "wavemap\0" diff --git a/reactos/dll/win32/msacm32/msacm32_main.c b/reactos/dll/win32/msacm32/msacm32_main.c index d3160e32172..08b5ff7bae0 100644 --- a/reactos/dll/win32/msacm32/msacm32_main.c +++ b/reactos/dll/win32/msacm32/msacm32_main.c @@ -21,16 +21,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" -#include "mmsystem.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +#include +//#include "mmsystem.h" #define NOBITMAP -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/pcmconverter.c b/reactos/dll/win32/msacm32/pcmconverter.c index 7d041c93ad0..f5d25321c6a 100644 --- a/reactos/dll/win32/msacm32/pcmconverter.c +++ b/reactos/dll/win32/msacm32/pcmconverter.c @@ -26,26 +26,28 @@ * embedded driver handling scheme in msacm32.dll which isn't done yet */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" +#include +#include +//#include "mmsystem.h" #define NOBITMAP -#include "mmreg.h" -#include "msacm.h" -#include "wingdi.h" -#include "winnls.h" -#include "winuser.h" +//#include "mmreg.h" +//#include "msacm.h" +//#include "wingdi.h" +#include +#include -#include "msacmdrv.h" -#include "wineacm.h" +#include +//#include "wineacm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/stream.c b/reactos/dll/win32/msacm32/stream.c index 10ce79b10fb..3fef76fb025 100644 --- a/reactos/dll/win32/msacm32/stream.c +++ b/reactos/dll/win32/msacm32/stream.c @@ -28,17 +28,19 @@ * + properly close ACM streams */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "mmsystem.h" +#define WIN32_NO_STATUS + +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "mmsystem.h" #define NOBITMAP -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" +//#include "mmreg.h" +//#include "msacm.h" +#include #include "wineacm.h" WINE_DEFAULT_DEBUG_CHANNEL(msacm); diff --git a/reactos/dll/win32/msacm32/wineacm.h b/reactos/dll/win32/msacm32/wineacm.h index bf0c6ed04d4..4554980ce9e 100644 --- a/reactos/dll/win32/msacm32/wineacm.h +++ b/reactos/dll/win32/msacm32/wineacm.h @@ -20,8 +20,8 @@ #ifndef __WINE_WINEACM_H #define __WINE_WINEACM_H -#include -#include +//#include +//#include /*********************************************************************** * Wine specific - Win32 @@ -149,6 +149,6 @@ LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2); /* Dialog box templates */ -#include "msacmdlg.h" +#include #endif /* __WINE_WINEACM_H */ diff --git a/reactos/dll/win32/msadp32.acm/msadp32.c b/reactos/dll/win32/msadp32.acm/msadp32.c index a9aba4cb176..dbb6d20a2b9 100644 --- a/reactos/dll/win32/msadp32.acm/msadp32.c +++ b/reactos/dll/win32/msadp32.acm/msadp32.c @@ -19,19 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" -#include "wine/debug.h" +//#include +#include +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include +#include /* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */ diff --git a/reactos/dll/win32/msafd/msafd.h b/reactos/dll/win32/msafd/msafd.h index 0be243da207..ec8e9e5a828 100644 --- a/reactos/dll/win32/msafd/msafd.h +++ b/reactos/dll/win32/msafd/msafd.h @@ -7,12 +7,14 @@ #ifndef __MSAFD_H #define __MSAFD_H -#include -#include - #define WIN32_NO_STATUS -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include #define NTOS_MODE_USER #include diff --git a/reactos/dll/win32/mscat32/main.c b/reactos/dll/win32/mscat32/main.c index 7e61aa93ce8..d3a9b60ad2b 100644 --- a/reactos/dll/win32/mscat32/main.c +++ b/reactos/dll/win32/mscat32/main.c @@ -17,12 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mscat); diff --git a/reactos/dll/win32/mscms/handle.c b/reactos/dll/win32/mscms/handle.c index 1fec81030ce..a1d6d0eba2b 100644 --- a/reactos/dll/win32/mscms/handle.c +++ b/reactos/dll/win32/mscms/handle.c @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#include +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "icm.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "icm.h" -#include "mscms_priv.h" +//#include "mscms_priv.h" #ifdef HAVE_LCMS diff --git a/reactos/dll/win32/mscms/icc.c b/reactos/dll/win32/mscms/icc.c index f751c70d918..a83574b3858 100644 --- a/reactos/dll/win32/mscms/icc.c +++ b/reactos/dll/win32/mscms/icc.c @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winternl.h" -#include "icm.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "winternl.h" +//#include "icm.h" -#include "mscms_priv.h" +//#include "mscms_priv.h" #ifdef HAVE_LCMS diff --git a/reactos/dll/win32/mscms/mscms_main.c b/reactos/dll/win32/mscms/mscms_main.c index 3199c0b80ac..1ddbf4c7bf9 100644 --- a/reactos/dll/win32/mscms/mscms_main.c +++ b/reactos/dll/win32/mscms/mscms_main.c @@ -18,21 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" -#include "wine/library.h" +//#include "wine/port.h" +#include +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "icm.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "icm.h" -#include "mscms_priv.h" +//#include "mscms_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); diff --git a/reactos/dll/win32/mscms/profile.c b/reactos/dll/win32/mscms/profile.c index b0ffce45777..c65a0cb6f30 100644 --- a/reactos/dll/win32/mscms/profile.c +++ b/reactos/dll/win32/mscms/profile.c @@ -18,22 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#define WIN32_NO_STATUS -#include +#include +#include +#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "icm.h" +//#include -#include "mscms_priv.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +#include +#include +#include +//#include "shlwapi.h" +#include + +//#include "mscms_priv.h" #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') diff --git a/reactos/dll/win32/mscms/stub.c b/reactos/dll/win32/mscms/stub.c index 84c0cdc9243..7e3fd841a47 100644 --- a/reactos/dll/win32/mscms/stub.c +++ b/reactos/dll/win32/mscms/stub.c @@ -18,16 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS -#include +#include +#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "icm.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +#include +#include +#include #include "mscms_priv.h" diff --git a/reactos/dll/win32/mscms/transform.c b/reactos/dll/win32/mscms/transform.c index a5b348644e0..1ec3499e365 100644 --- a/reactos/dll/win32/mscms/transform.c +++ b/reactos/dll/win32/mscms/transform.c @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS -#include +#include +#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "icm.h" +//#include -#include "mscms_priv.h" +#include +#include +#include +#include +#include +#include + +//#include "mscms_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); diff --git a/reactos/dll/win32/mscoree/assembly.c b/reactos/dll/win32/mscoree/assembly.c index 13e7f03e4da..77852c06268 100644 --- a/reactos/dll/win32/mscoree/assembly.c +++ b/reactos/dll/win32/mscoree/assembly.c @@ -18,24 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" -#include "dbghelp.h" -#include "ole2.h" -#include "mscoree.h" -#include "corhdr.h" -#include "metahost.h" -#include "cordebug.h" -#include "wine/list.h" +#include +//#include + +#include +#include +//#include "winuser.h" +#include +#include +#include +//#include "mscoree.h" +#include +#include +#include +#include #include "mscoree_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "wine/debug.h" +//#include "wine/unicode.h" typedef struct { diff --git a/reactos/dll/win32/mscoree/config.c b/reactos/dll/win32/mscoree/config.c index c5e3cec7cd6..e8d73242397 100644 --- a/reactos/dll/win32/mscoree/config.c +++ b/reactos/dll/win32/mscoree/config.c @@ -18,24 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "ole2.h" -#include "msxml2.h" -#include "mscoree.h" -#include "corhdr.h" -#include "metahost.h" -#include "cordebug.h" -#include "wine/list.h" +#include +#include +#include +#include +#include +//#include "mscoree.h" +#include +#include +#include +#include #include "mscoree_private.h" -#include "shlwapi.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); diff --git a/reactos/dll/win32/mscoree/cordebug.c b/reactos/dll/win32/mscoree/cordebug.c index da06f49e04b..be6091f5a30 100644 --- a/reactos/dll/win32/mscoree/cordebug.c +++ b/reactos/dll/win32/mscoree/cordebug.c @@ -17,25 +17,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" +#include +#include -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "ole2.h" -#include "shellapi.h" -#include "mscoree.h" -#include "corhdr.h" -#include "metahost.h" -#include "cordebug.h" -#include "wine/list.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "winreg.h" +#include +//#include "shellapi.h" +//#include "mscoree.h" +#include +#include +#include +#include #include "mscoree_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); diff --git a/reactos/dll/win32/mscoree/corruntimehost.c b/reactos/dll/win32/mscoree/corruntimehost.c index 3f2b9a28d30..f7baefad767 100644 --- a/reactos/dll/win32/mscoree/corruntimehost.c +++ b/reactos/dll/win32/mscoree/corruntimehost.c @@ -17,34 +17,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "ole2.h" -#include "shellapi.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +#include -#include "cor.h" -#include "mscoree.h" -#include "metahost.h" -#include "corhdr.h" -#include "cordebug.h" -#include "wine/list.h" +#include +//#include "mscoree.h" +#include +//#include "corhdr.h" +#include +#include #include "mscoree_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +//#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -#include "initguid.h" +#include DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); diff --git a/reactos/dll/win32/mscoree/metadata.c b/reactos/dll/win32/mscoree/metadata.c index 9ca0d933b55..9d6692199a8 100644 --- a/reactos/dll/win32/mscoree/metadata.c +++ b/reactos/dll/win32/mscoree/metadata.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include -#include +//#include #define COBJMACROS -#include "wine/library.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "ole2.h" -#include "cor.h" -#include "mscoree.h" -#include "corhdr.h" -#include "cordebug.h" -#include "metahost.h" -#include "wine/list.h" -#include "mscoree_private.h" +//#include "wine/library.h" +#include +#include +//#include "winreg.h" +#include +#include +//#include "mscoree.h" +//#include "corhdr.h" +//#include "cordebug.h" +//#include "metahost.h" +//#include "wine/list.h" +//#include "mscoree_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); diff --git a/reactos/dll/win32/mscoree/metahost.c b/reactos/dll/win32/mscoree/metahost.c index 3736dc0ace1..6ac04ff87a2 100644 --- a/reactos/dll/win32/mscoree/metahost.c +++ b/reactos/dll/win32/mscoree/metahost.c @@ -18,30 +18,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #include #define COBJMACROS -#include "wine/unicode.h" -#include "wine/library.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "ole2.h" +#include +#include +//#include "windef.h" +//#include "winbase.h" +#include +#include -#include "corerror.h" -#include "cor.h" -#include "mscoree.h" -#include "corhdr.h" -#include "cordebug.h" -#include "metahost.h" -#include "fusion.h" -#include "wine/list.h" +//#include "corerror.h" +#include +//#include "mscoree.h" +//#include "corhdr.h" +#include +#include +#include +#include #include "mscoree_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); diff --git a/reactos/dll/win32/mscoree/mscoree_main.c b/reactos/dll/win32/mscoree/mscoree_main.c index 0aa736f93df..d8b4ce62810 100644 --- a/reactos/dll/win32/mscoree/mscoree_main.c +++ b/reactos/dll/win32/mscoree/mscoree_main.c @@ -19,34 +19,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "wine/unicode.h" -#include "wine/library.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "ole2.h" -#include "ocidl.h" -#include "shellapi.h" +#include +//#include "wine/library.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" +#include +#include +#include +//#include "shellapi.h" -#include "initguid.h" -#include "msxml2.h" -#include "corerror.h" -#include "cor.h" -#include "mscoree.h" -#include "corhdr.h" -#include "cordebug.h" -#include "metahost.h" -#include "fusion.h" -#include "wine/list.h" +#include +#include +//#include "corerror.h" +#include +//#include "mscoree.h" +//#include "corhdr.h" +#include +#include +//#include "fusion.h" +#include #include "mscoree_private.h" -#include "rpcproxy.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); diff --git a/reactos/dll/win32/msctf/categorymgr.c b/reactos/dll/win32/msctf/categorymgr.c index a4874044884..101c112503c 100644 --- a/reactos/dll/win32/msctf/categorymgr.c +++ b/reactos/dll/win32/msctf/categorymgr.c @@ -18,24 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" +#include +//#include "windef.h" +#include +#include +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include -#include "wine/unicode.h" +#include -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/compartmentmgr.c b/reactos/dll/win32/msctf/compartmentmgr.c index bb55d69774a..76a9a94ae49 100644 --- a/reactos/dll/win32/msctf/compartmentmgr.c +++ b/reactos/dll/win32/msctf/compartmentmgr.c @@ -18,27 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" -#include "oleauto.h" -#include "olectl.h" +#include +//#include "windef.h" +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include +#include +#include -#include "wine/unicode.h" -#include "wine/list.h" +//#include "wine/unicode.h" +#include -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/context.c b/reactos/dll/win32/msctf/context.c index c013cf96e20..91c01f652aa 100644 --- a/reactos/dll/win32/msctf/context.c +++ b/reactos/dll/win32/msctf/context.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" -#include "olectl.h" +#include +//#include "windef.h" +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include +#include -#include "wine/unicode.h" -#include "wine/list.h" +//#include "wine/unicode.h" +#include -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/displayattributemgr.c b/reactos/dll/win32/msctf/displayattributemgr.c index 44c61abf371..d9daadd2388 100644 --- a/reactos/dll/win32/msctf/displayattributemgr.c +++ b/reactos/dll/win32/msctf/displayattributemgr.c @@ -18,15 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "wine/debug.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" +#include +#include +#include +#include -#include "msctf.h" -#include "msctf_internal.h" +#include +//#include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/documentmgr.c b/reactos/dll/win32/msctf/documentmgr.c index a1c9c935849..865e6152c49 100644 --- a/reactos/dll/win32/msctf/documentmgr.c +++ b/reactos/dll/win32/msctf/documentmgr.c @@ -18,24 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" +#include +//#include "windef.h" +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include -#include "wine/unicode.h" +//#include "wine/unicode.h" -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/inputprocessor.c b/reactos/dll/win32/msctf/inputprocessor.c index 5242f142fb0..849a4e96a52 100644 --- a/reactos/dll/win32/msctf/inputprocessor.c +++ b/reactos/dll/win32/msctf/inputprocessor.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" -#include "olectl.h" +#include +//#include "windef.h" +#include +#include +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include +#include -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/langbarmgr.c b/reactos/dll/win32/msctf/langbarmgr.c index 5e814a73bec..285f22becc7 100644 --- a/reactos/dll/win32/msctf/langbarmgr.c +++ b/reactos/dll/win32/msctf/langbarmgr.c @@ -18,15 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "wine/debug.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" +#include +#include +#include +#include -#include "msctf.h" -#include "msctf_internal.h" +#include +//#include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/msctf.c b/reactos/dll/win32/msctf/msctf.c index bc12a296359..4927b011e0c 100644 --- a/reactos/dll/win32/msctf/msctf.c +++ b/reactos/dll/win32/msctf/msctf.c @@ -18,23 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include +#include + +//#include +//#include #define COBJMACROS -#include "wine/debug.h" -#include "wine/list.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" -#include "shlguid.h" -#include "comcat.h" -#include "rpcproxy.h" -#include "msctf.h" +#include +#include +//#include "windef.h" +#include +#include +#include +//#include "shlguid.h" +//#include "comcat.h" +#include +#include #include "msctf_internal.h" diff --git a/reactos/dll/win32/msctf/range.c b/reactos/dll/win32/msctf/range.c index 3412954aece..c92f314fdbb 100644 --- a/reactos/dll/win32/msctf/range.c +++ b/reactos/dll/win32/msctf/range.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" +#include +//#include "windef.h" +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include -#include "wine/unicode.h" +//#include "wine/unicode.h" -#include "msctf.h" -#include "msctf_internal.h" +#include +//#include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/threadmgr.c b/reactos/dll/win32/msctf/threadmgr.c index af3ebbf4a6e..ac27dcba87c 100644 --- a/reactos/dll/win32/msctf/threadmgr.c +++ b/reactos/dll/win32/msctf/threadmgr.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #define COBJMACROS -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" -#include "winerror.h" -#include "objbase.h" -#include "olectl.h" +#include +//#include "windef.h" +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "shlwapi.h" +//#include "winerror.h" +#include +#include -#include "wine/unicode.h" -#include "wine/list.h" +//#include "wine/unicode.h" +#include -#include "msctf.h" +#include #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); diff --git a/reactos/dll/win32/msctf/version.rc b/reactos/dll/win32/msctf/version.rc index 549f58380a6..4543bc1557e 100644 --- a/reactos/dll/win32/msctf/version.rc +++ b/reactos/dll/win32/msctf/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,3319 #define WINE_PRODUCTVERSION_STR "5.1.2600.3319" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/msftedit/msftedit_main.c b/reactos/dll/win32/msftedit/msftedit_main.c index b505999cdad..f5ce8a970ad 100644 --- a/reactos/dll/win32/msftedit/msftedit_main.c +++ b/reactos/dll/win32/msftedit/msftedit_main.c @@ -19,24 +19,28 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "richedit.h" -#include "imm.h" -#include "shlwapi.h" -#include "oleidl.h" -#include "initguid.h" -#include "textserv.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msftedit); diff --git a/reactos/dll/win32/msg711.acm/msg711.c b/reactos/dll/win32/msg711.acm/msg711.c index db06905cbe7..b091881a17c 100644 --- a/reactos/dll/win32/msg711.acm/msg711.c +++ b/reactos/dll/win32/msg711.acm/msg711.c @@ -19,19 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" -#include "wine/debug.h" +//#include +#include +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(g711); diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index e221b3b8e3d..ac26591771b 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -1,7 +1,15 @@ -#include +#define WIN32_NO_STATUS + +#include +#include +#include +#include +#include +#include +#include +#include #include #include - #include #include "resource.h" diff --git a/reactos/dll/win32/msgina/msgina.rc b/reactos/dll/win32/msgina/msgina.rc index 777301720e8..9baba7538aa 100644 --- a/reactos/dll/win32/msgina/msgina.rc +++ b/reactos/dll/win32/msgina/msgina.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/msgsm32.acm/msgsm32.c b/reactos/dll/win32/msgsm32.acm/msgsm32.c index 12dfef91d3b..643664ebccf 100644 --- a/reactos/dll/win32/msgsm32.acm/msgsm32.c +++ b/reactos/dll/win32/msgsm32.acm/msgsm32.c @@ -20,12 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include +#define WIN32_NO_STATUS -#include +#include +//#include + +//#include #include -#include +//#include #ifdef HAVE_GSM_GSM_H #include @@ -33,17 +35,17 @@ #include #endif -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" -#include "wine/library.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include +//#include "wine/library.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(gsm); diff --git a/reactos/dll/win32/mshtml.tlb/rsrc.rc b/reactos/dll/win32/mshtml.tlb/rsrc.rc index 75c8549d5cc..975b394869c 100644 --- a/reactos/dll/win32/mshtml.tlb/rsrc.rc +++ b/reactos/dll/win32/mshtml.tlb/rsrc.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +#include LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/mshtml/conpoint.c b/reactos/dll/win32/mshtml/conpoint.c index da775adcbe4..6bdb3e74436 100644 --- a/reactos/dll/win32/mshtml/conpoint.c +++ b/reactos/dll/win32/mshtml/conpoint.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/dispex.c b/reactos/dll/win32/mshtml/dispex.c index 64356f5fde0..a3edc4ccc84 100644 --- a/reactos/dll/win32/mshtml/dispex.c +++ b/reactos/dll/win32/mshtml/dispex.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/editor.c b/reactos/dll/win32/mshtml/editor.c index 14e7ebb6f64..02c5987c1b1 100644 --- a/reactos/dll/win32/mshtml/editor.c +++ b/reactos/dll/win32/mshtml/editor.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmcid.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "resource.h" diff --git a/reactos/dll/win32/mshtml/hlink.c b/reactos/dll/win32/mshtml/hlink.c index 60056e33fab..8d33a48116d 100644 --- a/reactos/dll/win32/mshtml/hlink.c +++ b/reactos/dll/win32/mshtml/hlink.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlanchor.c b/reactos/dll/win32/mshtml/htmlanchor.c index ae269ee252b..53c86701037 100644 --- a/reactos/dll/win32/mshtml/htmlanchor.c +++ b/reactos/dll/win32/mshtml/htmlanchor.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlbody.c b/reactos/dll/win32/mshtml/htmlbody.c index 18a60418cee..dd70ca76237 100644 --- a/reactos/dll/win32/mshtml/htmlbody.c +++ b/reactos/dll/win32/mshtml/htmlbody.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlcomment.c b/reactos/dll/win32/mshtml/htmlcomment.c index 7040d184077..7253d7caa18 100644 --- a/reactos/dll/win32/mshtml/htmlcomment.c +++ b/reactos/dll/win32/mshtml/htmlcomment.c @@ -17,18 +17,22 @@ */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlcurstyle.c b/reactos/dll/win32/mshtml/htmlcurstyle.c index 4f56e87e428..b474d0b45eb 100644 --- a/reactos/dll/win32/mshtml/htmlcurstyle.c +++ b/reactos/dll/win32/mshtml/htmlcurstyle.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" #include "htmlstyle.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmldoc.c b/reactos/dll/win32/mshtml/htmldoc.c index 61476328dd1..d72de4ea22d 100644 --- a/reactos/dll/win32/mshtml/htmldoc.c +++ b/reactos/dll/win32/mshtml/htmldoc.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wininet.h" -#include "ole2.h" -#include "perhist.h" -#include "mshtmdid.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "perhist.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmldoc3.c b/reactos/dll/win32/mshtml/htmldoc3.c index 8d135ff37d2..6d43af571e2 100644 --- a/reactos/dll/win32/mshtml/htmldoc3.c +++ b/reactos/dll/win32/mshtml/htmldoc3.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmldoc5.c b/reactos/dll/win32/mshtml/htmldoc5.c index 12742f64126..381be23f71d 100644 --- a/reactos/dll/win32/mshtml/htmldoc5.c +++ b/reactos/dll/win32/mshtml/htmldoc5.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlelem.c b/reactos/dll/win32/mshtml/htmlelem.c index 5bf29159aed..c7a76c7ec3a 100644 --- a/reactos/dll/win32/mshtml/htmlelem.c +++ b/reactos/dll/win32/mshtml/htmlelem.c @@ -16,20 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +//#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmlelem2.c b/reactos/dll/win32/mshtml/htmlelem2.c index 0c2072361b0..6be52071b02 100644 --- a/reactos/dll/win32/mshtml/htmlelem2.c +++ b/reactos/dll/win32/mshtml/htmlelem2.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmlelem3.c b/reactos/dll/win32/mshtml/htmlelem3.c index 30c854637d1..0b90ab86e4d 100644 --- a/reactos/dll/win32/mshtml/htmlelem3.c +++ b/reactos/dll/win32/mshtml/htmlelem3.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmlelemcol.c b/reactos/dll/win32/mshtml/htmlelemcol.c index 9c0fedde8d0..deb1ea11aea 100644 --- a/reactos/dll/win32/mshtml/htmlelemcol.c +++ b/reactos/dll/win32/mshtml/htmlelemcol.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlevent.c b/reactos/dll/win32/mshtml/htmlevent.c index 7cc2f39e896..7694a67f447 100644 --- a/reactos/dll/win32/mshtml/htmlevent.c +++ b/reactos/dll/win32/mshtml/htmlevent.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmdid.h" +#include +#include +//#include "winuser.h" +#include +#include #include "mshtml_private.h" #include "htmlevent.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlform.c b/reactos/dll/win32/mshtml/htmlform.c index 8e169170a4b..fd9e2d57681 100644 --- a/reactos/dll/win32/mshtml/htmlform.c +++ b/reactos/dll/win32/mshtml/htmlform.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlframe.c b/reactos/dll/win32/mshtml/htmlframe.c index 8d458f7a774..120c9fc71ad 100644 --- a/reactos/dll/win32/mshtml/htmlframe.c +++ b/reactos/dll/win32/mshtml/htmlframe.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlframebase.c b/reactos/dll/win32/mshtml/htmlframebase.c index 56c1023be8c..305048a0f0c 100644 --- a/reactos/dll/win32/mshtml/htmlframebase.c +++ b/reactos/dll/win32/mshtml/htmlframebase.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlgeneric.c b/reactos/dll/win32/mshtml/htmlgeneric.c index 82075b8d325..276ed3a4d7f 100644 --- a/reactos/dll/win32/mshtml/htmlgeneric.c +++ b/reactos/dll/win32/mshtml/htmlgeneric.c @@ -16,17 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmliframe.c b/reactos/dll/win32/mshtml/htmliframe.c index 12cd4275174..edb61646ce7 100644 --- a/reactos/dll/win32/mshtml/htmliframe.c +++ b/reactos/dll/win32/mshtml/htmliframe.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlimg.c b/reactos/dll/win32/mshtml/htmlimg.c index a4448f9588f..44defba1e1c 100644 --- a/reactos/dll/win32/mshtml/htmlimg.c +++ b/reactos/dll/win32/mshtml/htmlimg.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmlinput.c b/reactos/dll/win32/mshtml/htmlinput.c index 76a5063bc2e..f781e15157a 100644 --- a/reactos/dll/win32/mshtml/htmlinput.c +++ b/reactos/dll/win32/mshtml/htmlinput.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmllocation.c b/reactos/dll/win32/mshtml/htmllocation.c index 93df9e0ee2a..d1d376f66e0 100644 --- a/reactos/dll/win32/mshtml/htmllocation.c +++ b/reactos/dll/win32/mshtml/htmllocation.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "wininet.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +#include +//#include "shlwapi.h" -#include "wine/debug.h" +#include #include "mshtml_private.h" -#include "resource.h" +//#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlnode.c b/reactos/dll/win32/mshtml/htmlnode.c index a5ea3f4dd00..64ecbdbd875 100644 --- a/reactos/dll/win32/mshtml/htmlnode.c +++ b/reactos/dll/win32/mshtml/htmlnode.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmloption.c b/reactos/dll/win32/mshtml/htmloption.c index b8166341bd4..206f078c4db 100644 --- a/reactos/dll/win32/mshtml/htmloption.c +++ b/reactos/dll/win32/mshtml/htmloption.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlscreen.c b/reactos/dll/win32/mshtml/htmlscreen.c index cc3f4b2eb21..7105266afaf 100644 --- a/reactos/dll/win32/mshtml/htmlscreen.c +++ b/reactos/dll/win32/mshtml/htmlscreen.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlscript.c b/reactos/dll/win32/mshtml/htmlscript.c index f39e3061c5d..68a53d659c4 100644 --- a/reactos/dll/win32/mshtml/htmlscript.c +++ b/reactos/dll/win32/mshtml/htmlscript.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmlselect.c b/reactos/dll/win32/mshtml/htmlselect.c index f3aa36f650f..f099ea775e8 100644 --- a/reactos/dll/win32/mshtml/htmlselect.c +++ b/reactos/dll/win32/mshtml/htmlselect.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/htmlstyle.c b/reactos/dll/win32/mshtml/htmlstyle.c index cb86b79b437..0da8e87c21d 100644 --- a/reactos/dll/win32/mshtml/htmlstyle.c +++ b/reactos/dll/win32/mshtml/htmlstyle.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmdid.h" +#include +#include +//#include "winuser.h" +#include +#include #include "mshtml_private.h" #include "htmlstyle.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlstyle2.c b/reactos/dll/win32/mshtml/htmlstyle2.c index aa9531c438e..dacc0fa13f0 100644 --- a/reactos/dll/win32/mshtml/htmlstyle2.c +++ b/reactos/dll/win32/mshtml/htmlstyle2.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" #include "htmlstyle.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlstyle3.c b/reactos/dll/win32/mshtml/htmlstyle3.c index 56fd3df3bc7..71ebd5e0432 100644 --- a/reactos/dll/win32/mshtml/htmlstyle3.c +++ b/reactos/dll/win32/mshtml/htmlstyle3.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" #include "htmlstyle.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlstylesheet.c b/reactos/dll/win32/mshtml/htmlstylesheet.c index e39bfb761ce..e61f74d1c13 100644 --- a/reactos/dll/win32/mshtml/htmlstylesheet.c +++ b/reactos/dll/win32/mshtml/htmlstylesheet.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmltable.c b/reactos/dll/win32/mshtml/htmltable.c index 12869523dbc..dbd902c2ddb 100644 --- a/reactos/dll/win32/mshtml/htmltable.c +++ b/reactos/dll/win32/mshtml/htmltable.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmltablerow.c b/reactos/dll/win32/mshtml/htmltablerow.c index 950535af253..8078b53ab0c 100644 --- a/reactos/dll/win32/mshtml/htmltablerow.c +++ b/reactos/dll/win32/mshtml/htmltablerow.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmltextarea.c b/reactos/dll/win32/mshtml/htmltextarea.c index dd33c72df21..ae903a44a95 100644 --- a/reactos/dll/win32/mshtml/htmltextarea.c +++ b/reactos/dll/win32/mshtml/htmltextarea.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmltextcont.c b/reactos/dll/win32/mshtml/htmltextcont.c index 46b5d87b842..b29cc5a1c82 100644 --- a/reactos/dll/win32/mshtml/htmltextcont.c +++ b/reactos/dll/win32/mshtml/htmltextcont.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/htmltextnode.c b/reactos/dll/win32/mshtml/htmltextnode.c index 1c2c2daca8b..dfbe6384ea9 100644 --- a/reactos/dll/win32/mshtml/htmltextnode.c +++ b/reactos/dll/win32/mshtml/htmltextnode.c @@ -16,19 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include #include "mshtml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/htmlwindow.c b/reactos/dll/win32/mshtml/htmlwindow.c index 1ba1101e819..9ef2889457d 100644 --- a/reactos/dll/win32/mshtml/htmlwindow.c +++ b/reactos/dll/win32/mshtml/htmlwindow.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmdid.h" -#include "shlguid.h" +#include +#include +//#include "winuser.h" +#include +#include +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/install.c b/reactos/dll/win32/mshtml/install.c index 65faa5a4f90..aa75783df02 100644 --- a/reactos/dll/win32/mshtml/install.c +++ b/reactos/dll/win32/mshtml/install.c @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #include @@ -28,19 +32,19 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "commctrl.h" -#include "advpub.h" -#include "wininet.h" -#include "shellapi.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "commctrl.h" +//#include "advpub.h" +#include +//#include "shellapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/library.h" +#include +//#include "wine/unicode.h" +#include #include "mshtml_private.h" #include "resource.h" diff --git a/reactos/dll/win32/mshtml/loadopts.c b/reactos/dll/win32/mshtml/loadopts.c index 8648f16b7f9..4b4d916fdec 100644 --- a/reactos/dll/win32/mshtml/loadopts.c +++ b/reactos/dll/win32/mshtml/loadopts.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "optary.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/main.c b/reactos/dll/win32/mshtml/main.c index f54c6e3ed32..0334b88ffd5 100644 --- a/reactos/dll/win32/mshtml/main.c +++ b/reactos/dll/win32/mshtml/main.c @@ -20,23 +20,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "advpub.h" -#include "shlwapi.h" -#include "optary.h" -#include "shlguid.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +//#include "shlwapi.h" +#include +#include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include #define INIT_GUID #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/mshtml_private.h b/reactos/dll/win32/mshtml/mshtml_private.h index 46886d8b3b1..e8e95b54f79 100644 --- a/reactos/dll/win32/mshtml/mshtml_private.h +++ b/reactos/dll/win32/mshtml/mshtml_private.h @@ -16,23 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wingdi.h" -#include "docobj.h" -#include "comcat.h" -#include "mshtml.h" -#include "mshtmhst.h" -#include "hlink.h" -#include "perhist.h" -#include "dispex.h" +#include +//#include "docobj.h" +#include +#include +#include +#include +#include +#include -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include #ifdef INIT_GUID -#include "initguid.h" +#include #endif -#include "nsiface.h" +#include #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) diff --git a/reactos/dll/win32/mshtml/mutation.c b/reactos/dll/win32/mshtml/mutation.c index a7942043557..03c5a73f38c 100644 --- a/reactos/dll/win32/mshtml/mutation.c +++ b/reactos/dll/win32/mshtml/mutation.c @@ -16,23 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "shlguid.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +#include #include "mshtml_private.h" #include "htmlevent.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/navigate.c b/reactos/dll/win32/mshtml/navigate.c index 7a777957ce1..3fa769bbe80 100644 --- a/reactos/dll/win32/mshtml/navigate.c +++ b/reactos/dll/win32/mshtml/navigate.c @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include @@ -24,18 +28,18 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "hlguids.h" -#include "shlguid.h" -#include "wininet.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/nsembed.c b/reactos/dll/win32/mshtml/nsembed.c index 56c5d945618..4167c1b5eb5 100644 --- a/reactos/dll/win32/mshtml/nsembed.c +++ b/reactos/dll/win32/mshtml/nsembed.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/nsevents.c b/reactos/dll/win32/mshtml/nsevents.c index 3e0314966db..255e287abb3 100644 --- a/reactos/dll/win32/mshtml/nsevents.c +++ b/reactos/dll/win32/mshtml/nsevents.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmcid.h" -#include "shlguid.h" +#include +#include +//#include "winuser.h" +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/nsio.c b/reactos/dll/win32/mshtml/nsio.c index d9e822daf5b..b0a2d051469 100644 --- a/reactos/dll/win32/mshtml/nsio.c +++ b/reactos/dll/win32/mshtml/nsio.c @@ -16,23 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "shlguid.h" -#include "wininet.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/nsservice.c b/reactos/dll/win32/mshtml/nsservice.c index a449274c12a..afb61277b6c 100644 --- a/reactos/dll/win32/mshtml/nsservice.c +++ b/reactos/dll/win32/mshtml/nsservice.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/olecmd.c b/reactos/dll/win32/mshtml/olecmd.c index 851189bf509..a5d74d6387a 100644 --- a/reactos/dll/win32/mshtml/olecmd.c +++ b/reactos/dll/win32/mshtml/olecmd.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "shlguid.h" -#include "mshtmdid.h" -#include "idispids.h" -#include "mshtmcid.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "mshtmdid.h" +//#include "idispids.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "resource.h" diff --git a/reactos/dll/win32/mshtml/oleobj.c b/reactos/dll/win32/mshtml/oleobj.c index eab76bf141a..925440d3161 100644 --- a/reactos/dll/win32/mshtml/oleobj.c +++ b/reactos/dll/win32/mshtml/oleobj.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "shlguid.h" -#include "mshtmdid.h" -#include "idispids.h" +#include +#include +//#include "winuser.h" +#include +//#include "shlguid.h" +#include +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" #include "initguid.h" diff --git a/reactos/dll/win32/mshtml/olewnd.c b/reactos/dll/win32/mshtml/olewnd.c index 1c10f8c6ff6..581cc41c923 100644 --- a/reactos/dll/win32/mshtml/olewnd.c +++ b/reactos/dll/win32/mshtml/olewnd.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" -#include "resource.h" +//#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/reactos/dll/win32/mshtml/omnavigator.c b/reactos/dll/win32/mshtml/omnavigator.c index d127eef57f7..f4dc2d034f5 100644 --- a/reactos/dll/win32/mshtml/omnavigator.c +++ b/reactos/dll/win32/mshtml/omnavigator.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/persist.c b/reactos/dll/win32/mshtml/persist.c index 44ccd0f6b2c..f1b81b6c15f 100644 --- a/reactos/dll/win32/mshtml/persist.c +++ b/reactos/dll/win32/mshtml/persist.c @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #include @@ -25,15 +29,15 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "shlguid.h" -#include "idispids.h" +#include +#include +//#include "winuser.h" +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/reactos/dll/win32/mshtml/protocol.c b/reactos/dll/win32/mshtml/protocol.c index 14858812822..6287a9fb3b9 100644 --- a/reactos/dll/win32/mshtml/protocol.c +++ b/reactos/dll/win32/mshtml/protocol.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/rsrc.rc b/reactos/dll/win32/mshtml/rsrc.rc index 5c371112cd5..e351dea0679 100644 --- a/reactos/dll/win32/mshtml/rsrc.rc +++ b/reactos/dll/win32/mshtml/rsrc.rc @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" -#include "commctrl.h" -#include "mshtmcid.h" +//#include "windef.h" +#include +#include +//#include "mshtmcid.h" #include "resource.h" @@ -31,7 +31,7 @@ #define WINE_PRODUCTVERSION 6,0,2800,1106 #define WINE_PRODUCTVERSION_STR "6.0.2800.1106" -#include "wine/wine_common_ver.rc" +#include #ifdef LANGUAGE_BG_BG #include "Bg.rc" diff --git a/reactos/dll/win32/mshtml/script.c b/reactos/dll/win32/mshtml/script.c index 1d21da9a07e..1c18223c223 100644 --- a/reactos/dll/win32/mshtml/script.c +++ b/reactos/dll/win32/mshtml/script.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "activscp.h" -#include "activdbg.h" -#include "objsafe.h" +#include +#include +//#include "winuser.h" +#include +//#include "activscp.h" +#include +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/secmgr.c b/reactos/dll/win32/mshtml/secmgr.c index c74e19fd93b..4a48d543bea 100644 --- a/reactos/dll/win32/mshtml/secmgr.c +++ b/reactos/dll/win32/mshtml/secmgr.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "objsafe.h" -#include "activscp.h" +#include +#include +//#include "winuser.h" +#include +#include +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/selection.c b/reactos/dll/win32/mshtml/selection.c index 4c670a6063d..877434827c7 100644 --- a/reactos/dll/win32/mshtml/selection.c +++ b/reactos/dll/win32/mshtml/selection.c @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/service.c b/reactos/dll/win32/mshtml/service.c index c77afe4b750..58fc3f0f405 100644 --- a/reactos/dll/win32/mshtml/service.c +++ b/reactos/dll/win32/mshtml/service.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/task.c b/reactos/dll/win32/mshtml/task.c index c896179715b..8c3eb00eb23 100644 --- a/reactos/dll/win32/mshtml/task.c +++ b/reactos/dll/win32/mshtml/task.c @@ -16,19 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/txtrange.c b/reactos/dll/win32/mshtml/txtrange.c index 9b2bb94aec4..84889b6e2f5 100644 --- a/reactos/dll/win32/mshtml/txtrange.c +++ b/reactos/dll/win32/mshtml/txtrange.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtmcid.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/reactos/dll/win32/mshtml/view.c b/reactos/dll/win32/mshtml/view.c index 784b7b0475b..7bbb49947c9 100644 --- a/reactos/dll/win32/mshtml/view.c +++ b/reactos/dll/win32/mshtml/view.c @@ -16,21 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +//#include "commctrl.h" +#include #include "resource.h" -#include "wine/debug.h" +#include #include "mshtml_private.h" diff --git a/reactos/dll/win32/msi/action.c b/reactos/dll/win32/msi/action.c index 076d1b3775d..ee3470ee2c0 100644 --- a/reactos/dll/win32/msi/action.c +++ b/reactos/dll/win32/msi/action.c @@ -18,27 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "winsvc.h" -#include "odbcinst.h" -#include "wine/debug.h" -#include "msidefs.h" +#include +//#include "winbase.h" +//#include "winerror.h" +#include +#include +#include +#include +//#include "msidefs.h" #include "msipriv.h" -#include "winuser.h" -#include "shlobj.h" -#include "objbase.h" -#include "mscoree.h" -#include "shlwapi.h" -#include "imagehlp.h" -#include "wine/unicode.h" -#include "winver.h" +//#include "winuser.h" +#include +//#include "objbase.h" +//#include "mscoree.h" +//#include "shlwapi.h" +#include +#include +//#include "winver.h" #define REG_PROGRESS_VALUE 13200 #define COMPONENT_PROGRESS_VALUE 24000 diff --git a/reactos/dll/win32/msi/alter.c b/reactos/dll/win32/msi/alter.c index 8b11351f8be..97e94d7be65 100644 --- a/reactos/dll/win32/msi/alter.c +++ b/reactos/dll/win32/msi/alter.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" #include "query.h" diff --git a/reactos/dll/win32/msi/appsearch.c b/reactos/dll/win32/msi/appsearch.c index 0d9c3022f09..dc27c787f12 100644 --- a/reactos/dll/win32/msi/appsearch.c +++ b/reactos/dll/win32/msi/appsearch.c @@ -17,20 +17,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "msi.h" -#include "msiquery.h" -#include "msidefs.h" -#include "winver.h" -#include "shlwapi.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "msidefs.h" +//#include "winver.h" +#include +#include +#include #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/assembly.c b/reactos/dll/win32/msi/assembly.c index 2f321db01b8..2553f06faff 100644 --- a/reactos/dll/win32/msi/assembly.c +++ b/reactos/dll/win32/msi/assembly.c @@ -18,15 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "winbase.h" +#include +#include +#include #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/automation.c b/reactos/dll/win32/msi/automation.c index 8164463a581..c76dc8c7c9f 100644 --- a/reactos/dll/win32/msi/automation.c +++ b/reactos/dll/win32/msi/automation.c @@ -18,23 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "winreg.h" -#include "msidefs.h" +//#include +#include +//#include "winbase.h" +//#include "winerror.h" +//#include "winuser.h" +#include +//#include "msidefs.h" #include "msipriv.h" -#include "activscp.h" -#include "oleauto.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +#include +#include -#include "msiserver.h" +#include #include "msiserver_dispids.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/classes.c b/reactos/dll/win32/msi/classes.c index afc1b1cb83b..e57d1be164f 100644 --- a/reactos/dll/win32/msi/classes.c +++ b/reactos/dll/win32/msi/classes.c @@ -30,16 +30,20 @@ * UnregisterMIMEInfo */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "wine/debug.h" +//#include + +#include +//#include "winbase.h" +//#include "winerror.h" +#include +#include #include "msipriv.h" -#include "winuser.h" -#include "wine/unicode.h" +//#include "winuser.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/cond.tab.c b/reactos/dll/win32/msi/cond.tab.c index 8e074133db6..3a0b5337b65 100644 --- a/reactos/dll/win32/msi/cond.tab.c +++ b/reactos/dll/win32/msi/cond.tab.c @@ -99,27 +99,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "config.h" +#include #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +#include +//#include "msi.h" +//#include "msiquery.h" +#include +#include #include "msipriv.h" -#include "msiserver.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +#include +//#include "wine/list.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info diff --git a/reactos/dll/win32/msi/create.c b/reactos/dll/win32/msi/create.c index c679d6b131f..f48549e249a 100644 --- a/reactos/dll/win32/msi/create.c +++ b/reactos/dll/win32/msi/create.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "winnls.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" +//#include "winnls.h" #include "query.h" diff --git a/reactos/dll/win32/msi/custom.c b/reactos/dll/win32/msi/custom.c index a33f19d3512..92a8611f135 100644 --- a/reactos/dll/win32/msi/custom.c +++ b/reactos/dll/win32/msi/custom.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "msidefs.h" -#include "winuser.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +//#include "winerror.h" +//#include "msidefs.h" +#include +#include +#include #include "msipriv.h" -#include "msiserver.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/exception.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/database.c b/reactos/dll/win32/msi/database.c index 9c0d3466aba..731427dde78 100644 --- a/reactos/dll/win32/msi/database.c +++ b/reactos/dll/win32/msi/database.c @@ -18,27 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winreg.h" +//#include "winnls.h" +#include +#include +//#include "msi.h" #include "msiquery.h" -#include "msipriv.h" -#include "objidl.h" -#include "objbase.h" -#include "msiserver.h" +//#include "msipriv.h" +//#include "objidl.h" +#include +#include #include "query.h" -#include "initguid.h" +//#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/delete.c b/reactos/dll/win32/msi/delete.c index 4472409a0a0..9f65415e1bb 100644 --- a/reactos/dll/win32/msi/delete.c +++ b/reactos/dll/win32/msi/delete.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" #include "msipriv.h" -#include "winnls.h" +//#include "winnls.h" -#include "query.h" +//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/dialog.c b/reactos/dll/win32/msi/dialog.c index c0ff2043a5e..72df2494c71 100644 --- a/reactos/dll/win32/msi/dialog.c +++ b/reactos/dll/win32/msi/dialog.c @@ -18,30 +18,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "msi.h" +#include +//#include "winbase.h" +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "msi.h" #include "msipriv.h" -#include "msidefs.h" -#include "ocidl.h" -#include "olectl.h" -#include "richedit.h" -#include "commctrl.h" -#include "winreg.h" -#include "shlwapi.h" -#include "msiserver.h" +//#include "msidefs.h" +//#include "ocidl.h" +#include +#include +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/distinct.c b/reactos/dll/win32/msi/distinct.c index 04f09fa4913..dbefc952fcf 100644 --- a/reactos/dll/win32/msi/distinct.c +++ b/reactos/dll/win32/msi/distinct.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" #include "msipriv.h" -#include "winnls.h" +//#include "winnls.h" -#include "query.h" +//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/drop.c b/reactos/dll/win32/msi/drop.c index f0b58039fd3..cab2a593ac3 100644 --- a/reactos/dll/win32/msi/drop.c +++ b/reactos/dll/win32/msi/drop.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" #include "query.h" diff --git a/reactos/dll/win32/msi/events.c b/reactos/dll/win32/msi/events.c index 707a4a235fd..b5b69d05819 100644 --- a/reactos/dll/win32/msi/events.c +++ b/reactos/dll/win32/msi/events.c @@ -18,18 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "msi.h" +//#include +//#include + +//#include +//#include "winbase.h" +//#include "winerror.h" +//#include "winreg.h" +//#include "msi.h" #include "msipriv.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/files.c b/reactos/dll/win32/msi/files.c index 7202fb637cd..68907516164 100644 --- a/reactos/dll/win32/msi/files.c +++ b/reactos/dll/win32/msi/files.c @@ -30,20 +30,24 @@ * RemoveFiles */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "fdi.h" -#include "msi.h" -#include "msidefs.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "fdi.h" +//#include "msi.h" +//#include "msidefs.h" #include "msipriv.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wine/unicode.h" +//#include "winuser.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/font.c b/reactos/dll/win32/msi/font.c index 0b728a35567..00a4985725a 100644 --- a/reactos/dll/win32/msi/font.c +++ b/reactos/dll/win32/msi/font.c @@ -18,14 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +#include +//#include "winbase.h" +//#include "winerror.h" +#include +#include #include "msipriv.h" -#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/format.c b/reactos/dll/win32/msi/format.c index 756c4d1bd4b..c3fcbcf127f 100644 --- a/reactos/dll/win32/msi/format.c +++ b/reactos/dll/win32/msi/format.c @@ -19,23 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "winnls.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +//#include "winerror.h" +#include +//#include "msi.h" +//#include "winnls.h" +#include +#include #include "msipriv.h" -#include "msiserver.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/handle.c b/reactos/dll/win32/msi/handle.c index 80c68739816..0c196574b02 100644 --- a/reactos/dll/win32/msi/handle.c +++ b/reactos/dll/win32/msi/handle.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winreg.h" +//#include "shlwapi.h" +#include +//#include "msi.h" +//#include "msiquery.h" #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/insert.c b/reactos/dll/win32/msi/insert.c index c404929f285..ad42e6bf0d6 100644 --- a/reactos/dll/win32/msi/insert.c +++ b/reactos/dll/win32/msi/insert.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "winnls.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" +//#include "winnls.h" #include "query.h" diff --git a/reactos/dll/win32/msi/install.c b/reactos/dll/win32/msi/install.c index 5810a1ebfdb..7a7dc28e998 100644 --- a/reactos/dll/win32/msi/install.c +++ b/reactos/dll/win32/msi/install.c @@ -20,22 +20,26 @@ /* Msi top level apis directly related to installs */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include #include "windef.h" #include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msidefs.h" -#include "objbase.h" -#include "oleauto.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msidefs.h" +#include +#include #include "msipriv.h" -#include "msiserver.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/media.c b/reactos/dll/win32/msi/media.c index 612624df6bf..0473bb864d4 100644 --- a/reactos/dll/win32/msi/media.c +++ b/reactos/dll/win32/msi/media.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winerror.h" -#include "wine/debug.h" -#include "fdi.h" +//#include "windef.h" +//#include "winerror.h" +#include +//#include "fdi.h" #include "msipriv.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "objidl.h" -#include "wine/unicode.h" +#include +#include +#include +//#include "objidl.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/msi.c b/reactos/dll/win32/msi/msi.c index 92ef52cbc15..5d9b0fc60ee 100644 --- a/reactos/dll/win32/msi/msi.c +++ b/reactos/dll/win32/msi/msi.c @@ -18,35 +18,39 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "shlwapi.h" -#include "msi.h" -#include "msidefs.h" -#include "msiquery.h" +#include +#include +#include +//#include "winnls.h" +#include +//#include "msi.h" +//#include "msidefs.h" +//#include "msiquery.h" #include "msipriv.h" -#include "msiserver.h" -#include "wincrypt.h" -#include "winver.h" -#include "winuser.h" -#include "shlobj.h" -#include "shobjidl.h" -#include "objidl.h" -#include "wintrust.h" -#include "softpub.h" +#include +//#include "wincrypt.h" +//#include "winver.h" +//#include "winuser.h" +#include +//#include "shobjidl.h" +//#include "objidl.h" +//#include "wintrust.h" +#include -#include "initguid.h" -#include "msxml2.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/msi.rc b/reactos/dll/win32/msi/msi.rc index 6a28423f37c..d8ac3296ec4 100644 --- a/reactos/dll/win32/msi/msi.rc +++ b/reactos/dll/win32/msi/msi.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +#include LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT @@ -87,4 +87,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION 4,5,6001,22299 #define WINE_PRODUCTVERSION_STR "4.5.6001.22299" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/msi/msi_main.c b/reactos/dll/win32/msi/msi_main.c index 46f9ed8db11..42d86003ddb 100644 --- a/reactos/dll/win32/msi/msi_main.c +++ b/reactos/dll/win32/msi/msi_main.c @@ -18,21 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" -#include "oleauto.h" -#include "rpcproxy.h" +#include +#include +#include +#include +//#include "oleauto.h" +#include #include "msipriv.h" -#include "msiserver.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/msipriv.h b/reactos/dll/win32/msi/msipriv.h index 4110ec6166a..c12303dee1b 100644 --- a/reactos/dll/win32/msi/msipriv.h +++ b/reactos/dll/win32/msi/msipriv.h @@ -25,17 +25,17 @@ #include #include "windef.h" -#include "winbase.h" +#include #include "fdi.h" #include "msi.h" -#include "msiquery.h" -#include "msidefs.h" +#include +#include #include "objbase.h" #include "objidl.h" -#include "fusion.h" +#include #include "winnls.h" #include "winver.h" -#include "wine/list.h" +#include #include "wine/debug.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); diff --git a/reactos/dll/win32/msi/msiquery.c b/reactos/dll/win32/msi/msiquery.c index 451fdddbbb0..cf8d893d65f 100644 --- a/reactos/dll/win32/msi/msiquery.c +++ b/reactos/dll/win32/msi/msiquery.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" +//#include "winnls.h" #include "query.h" -#include "msiserver.h" +#include -#include "initguid.h" +//#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/package.c b/reactos/dll/win32/msi/package.c index 3055175773b..436830b570b 100644 --- a/reactos/dll/win32/msi/package.c +++ b/reactos/dll/win32/msi/package.c @@ -18,34 +18,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "shlwapi.h" -#include "wingdi.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objidl.h" -#include "wincrypt.h" -#include "winuser.h" -#include "wininet.h" -#include "winver.h" -#include "urlmon.h" -#include "shlobj.h" -#include "wine/unicode.h" -#include "objbase.h" -#include "msidefs.h" -#include "sddl.h" +#include +#include +#include +//#include "winnls.h" +#include +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objidl.h" +//#include "wincrypt.h" +//#include "winuser.h" +#include +//#include "winver.h" +//#include "urlmon.h" +#include +#include +//#include "objbase.h" +//#include "msidefs.h" +#include #include "msipriv.h" -#include "msiserver.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/patch.c b/reactos/dll/win32/msi/patch.c index 59785a690f2..10263626f73 100644 --- a/reactos/dll/win32/msi/patch.c +++ b/reactos/dll/win32/msi/patch.c @@ -19,15 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +#include +#include +#include +#include #include "msipriv.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/query.h b/reactos/dll/win32/msi/query.h index ca34b4c5d38..c0de82bd706 100644 --- a/reactos/dll/win32/msi/query.h +++ b/reactos/dll/win32/msi/query.h @@ -21,16 +21,16 @@ #ifndef __WINE_MSI_QUERY_H #define __WINE_MSI_QUERY_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "objidl.h" -#include "msi.h" -#include "msiquery.h" +//#include "windef.h" +//#include "winbase.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msi.h" +//#include "msiquery.h" #include "msipriv.h" -#include "wine/list.h" +//#include "wine/list.h" #define OP_EQ 1 diff --git a/reactos/dll/win32/msi/record.c b/reactos/dll/win32/msi/record.c index dd097ea46e8..178ffe3157b 100644 --- a/reactos/dll/win32/msi/record.c +++ b/reactos/dll/win32/msi/record.c @@ -18,27 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" #include "msipriv.h" -#include "objidl.h" -#include "winnls.h" -#include "ole2.h" +//#include "objidl.h" +//#include "winnls.h" +#include -#include "winreg.h" -#include "shlwapi.h" +#include +#include -#include "query.h" +//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/registry.c b/reactos/dll/win32/msi/registry.c index 388c0772808..7a6f1a0424d 100644 --- a/reactos/dll/win32/msi/registry.c +++ b/reactos/dll/win32/msi/registry.c @@ -19,24 +19,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "msi.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" +//#include "shlwapi.h" +#include +//#include "msi.h" #include "msipriv.h" -#include "wincrypt.h" -#include "wine/unicode.h" -#include "winver.h" -#include "winuser.h" -#include "sddl.h" +//#include "wincrypt.h" +#include +//#include "winver.h" +//#include "winuser.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/script.c b/reactos/dll/win32/msi/script.c index 8d48a9411ae..7a4642ab4d3 100644 --- a/reactos/dll/win32/msi/script.c +++ b/reactos/dll/win32/msi/script.c @@ -18,21 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "msidefs.h" +#include +//#include "winbase.h" +//#include "winerror.h" +//#include "winuser.h" +//#include "msidefs.h" #include "msipriv.h" -#include "activscp.h" -#include "oleauto.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +#include -#include "msiserver.h" +//#include "msiserver.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/select.c b/reactos/dll/win32/msi/select.c index e8f38855a86..cc6321662f4 100644 --- a/reactos/dll/win32/msi/select.c +++ b/reactos/dll/win32/msi/select.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" #include "msipriv.h" -#include "winnls.h" +//#include "winnls.h" -#include "query.h" +//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/source.c b/reactos/dll/win32/msi/source.c index ab8541c170c..6c70464fae5 100644 --- a/reactos/dll/win32/msi/source.c +++ b/reactos/dll/win32/msi/source.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" +//#include "shlwapi.h" +#include +//#include "msi.h" +//#include "msiquery.h" #include "msipriv.h" -#include "wincrypt.h" -#include "winver.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "sddl.h" +//#include "wincrypt.h" +//#include "winver.h" +//#include "winuser.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/sql.tab.c b/reactos/dll/win32/msi/sql.tab.c index 2ff29c5ef5a..f64d8ccced7 100644 --- a/reactos/dll/win32/msi/sql.tab.c +++ b/reactos/dll/win32/msi/sql.tab.c @@ -98,19 +98,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "config.h" +#include #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" +#include +//#include "winbase.h" #include "query.h" -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "wine/list.h" +#include +#include #define YYLEX_PARAM info #define YYPARSE_PARAM info diff --git a/reactos/dll/win32/msi/storages.c b/reactos/dll/win32/msi/storages.c index 35c1de5903d..d3172ccfca2 100644 --- a/reactos/dll/win32/msi/storages.c +++ b/reactos/dll/win32/msi/storages.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "ole2.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" #include "msipriv.h" -#include "query.h" +//#include "query.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/streams.c b/reactos/dll/win32/msi/streams.c index d9d632fafbc..946f1186440 100644 --- a/reactos/dll/win32/msi/streams.c +++ b/reactos/dll/win32/msi/streams.c @@ -18,21 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" #include "msipriv.h" -#include "query.h" +//#include "query.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/string.c b/reactos/dll/win32/msi/string.c index 8e3e575f502..d71e6f1fe0b 100644 --- a/reactos/dll/win32/msi/string.c +++ b/reactos/dll/win32/msi/string.c @@ -20,24 +20,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" #include "msipriv.h" -#include "winnls.h" +//#include "winnls.h" -#include "query.h" +//#include "query.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/suminfo.c b/reactos/dll/win32/msi/suminfo.c index e0c99b8b488..6c92473f4e4 100644 --- a/reactos/dll/win32/msi/suminfo.c +++ b/reactos/dll/win32/msi/suminfo.c @@ -18,29 +18,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "msidefs.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" +//#include "shlwapi.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "msidefs.h" #include "msipriv.h" -#include "objidl.h" -#include "propvarutil.h" -#include "msiserver.h" +//#include "objidl.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); -#include "pshpack1.h" +#include typedef struct { WORD wByteOrder; @@ -78,7 +82,7 @@ typedef struct { } u; } PROPERTY_DATA; -#include "poppack.h" +#include static HRESULT (WINAPI *pPropVariantChangeType) (PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, diff --git a/reactos/dll/win32/msi/table.c b/reactos/dll/win32/msi/table.c index e2186fcb3cf..dc53b13d684 100644 --- a/reactos/dll/win32/msi/table.c +++ b/reactos/dll/win32/msi/table.c @@ -18,26 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "winnls.h" -#include "msipriv.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "winnls.h" +//#include "msipriv.h" #include "query.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msidb); diff --git a/reactos/dll/win32/msi/tokenize.c b/reactos/dll/win32/msi/tokenize.c index 441a54aff3d..28bdde309a5 100644 --- a/reactos/dll/win32/msi/tokenize.c +++ b/reactos/dll/win32/msi/tokenize.c @@ -16,13 +16,17 @@ ** parser for analysis. */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" +//#include +//#include +//#include + +//#include "windef.h" +//#include "winbase.h" +#include #include "query.h" #include "sql.tab.h" diff --git a/reactos/dll/win32/msi/update.c b/reactos/dll/win32/msi/update.c index d0e3c28f792..a29c2bae864 100644 --- a/reactos/dll/win32/msi/update.c +++ b/reactos/dll/win32/msi/update.c @@ -18,18 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "winnls.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" +//#include "winnls.h" #include "query.h" diff --git a/reactos/dll/win32/msi/upgrade.c b/reactos/dll/win32/msi/upgrade.c index cd0ec06e6e2..fe567182d23 100644 --- a/reactos/dll/win32/msi/upgrade.c +++ b/reactos/dll/win32/msi/upgrade.c @@ -26,17 +26,21 @@ * RemoveExistingProducts (TODO) */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "wine/debug.h" -#include "msidefs.h" +//#include + +#include +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msidefs.h" #include "msipriv.h" -#include "winuser.h" -#include "wine/unicode.h" +//#include "winuser.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/reactos/dll/win32/msi/where.c b/reactos/dll/win32/msi/where.c index 1bf77889580..01cf141a182 100644 --- a/reactos/dll/win32/msi/where.c +++ b/reactos/dll/win32/msi/where.c @@ -19,20 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include +#include +//#include "msi.h" +//#include "msiquery.h" +//#include "objbase.h" +//#include "objidl.h" +//#include "msipriv.h" +//#include "winnls.h" #include "query.h" diff --git a/reactos/dll/win32/msimg32/msimg32_main.c b/reactos/dll/win32/msimg32/msimg32_main.c index 9e859c818d7..80df7fe225a 100644 --- a/reactos/dll/win32/msimg32/msimg32_main.c +++ b/reactos/dll/win32/msimg32/msimg32_main.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "wine/debug.h" +#include +#include +//#include "wingdi.h" +//#include "winerror.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msimg32); diff --git a/reactos/dll/win32/msimtf/activeimmapp.c b/reactos/dll/win32/msimtf/activeimmapp.c index 835e5ff8f3c..4cd77a4ff70 100644 --- a/reactos/dll/win32/msimtf/activeimmapp.c +++ b/reactos/dll/win32/msimtf/activeimmapp.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winuser.h" -#include "winerror.h" -#include "objbase.h" -#include "dimm.h" -#include "imm.h" +#include +#include +#include +//#include "winreg.h" +//#include "winuser.h" +//#include "winerror.h" +#include +#include +//#include "imm.h" -#include "wine/unicode.h" +//#include "wine/unicode.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msimtf); diff --git a/reactos/dll/win32/msimtf/main.c b/reactos/dll/win32/msimtf/main.c index cfd7443a709..c5b823e6cda 100644 --- a/reactos/dll/win32/msimtf/main.c +++ b/reactos/dll/win32/msimtf/main.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "dimm.h" +#include +#include +#include +//#include "winuser.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msimtf); diff --git a/reactos/dll/win32/msisip/main.c b/reactos/dll/win32/msisip/main.c index 98a57437aad..4e9542f9ddb 100644 --- a/reactos/dll/win32/msisip/main.c +++ b/reactos/dll/win32/msisip/main.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "mssip.h" +#include +#include +#include +#include #define COBJMACROS -#include "objbase.h" -#include "initguid.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msisip); diff --git a/reactos/dll/win32/msisys.ocx/msisys.c b/reactos/dll/win32/msisys.ocx/msisys.c index 3863fbae64d..f659d6f710a 100644 --- a/reactos/dll/win32/msisys.ocx/msisys.c +++ b/reactos/dll/win32/msisys.ocx/msisys.c @@ -18,18 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" +#include +//#include "winerror.h" +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "objbase.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msisys); diff --git a/reactos/dll/win32/msports/msports.rc b/reactos/dll/win32/msports/msports.rc index f7b1e67b42c..6c6276f64c9 100644 --- a/reactos/dll/win32/msports/msports.rc +++ b/reactos/dll/win32/msports/msports.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/msports/precomp.h b/reactos/dll/win32/msports/precomp.h index b51ed797152..fff221b737f 100644 --- a/reactos/dll/win32/msports/precomp.h +++ b/reactos/dll/win32/msports/precomp.h @@ -1,15 +1,14 @@ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include +#include +#include #include -#include #include #include -#include -#include - #include -//#include - #include "internal.h" #include "resource.h" diff --git a/reactos/dll/win32/msports/resource.h b/reactos/dll/win32/msports/resource.h index de46f09ff7f..6dc4a033e84 100644 --- a/reactos/dll/win32/msports/resource.h +++ b/reactos/dll/win32/msports/resource.h @@ -1,3 +1,4 @@ +#pragma once #define IDD_SERIALSETTINGS 200 #define IDC_SERIAL_BITSPERSECOND 201 diff --git a/reactos/dll/win32/msrle32/msrle32.c b/reactos/dll/win32/msrle32/msrle32.c index e1570279c1a..3bd9887307d 100644 --- a/reactos/dll/win32/msrle32/msrle32.c +++ b/reactos/dll/win32/msrle32/msrle32.c @@ -25,10 +25,10 @@ #include "msrle_private.h" -#include "winnls.h" -#include "winuser.h" +//#include "winnls.h" +//#include "winuser.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msrle32); diff --git a/reactos/dll/win32/msrle32/msrle_private.h b/reactos/dll/win32/msrle32/msrle_private.h index bf2aed03213..58bb7b4a78a 100644 --- a/reactos/dll/win32/msrle32/msrle_private.h +++ b/reactos/dll/win32/msrle32/msrle_private.h @@ -19,16 +19,20 @@ #ifndef __MSRLE32_PRIVATE_H #define __MSRLE32_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #ifndef RC_INVOKED #include #endif -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfw.h" +#include +#include +//#include "mmsystem.h" +#include +//#include "winuser.h" +#include #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/reactos/dll/win32/msrle32/rsrc.rc b/reactos/dll/win32/msrle32/rsrc.rc index c1aead966fd..c0e55ab4a18 100644 --- a/reactos/dll/win32/msrle32/rsrc.rc +++ b/reactos/dll/win32/msrle32/rsrc.rc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" -#include "msrle_private.h" +//#include "msrle_private.h" /* * Everything specific to any language goes diff --git a/reactos/dll/win32/mssign32/mssign32_main.c b/reactos/dll/win32/mssign32/mssign32_main.c index ef1065fe50e..f3e10bdb641 100644 --- a/reactos/dll/win32/mssign32/mssign32_main.c +++ b/reactos/dll/win32/mssign32/mssign32_main.c @@ -18,15 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mssign); diff --git a/reactos/dll/win32/mssip32/main.c b/reactos/dll/win32/mssip32/main.c index 7d137018114..7a1896b071f 100644 --- a/reactos/dll/win32/mssip32/main.c +++ b/reactos/dll/win32/mssip32/main.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mssip32); diff --git a/reactos/dll/win32/mstask/factory.c b/reactos/dll/win32/mstask/factory.c index 9dc1e2932db..cefd9a955e3 100644 --- a/reactos/dll/win32/mstask/factory.c +++ b/reactos/dll/win32/mstask/factory.c @@ -17,7 +17,7 @@ */ #include "mstask_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/reactos/dll/win32/mstask/mstask_main.c b/reactos/dll/win32/mstask/mstask_main.c index 2a13bae6e75..c109d2772df 100644 --- a/reactos/dll/win32/mstask/mstask_main.c +++ b/reactos/dll/win32/mstask/mstask_main.c @@ -16,13 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "mstask_private.h" -#include "objbase.h" -#include "rpcproxy.h" +//#include "objbase.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/reactos/dll/win32/mstask/mstask_private.h b/reactos/dll/win32/mstask/mstask_private.h index 17c20fee432..6ef0cae2957 100644 --- a/reactos/dll/win32/mstask/mstask_private.h +++ b/reactos/dll/win32/mstask/mstask_private.h @@ -19,15 +19,19 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "mstask.h" +#include +#include +//#include "winuser.h" +#include +#include extern LONG dll_ref DECLSPEC_HIDDEN; diff --git a/reactos/dll/win32/mstask/task.c b/reactos/dll/win32/mstask/task.c index 97ae8b7b671..c88b65b11e6 100644 --- a/reactos/dll/win32/mstask/task.c +++ b/reactos/dll/win32/mstask/task.c @@ -17,7 +17,7 @@ */ #include "mstask_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/reactos/dll/win32/mstask/task_scheduler.c b/reactos/dll/win32/mstask/task_scheduler.c index 1d2ac219cf8..fa418e5287a 100644 --- a/reactos/dll/win32/mstask/task_scheduler.c +++ b/reactos/dll/win32/mstask/task_scheduler.c @@ -16,9 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "corerror.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include "mstask_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/reactos/dll/win32/mstask/task_trigger.c b/reactos/dll/win32/mstask/task_trigger.c index 307a60540b5..f175eaea940 100644 --- a/reactos/dll/win32/mstask/task_trigger.c +++ b/reactos/dll/win32/mstask/task_trigger.c @@ -16,10 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "winternl.h" +#include #include "mstask_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mstask); diff --git a/reactos/dll/win32/msvcrt/dllmain.c b/reactos/dll/win32/msvcrt/dllmain.c index f7e972561e2..5650fe0a431 100644 --- a/reactos/dll/win32/msvcrt/dllmain.c +++ b/reactos/dll/win32/msvcrt/dllmain.c @@ -15,7 +15,7 @@ * */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); diff --git a/reactos/dll/win32/msvcrt/precomp.h b/reactos/dll/win32/msvcrt/precomp.h index 7fb87800003..7564b719fcf 100644 --- a/reactos/dll/win32/msvcrt/precomp.h +++ b/reactos/dll/win32/msvcrt/precomp.h @@ -1,19 +1,17 @@ #ifndef _CRT_PRECOMP_H #define _CRT_PRECOMP_H -#include -#include -#include -#include +#define WIN32_NO_STATUS + +//#include +//#include +//#include +//#include #include #include #include -#include +//#include -#include -#include -#include - -#include "wine/debug.h" +#include #endif /* _CRT_PRECOMP_H */ diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.c b/reactos/dll/win32/msvcrt20/msvcrt20.c index e06a3902b7b..7377faf7d02 100644 --- a/reactos/dll/win32/msvcrt20/msvcrt20.c +++ b/reactos/dll/win32/msvcrt20/msvcrt20.c @@ -18,17 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define _CRT_PRECOMP_H #include -#include -#include +//#include +//#include #include #include -#include -#include +//#include +//#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* EXTERNAL PROTOTYPES ********************************************************/ diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.c b/reactos/dll/win32/msvcrt40/msvcrt40.c index aa2201f52f4..bd030c33d9c 100644 --- a/reactos/dll/win32/msvcrt40/msvcrt40.c +++ b/reactos/dll/win32/msvcrt40/msvcrt40.c @@ -18,17 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS + +#include +//#include #define _CRT_PRECOMP_H #include -#include -#include +//#include +//#include #include #include -#include -#include +//#include +//#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* EXTERNAL PROTOTYPES ********************************************************/ diff --git a/reactos/dll/win32/msvfw32/drawdib.c b/reactos/dll/win32/msvfw32/drawdib.c index 9877e628bc7..6acec39bd2a 100644 --- a/reactos/dll/win32/msvfw32/drawdib.c +++ b/reactos/dll/win32/msvfw32/drawdib.c @@ -20,17 +20,21 @@ * Handle palettes */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfw.h" +#include +#include +#include +//#include "winuser.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msvideo); diff --git a/reactos/dll/win32/msvfw32/mciwnd.c b/reactos/dll/win32/msvfw32/mciwnd.c index bf23a63b3b7..b221e8a855c 100644 --- a/reactos/dll/win32/msvfw32/mciwnd.c +++ b/reactos/dll/win32/msvfw32/mciwnd.c @@ -21,19 +21,23 @@ * Add support for MCIWNDF_RECORD. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "winternl.h" -#include "vfw.h" -#include "digitalv.h" -#include "commctrl.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +//#include "winnls.h" +#include +//#include "winuser.h" +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mci); diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c index ae8d6d2f809..815ef9560a1 100644 --- a/reactos/dll/win32/msvfw32/msvideo_main.c +++ b/reactos/dll/win32/msvfw32/msvideo_main.c @@ -26,20 +26,24 @@ * - no thread safety */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "vfw.h" +#include +//#include +//#include + +#include +#include +#include +#include +#include +#include +#include +#include #include "msvideo_private.h" -#include "wine/debug.h" +#include /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" diff --git a/reactos/dll/win32/msvfw32/rsrc.rc b/reactos/dll/win32/msvfw32/rsrc.rc index af3d16f19c4..e91fe25d4bc 100644 --- a/reactos/dll/win32/msvfw32/rsrc.rc +++ b/reactos/dll/win32/msvfw32/rsrc.rc @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" -#include "msvideo_private.h" +//#include "windef.h" +//#include "winuser.h" +//#include "msvideo_private.h" #ifdef LANGUAGE_DA_DK #include "msvfw32_Da.rc" diff --git a/reactos/dll/win32/msvidc32/msvideo1.c b/reactos/dll/win32/msvidc32/msvideo1.c index d01f07a9eea..2acaaca96fd 100644 --- a/reactos/dll/win32/msvidc32/msvideo1.c +++ b/reactos/dll/win32/msvidc32/msvideo1.c @@ -31,17 +31,21 @@ * if it's present, then the data is PAL8; RGB555 otherwise. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "vfw.h" -#include "mmsystem.h" +#include +#include +#include +//#include "winuser.h" +//#include "commdlg.h" +#include +//#include "mmsystem.h" #include "msvidc32_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msvidc32); diff --git a/reactos/dll/win32/msvidc32/rsrc.rc b/reactos/dll/win32/msvidc32/rsrc.rc index 4a417e9e13a..84bf2037705 100644 --- a/reactos/dll/win32/msvidc32/rsrc.rc +++ b/reactos/dll/win32/msvidc32/rsrc.rc @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "msvidc32_private.h" +//#include "windef.h" +//#include "msvidc32_private.h" #ifdef LANGUAGE_DA_DK #include "msvidc32_Da.rc" diff --git a/reactos/dll/win32/mswsock/mswsock.rc b/reactos/dll/win32/mswsock/mswsock.rc index 36b56163852..c66127fdd76 100644 --- a/reactos/dll/win32/mswsock/mswsock.rc +++ b/reactos/dll/win32/mswsock/mswsock.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 DLL\0" #define REACTOS_STR_INTERNAL_NAME "mswsock\0" diff --git a/reactos/dll/win32/mswsock/precomp.h b/reactos/dll/win32/mswsock/precomp.h index 681dec5f5b1..4faed6bf939 100644 --- a/reactos/dll/win32/mswsock/precomp.h +++ b/reactos/dll/win32/mswsock/precomp.h @@ -1,5 +1,10 @@ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include #include #include #include diff --git a/reactos/dll/win32/msxml/main.c b/reactos/dll/win32/msxml/main.c index 55e4ecd4050..68b07cd1d36 100644 --- a/reactos/dll/win32/msxml/main.c +++ b/reactos/dll/win32/msxml/main.c @@ -18,11 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include +#include +#include static HINSTANCE instance; diff --git a/reactos/dll/win32/msxml2/main.c b/reactos/dll/win32/msxml2/main.c index 096ddc2f73b..ffcd9364820 100644 --- a/reactos/dll/win32/msxml2/main.c +++ b/reactos/dll/win32/msxml2/main.c @@ -18,11 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include +#include +#include static HINSTANCE instance; diff --git a/reactos/dll/win32/msxml3/attribute.c b/reactos/dll/win32/msxml3/attribute.c index d461ce14c8f..edd33d019ae 100644 --- a/reactos/dll/win32/msxml3/attribute.c +++ b/reactos/dll/win32/msxml3/attribute.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include -# include +//# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/bsc.c b/reactos/dll/win32/msxml3/bsc.c index 580d509d795..999a83ae141 100644 --- a/reactos/dll/win32/msxml3/bsc.c +++ b/reactos/dll/win32/msxml3/bsc.c @@ -16,28 +16,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "wininet.h" -#include "urlmon.h" -#include "winreg.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +//#include "urlmon.h" +#include +#include -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/cdata.c b/reactos/dll/win32/msxml3/cdata.c index 6b3c06529f7..b7d8e3884e7 100644 --- a/reactos/dll/win32/msxml3/cdata.c +++ b/reactos/dll/win32/msxml3/cdata.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/comment.c b/reactos/dll/win32/msxml3/comment.c index be49e717f11..da99fc8e483 100644 --- a/reactos/dll/win32/msxml3/comment.c +++ b/reactos/dll/win32/msxml3/comment.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/dispex.c b/reactos/dll/win32/msxml3/dispex.c index 3aafc441c1a..4384f9836e7 100644 --- a/reactos/dll/win32/msxml3/dispex.c +++ b/reactos/dll/win32/msxml3/dispex.c @@ -16,30 +16,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" -#include "wininet.h" -#include "urlmon.h" -#include "winreg.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +//#include "wininet.h" +//#include "urlmon.h" +//#include "winreg.h" +//#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include +//#include "wine/unicode.h" #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/docfrag.c b/reactos/dll/win32/msxml3/docfrag.c index f0662906112..35cb5e3cdbf 100644 --- a/reactos/dll/win32/msxml3/docfrag.c +++ b/reactos/dll/win32/msxml3/docfrag.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/doctype.c b/reactos/dll/win32/msxml3/doctype.c index c045c79b39f..ec1b842a498 100644 --- a/reactos/dll/win32/msxml3/doctype.c +++ b/reactos/dll/win32/msxml3/doctype.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c index 54c601eebcd..15075e3f58b 100644 --- a/reactos/dll/win32/msxml3/domdoc.c +++ b/reactos/dll/win32/msxml3/domdoc.c @@ -19,37 +19,40 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION -#include "config.h" +#include -#include +//#include #include #ifdef HAVE_LIBXML2 # include -# include +//# include # include # include # include # include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "olectl.h" -#include "msxml6.h" -#include "wininet.h" -#include "winreg.h" -#include "shlwapi.h" -#include "ocidl.h" -#include "objsafe.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +#include +//#include "wininet.h" +//#include "winreg.h" +//#include "shlwapi.h" +//#include "ocidl.h" +#include -#include "wine/debug.h" -#include "wine/list.h" +#include +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/domimpl.c b/reactos/dll/win32/msxml3/domimpl.c index 7deb617b309..c19dc0e505d 100644 --- a/reactos/dll/win32/msxml3/domimpl.c +++ b/reactos/dll/win32/msxml3/domimpl.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/element.c b/reactos/dll/win32/msxml3/element.c index eee737e7e23..cfc4165f66d 100644 --- a/reactos/dll/win32/msxml3/element.c +++ b/reactos/dll/win32/msxml3/element.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/entityref.c b/reactos/dll/win32/msxml3/entityref.c index f2d46ababae..e28166ff466 100644 --- a/reactos/dll/win32/msxml3/entityref.c +++ b/reactos/dll/win32/msxml3/entityref.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/factory.c b/reactos/dll/win32/msxml3/factory.c index 1ad3a1e53c5..6f82e183968 100644 --- a/reactos/dll/win32/msxml3/factory.c +++ b/reactos/dll/win32/msxml3/factory.c @@ -19,29 +19,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml.h" -#include "msxml2.h" +#include +#include +//#include "winuser.h" +#include +//#include "msxml.h" +#include #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version independent CLSID as well as the v.3 one. */ #undef CLSID_DOMDocument -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/httprequest.c b/reactos/dll/win32/msxml3/httprequest.c index 5700311fa5f..7ddc49cd72e 100644 --- a/reactos/dll/win32/msxml3/httprequest.c +++ b/reactos/dll/win32/msxml3/httprequest.c @@ -19,35 +19,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include -# include +//# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wininet.h" -#include "winreg.h" -#include "winuser.h" -#include "ole2.h" -#include "mshtml.h" -#include "msxml6.h" -#include "objsafe.h" -#include "docobj.h" -#include "shlwapi.h" +#include +#include +#include +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include +#include #include "msxml_private.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/main.c b/reactos/dll/win32/msxml3/main.c index d2d6da8757e..4deee6a3033 100644 --- a/reactos/dll/win32/msxml3/main.c +++ b/reactos/dll/win32/msxml3/main.c @@ -19,15 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +#include #define COBJMACROS -#include +//#include #ifdef HAVE_LIBXML2 -# include -# include +//# include +//# include # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H # include @@ -40,17 +43,17 @@ # endif #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "msxml.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "msxml.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" -#include "wine/library.h" +//#include "wine/unicode.h" +#include +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/msxml_private.h b/reactos/dll/win32/msxml3/msxml_private.h index 8468e5551dc..e156ec26703 100644 --- a/reactos/dll/win32/msxml3/msxml_private.h +++ b/reactos/dll/win32/msxml3/msxml_private.h @@ -21,9 +21,9 @@ #ifndef __MSXML_PRIVATE__ #define __MSXML_PRIVATE__ -#include "dispex.h" +#include -#include "wine/unicode.h" +#include #ifndef __WINE_CONFIG_H # error You must include config.h to use this header diff --git a/reactos/dll/win32/msxml3/mxnamespace.c b/reactos/dll/win32/msxml3/mxnamespace.c index 7ec3f6e2330..f72bf6904f4 100644 --- a/reactos/dll/win32/msxml3/mxnamespace.c +++ b/reactos/dll/win32/msxml3/mxnamespace.c @@ -18,28 +18,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include -# include +//# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/mxwriter.c b/reactos/dll/win32/msxml3/mxwriter.c index f03ceb07fab..0069e4119b6 100644 --- a/reactos/dll/win32/msxml3/mxwriter.c +++ b/reactos/dll/win32/msxml3/mxwriter.c @@ -19,21 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#define COBJMACROS +#include + +//#include #ifdef HAVE_LIBXML2 # include #endif -#include "windef.h" -#include "winbase.h" -#include "ole2.h" +#include +#include +#include -#include "msxml6.h" +#include -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/node.c b/reactos/dll/win32/msxml3/node.c index 36602eb2f40..788bea8bd32 100644 --- a/reactos/dll/win32/msxml3/node.c +++ b/reactos/dll/win32/msxml3/node.c @@ -18,15 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include #define COBJMACROS -#include +//#include #ifdef HAVE_LIBXML2 -# include -# include +//# include +//# include # include # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H @@ -40,16 +43,16 @@ # endif #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/nodelist.c b/reactos/dll/win32/msxml3/nodelist.c index c3dcacfef10..6ed73de22d9 100644 --- a/reactos/dll/win32/msxml3/nodelist.c +++ b/reactos/dll/win32/msxml3/nodelist.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml2did.h" +#include +#include +//#include "winuser.h" +#include +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include /* This file implements the object returned by childNodes property. Note that this is * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. diff --git a/reactos/dll/win32/msxml3/nodemap.c b/reactos/dll/win32/msxml3/nodemap.c index 94faf9faf81..61982ae6ed1 100644 --- a/reactos/dll/win32/msxml3/nodemap.c +++ b/reactos/dll/win32/msxml3/nodemap.c @@ -18,27 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include #define COBJMACROS -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml2did.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/parseerror.c b/reactos/dll/win32/msxml3/parseerror.c index b5c79480d7b..91abf5df0f6 100644 --- a/reactos/dll/win32/msxml3/parseerror.c +++ b/reactos/dll/win32/msxml3/parseerror.c @@ -18,27 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winerror.h" +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/pi.c b/reactos/dll/win32/msxml3/pi.c index 4d1cab7948f..73a318c4bf0 100644 --- a/reactos/dll/win32/msxml3/pi.c +++ b/reactos/dll/win32/msxml3/pi.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/saxreader.c b/reactos/dll/win32/msxml3/saxreader.c index 9ebdc0f611f..19d8e69a5fa 100644 --- a/reactos/dll/win32/msxml3/saxreader.c +++ b/reactos/dll/win32/msxml3/saxreader.c @@ -18,31 +18,34 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 -# include -# include -# include +//# include +//# include +//# include # include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" -#include "wininet.h" -#include "urlmon.h" -#include "winreg.h" -#include "shlwapi.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +//#include "wininet.h" +//#include "urlmon.h" +//#include "winreg.h" +//#include "shlwapi.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/schema.c b/reactos/dll/win32/msxml3/schema.c index b55a535b0e0..f0413842e50 100644 --- a/reactos/dll/win32/msxml3/schema.c +++ b/reactos/dll/win32/msxml3/schema.c @@ -19,32 +19,35 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include +//#include #ifdef HAVE_LIBXML2 -# include -# include +//# include +//# include # include # include -# include -# include +//# include +//# include # include -# include -# include +//# include +//# include # include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/selection.c b/reactos/dll/win32/msxml3/selection.c index bb0f42ecd6f..eeb7203aab1 100644 --- a/reactos/dll/win32/msxml3/selection.c +++ b/reactos/dll/win32/msxml3/selection.c @@ -20,28 +20,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 -# include -# include -# include +//# include +//# include +//# include # include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml2did.h" +#include +#include +//#include "winuser.h" +#include +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include /* This file implements the object returned by a XPath query. Note that this is * not the IXMLDOMNodeList returned by childNodes - it's implemented in nodelist.c. diff --git a/reactos/dll/win32/msxml3/stylesheet.c b/reactos/dll/win32/msxml3/stylesheet.c index 9106b404a03..3c85de36441 100644 --- a/reactos/dll/win32/msxml3/stylesheet.c +++ b/reactos/dll/win32/msxml3/stylesheet.c @@ -18,25 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/text.c b/reactos/dll/win32/msxml3/text.c index 6fb29f9e3f9..dd761342ed6 100644 --- a/reactos/dll/win32/msxml3/text.c +++ b/reactos/dll/win32/msxml3/text.c @@ -19,25 +19,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/uuid.c b/reactos/dll/win32/msxml3/uuid.c index 4abbe5e4763..0fcedc20260 100644 --- a/reactos/dll/win32/msxml3/uuid.c +++ b/reactos/dll/win32/msxml3/uuid.c @@ -24,22 +24,25 @@ * Therefore we roll our own. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +#include /* * First include the version 2 headers so that we don't redefine their * uuids - they're already in libuuid */ -#include "msxml.h" +//#include "msxml.h" /* Now we can initialize the rest of the uuids */ -#include "initguid.h" -#include "msxml2.h" +#include +#include /* * Note that because of a #define in msxml2.h, we end up initializing diff --git a/reactos/dll/win32/msxml3/xdr.c b/reactos/dll/win32/msxml3/xdr.c index af869071843..9abee989391 100644 --- a/reactos/dll/win32/msxml3/xdr.c +++ b/reactos/dll/win32/msxml3/xdr.c @@ -19,14 +19,14 @@ */ -#include "config.h" +#include #include #ifdef HAVE_LIBXML2 # include #endif -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/xmldoc.c b/reactos/dll/win32/msxml3/xmldoc.c index 1cf87855878..3bb300480d0 100644 --- a/reactos/dll/win32/msxml3/xmldoc.c +++ b/reactos/dll/win32/msxml3/xmldoc.c @@ -18,27 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "wininet.h" -#include "winreg.h" -#include "shlwapi.h" -#include "ocidl.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include +#include +//#include "ocidl.h" -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/xmlelem.c b/reactos/dll/win32/msxml3/xmlelem.c index 679e159b5dc..830e6721501 100644 --- a/reactos/dll/win32/msxml3/xmlelem.c +++ b/reactos/dll/win32/msxml3/xmlelem.c @@ -18,24 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "ocidl.h" +#include +#include +//#include "winuser.h" +#include +#include +//#include "ocidl.h" -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/xmlparser.c b/reactos/dll/win32/msxml3/xmlparser.c index f18f454aedb..9a500e58c27 100644 --- a/reactos/dll/win32/msxml3/xmlparser.c +++ b/reactos/dll/win32/msxml3/xmlparser.c @@ -17,29 +17,32 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include -#include +//#include #ifdef HAVE_LIBXML2 # include -# include -# include +//# include +//# include #endif -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" +#include +#include +//#include "winuser.h" +#include +#include #include "msxml_private.h" -#include "initguid.h" +#include #include "xmlparser.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/xmlview.c b/reactos/dll/win32/msxml3/xmlview.c index c2e6f1ebfee..17ad84aed80 100644 --- a/reactos/dll/win32/msxml3/xmlview.c +++ b/reactos/dll/win32/msxml3/xmlview.c @@ -16,9 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #define COBJMACROS #define NONAMELESSUNION @@ -27,16 +30,17 @@ #include #endif -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "msxml6.h" -#include "mshtml.h" -#include "mshtmhst.h" -#include "perhist.h" -#include "docobj.h" +#include +#include +#include +#include +#include +#include +#include +#include +//#include "docobj.h" -#include "wine/debug.h" +#include #include "msxml_private.h" diff --git a/reactos/dll/win32/msxml3/xslpattern.h b/reactos/dll/win32/msxml3/xslpattern.h index 7b3ee2c7275..699112e4fa1 100644 --- a/reactos/dll/win32/msxml3/xslpattern.h +++ b/reactos/dll/win32/msxml3/xslpattern.h @@ -33,8 +33,8 @@ #include #include -#include "windef.h" -#include "winnt.h" +#include +//#include "winnt.h" typedef struct _parser_param { void* yyscanner; diff --git a/reactos/dll/win32/msxml3/xslpattern.tab.c b/reactos/dll/win32/msxml3/xslpattern.tab.c index f2a14c5b91f..70d9f382697 100644 --- a/reactos/dll/win32/msxml3/xslpattern.tab.c +++ b/reactos/dll/win32/msxml3/xslpattern.tab.c @@ -78,13 +78,13 @@ /* Line 189 of yacc.c */ #line 21 "xslpattern.y" -#include "config.h" -#include "wine/port.h" +#include +#include #ifdef HAVE_LIBXML2 #include "xslpattern.h" #include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/reactos/dll/win32/msxml3/xslpattern.yy.c b/reactos/dll/win32/msxml3/xslpattern.yy.c index dd2cc38d69c..489a47474e5 100644 --- a/reactos/dll/win32/msxml3/xslpattern.yy.c +++ b/reactos/dll/win32/msxml3/xslpattern.yy.c @@ -18,9 +18,9 @@ /* begin standard C headers. */ #include -#include -#include -#include +//#include +//#include +//#include /* end standard C headers. */ diff --git a/reactos/dll/win32/msxml4/main.c b/reactos/dll/win32/msxml4/main.c index fbe7f9eb469..9643f341225 100644 --- a/reactos/dll/win32/msxml4/main.c +++ b/reactos/dll/win32/msxml4/main.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include +#include +#include static HINSTANCE instance; diff --git a/reactos/dll/win32/msxml6/main.c b/reactos/dll/win32/msxml6/main.c index 9c6f9876dec..32ff3108b59 100644 --- a/reactos/dll/win32/msxml6/main.c +++ b/reactos/dll/win32/msxml6/main.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include +#include +#include static HINSTANCE instance; diff --git a/reactos/dll/win32/nddeapi/nddeapi.c b/reactos/dll/win32/nddeapi/nddeapi.c index 84c636affb0..6f20bcc1dbe 100644 --- a/reactos/dll/win32/nddeapi/nddeapi.c +++ b/reactos/dll/win32/nddeapi/nddeapi.c @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +//#include + +//#include "windef.h" +//#include "winbase.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(nddeapi); diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.c b/reactos/dll/win32/netapi32/nbcmdqueue.c index 720826d8cc8..e201a39ca73 100644 --- a/reactos/dll/win32/netapi32/nbcmdqueue.c +++ b/reactos/dll/win32/netapi32/nbcmdqueue.c @@ -14,8 +14,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#include +#include #include "nbcmdqueue.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); diff --git a/reactos/dll/win32/netapi32/nbcmdqueue.h b/reactos/dll/win32/netapi32/nbcmdqueue.h index 9eb7075e7f0..a595f83f3f6 100644 --- a/reactos/dll/win32/netapi32/nbcmdqueue.h +++ b/reactos/dll/win32/netapi32/nbcmdqueue.h @@ -17,10 +17,14 @@ #ifndef __NBCMDQUEUE_H__ #define __NBCMDQUEUE_H__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "nb30.h" +#include +#include +#include /* This file defines a queue of pending NetBIOS commands. The queue operations * are thread safe, with the exception of NBCmdQueueDestroy: ensure no other diff --git a/reactos/dll/win32/netapi32/nbnamecache.c b/reactos/dll/win32/netapi32/nbnamecache.c index 5f9b0b515cc..0fcbfbe434f 100644 --- a/reactos/dll/win32/netapi32/nbnamecache.c +++ b/reactos/dll/win32/netapi32/nbnamecache.c @@ -19,8 +19,8 @@ * rather more efficient than not having a name cache at all. */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "nbnamecache.h" diff --git a/reactos/dll/win32/netapi32/nbnamecache.h b/reactos/dll/win32/netapi32/nbnamecache.h index ffefbc5b8a1..b8379c8fe21 100644 --- a/reactos/dll/win32/netapi32/nbnamecache.h +++ b/reactos/dll/win32/netapi32/nbnamecache.h @@ -17,11 +17,15 @@ #ifndef __WINE_NBNAMECACHE_H #define __WINE_NBNAMECACHE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "nb30.h" +#include +#include +#include struct NBNameCache; diff --git a/reactos/dll/win32/netapi32/nbt.c b/reactos/dll/win32/netapi32/nbt.c index 8c76b6efd45..74cde806e5f 100644 --- a/reactos/dll/win32/netapi32/nbt.c +++ b/reactos/dll/win32/netapi32/nbt.c @@ -65,15 +65,19 @@ * See also other FIXMEs in the code. */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include -#include "winsock2.h" -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" -#include "winreg.h" -#include "iphlpapi.h" +#include +#include +#include +#include +#include +#include #include "netbios.h" #include "nbnamecache.h" diff --git a/reactos/dll/win32/netapi32/netapi32.c b/reactos/dll/win32/netapi32/netapi32.c index a0a83470635..d147f2db878 100644 --- a/reactos/dll/win32/netapi32/netapi32.c +++ b/reactos/dll/win32/netapi32/netapi32.c @@ -17,15 +17,15 @@ */ #define WIN32_NO_STATUS -#include "config.h" +#include -#include "wine/debug.h" -#include "lm.h" +#include +//#include "lm.h" #include "netbios.h" #define NTOS_MODE_USER #include -#include "netapi32.h" +//#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); diff --git a/reactos/dll/win32/netapi32/netapi32.h b/reactos/dll/win32/netapi32/netapi32.h index 31dea807992..8279d1effa8 100644 --- a/reactos/dll/win32/netapi32/netapi32.h +++ b/reactos/dll/win32/netapi32/netapi32.h @@ -4,28 +4,28 @@ #include -#include "ntstatus.h" +//#include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmbrowsr.h" -#include "lmerr.h" -#include "lmshare.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "dsrole.h" -#include "dsgetdc.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +//#include "winerror.h" +//#include "lmcons.h" +#include +#include +#include +#include +//#include "lmshare.h" +//#include "lmuse.h" +#include +#include +#include +#include +//#include "wine/unicode.h" +#include #define NTOS_MODE_USER #include -#include "ntsam.h" +#include NET_API_STATUS diff --git a/reactos/dll/win32/netapi32/netbios.c b/reactos/dll/win32/netapi32/netbios.c index 89b2c2aa316..e835baf9b0c 100644 --- a/reactos/dll/win32/netapi32/netbios.c +++ b/reactos/dll/win32/netapi32/netbios.c @@ -14,8 +14,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" +#include +#include #include "nbcmdqueue.h" #include "netbios.h" diff --git a/reactos/dll/win32/netapi32/netbios.h b/reactos/dll/win32/netapi32/netbios.h index 1279a5ad2fc..6adbd3d126f 100644 --- a/reactos/dll/win32/netapi32/netbios.h +++ b/reactos/dll/win32/netapi32/netbios.h @@ -17,11 +17,11 @@ #ifndef __WINE_NETBIOS_H__ #define __WINE_NETBIOS_H__ -#include -#include "windef.h" -#include "winbase.h" -#include "lm.h" -#include "nb30.h" +//#include +#include +#include +#include +#include /* This file describes the interface WINE's NetBIOS implementation uses to * interact with a transport implementation (where a transport might be diff --git a/reactos/dll/win32/netapi32/share.c b/reactos/dll/win32/netapi32/share.c index 344bf0dbd88..b687a34b429 100644 --- a/reactos/dll/win32/netapi32/share.c +++ b/reactos/dll/win32/netapi32/share.c @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "lm.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" WINE_DEFAULT_DEBUG_CHANNEL(share); diff --git a/reactos/dll/win32/netapi32/wksta.c b/reactos/dll/win32/netapi32/wksta.c index fbc05f4ddaf..836d34a14e7 100644 --- a/reactos/dll/win32/netapi32/wksta.c +++ b/reactos/dll/win32/netapi32/wksta.c @@ -18,26 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include -#include "ntstatus.h" +//#include +#include #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winsock2.h" -#include "nb30.h" -#include "lmcons.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmwksta.h" -#include "iphlpapi.h" -#include "winerror.h" -#include "ntsecapi.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +//#include "winsock2.h" +//#include "nb30.h" +//#include "lmcons.h" +//#include "lmapibuf.h" +//#include "lmerr.h" +//#include "lmwksta.h" +#include +//#include "winerror.h" +#include #include "netbios.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(netapi32); diff --git a/reactos/dll/win32/netcfgx/netcfgx.rc b/reactos/dll/win32/netcfgx/netcfgx.rc index 93bbc0b05d2..2fa5319d2e9 100644 --- a/reactos/dll/win32/netcfgx/netcfgx.rc +++ b/reactos/dll/win32/netcfgx/netcfgx.rc @@ -1,5 +1,8 @@ -#include -#include "shlobj.h" +#define WIN32_NO_STATUS +#include +#include +#include +//#include "shlobj.h" #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/netcfgx/precomp.h b/reactos/dll/win32/netcfgx/precomp.h index f64647be1e6..a5000fd6b4e 100644 --- a/reactos/dll/win32/netcfgx/precomp.h +++ b/reactos/dll/win32/netcfgx/precomp.h @@ -6,7 +6,15 @@ #define NONAMELESSSTRUCT #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #define NTOS_MODE_USER #include #include @@ -19,9 +27,9 @@ #include #include #include "resource.h" -#include +//#include -#include +//#include #include typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); diff --git a/reactos/dll/win32/netevent/netevt.rc b/reactos/dll/win32/netevent/netevt.rc index 6ab7880c526..5fcc8786f24 100644 --- a/reactos/dll/win32/netevent/netevt.rc +++ b/reactos/dll/win32/netevent/netevt.rc @@ -1,4 +1,4 @@ -#include +//#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Event Handler\0" @@ -6,4 +6,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll\0" #include -#include "neteventmsg.rc" +#include diff --git a/reactos/dll/win32/netid/netid.c b/reactos/dll/win32/netid/netid.c index 310bb024b16..c5c3dfa06f3 100644 --- a/reactos/dll/win32/netid/netid.c +++ b/reactos/dll/win32/netid/netid.c @@ -8,10 +8,15 @@ * */ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #include #include #include + #include "resource.h" static INT_PTR CALLBACK diff --git a/reactos/dll/win32/netid/netid.rc b/reactos/dll/win32/netid/netid.rc index c9a8ff21c0e..b1b49f99487 100644 --- a/reactos/dll/win32/netid/netid.rc +++ b/reactos/dll/win32/netid/netid.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/netid/rsrc.rc b/reactos/dll/win32/netid/rsrc.rc index 5df463349dc..d5662150b33 100644 --- a/reactos/dll/win32/netid/rsrc.rc +++ b/reactos/dll/win32/netid/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/win32/netshell/classfactory.cpp b/reactos/dll/win32/netshell/classfactory.cpp index af17b7f2a9d..9181df48eff 100644 --- a/reactos/dll/win32/netshell/classfactory.cpp +++ b/reactos/dll/win32/netshell/classfactory.cpp @@ -1,4 +1,4 @@ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/netshell/connectmanager.cpp b/reactos/dll/win32/netshell/connectmanager.cpp index ee61ef5ff5c..7ddeb4bebd2 100644 --- a/reactos/dll/win32/netshell/connectmanager.cpp +++ b/reactos/dll/win32/netshell/connectmanager.cpp @@ -1,4 +1,4 @@ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/netshell/enumlist.cpp b/reactos/dll/win32/netshell/enumlist.cpp index 525352ec2ba..d9a308d5218 100644 --- a/reactos/dll/win32/netshell/enumlist.cpp +++ b/reactos/dll/win32/netshell/enumlist.cpp @@ -1,4 +1,4 @@ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/netshell/lanconnectui.cpp b/reactos/dll/win32/netshell/lanconnectui.cpp index 884d0c80c60..d2635fd18ef 100644 --- a/reactos/dll/win32/netshell/lanconnectui.cpp +++ b/reactos/dll/win32/netshell/lanconnectui.cpp @@ -1,4 +1,4 @@ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/netshell/lanstatusui.cpp b/reactos/dll/win32/netshell/lanstatusui.cpp index b7b1cddea86..0b04a91b849 100644 --- a/reactos/dll/win32/netshell/lanstatusui.cpp +++ b/reactos/dll/win32/netshell/lanstatusui.cpp @@ -1,4 +1,4 @@ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/netshell/netshell.rc b/reactos/dll/win32/netshell/netshell.rc index aff49f88e8e..cef058ec6be 100644 --- a/reactos/dll/win32/netshell/netshell.rc +++ b/reactos/dll/win32/netshell/netshell.rc @@ -1,5 +1,7 @@ -#include -#include "shlobj.h" +#include +#include +#include +//#include "shlobj.h" #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/netshell/precomp.h b/reactos/dll/win32/netshell/precomp.h index 3702829f9f7..032f3188629 100644 --- a/reactos/dll/win32/netshell/precomp.h +++ b/reactos/dll/win32/netshell/precomp.h @@ -1,41 +1,28 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include -#include - +#include +#include +#include +#include #include -#include - -#include #include #include -#include -#include -#include -#include -#include -#include #include #include #include -#include #include -#include #include #include -#include #include #include -#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" #include "resource.h" #define NCF_VIRTUAL 0x1 diff --git a/reactos/dll/win32/netshell/resource.h b/reactos/dll/win32/netshell/resource.h index d6a4dd69b1e..9b73155925b 100644 --- a/reactos/dll/win32/netshell/resource.h +++ b/reactos/dll/win32/netshell/resource.h @@ -1,3 +1,4 @@ +#pragma once /* icons */ @@ -93,4 +94,3 @@ #define IDS_WINS_SERVERS 10308 #define IDS_PROPERTY 10309 #define IDS_VALUE 10310 - diff --git a/reactos/dll/win32/netshell/shfldr_netconnect.cpp b/reactos/dll/win32/netshell/shfldr_netconnect.cpp index 241ea0e22d9..cb52aa02d16 100644 --- a/reactos/dll/win32/netshell/shfldr_netconnect.cpp +++ b/reactos/dll/win32/netshell/shfldr_netconnect.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt index 3cea067fb84..3105f5a4e5c 100644 --- a/reactos/dll/win32/newdev/CMakeLists.txt +++ b/reactos/dll/win32/newdev/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND SOURCE newdev.c stubs.c wizard.c - newdev.rc + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/newdev.def) diff --git a/reactos/dll/win32/newdev/newdev_private.h b/reactos/dll/win32/newdev/newdev_private.h index 09475d4e30a..e3a7afe362f 100644 --- a/reactos/dll/win32/newdev/newdev_private.h +++ b/reactos/dll/win32/newdev/newdev_private.h @@ -1,13 +1,22 @@ #ifndef __NEWDEV_PRIVATE_H #define __NEWDEV_PRIVATE_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include + +#include +#include +#include +#include +#include +#include +#include #include -#include #include #include -#include #include #include #include diff --git a/reactos/dll/win32/newdev/rsrc.rc b/reactos/dll/win32/newdev/rsrc.rc index 9e433e6ee8e..af2ad4b2139 100644 --- a/reactos/dll/win32/newdev/rsrc.rc +++ b/reactos/dll/win32/newdev/rsrc.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" IDB_WATERMARK BITMAP "resources/watermark.bmp" diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.c b/reactos/dll/win32/ntdsapi/ntdsapi.c index 1ffbd9d390b..742eb9ca68d 100644 --- a/reactos/dll/win32/ntdsapi/ntdsapi.c +++ b/reactos/dll/win32/ntdsapi/ntdsapi.c @@ -16,15 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "ntdsapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "winbase.h" +//#include "winerror.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); diff --git a/reactos/dll/win32/ntlanman/ntlanman.c b/reactos/dll/win32/ntlanman/ntlanman.c index 6ce5b9edd53..5353cf2460f 100644 --- a/reactos/dll/win32/ntlanman/ntlanman.c +++ b/reactos/dll/win32/ntlanman/ntlanman.c @@ -5,10 +5,12 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */ -#include -#include +#define WIN32_NO_STATUS +#include +#include +//#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ntlanman); diff --git a/reactos/dll/win32/ntlanman/ntlanman.rc b/reactos/dll/win32/ntlanman/ntlanman.rc index 64627cd4750..0d72c9e484d 100644 --- a/reactos/dll/win32/ntlanman/ntlanman.rc +++ b/reactos/dll/win32/ntlanman/ntlanman.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "LAN Manager\0" #define REACTOS_STR_INTERNAL_NAME "ntlanman\0" diff --git a/reactos/dll/win32/ntmarta/ntmarta.c b/reactos/dll/win32/ntmarta/ntmarta.c index f6e77d4cbef..251b6f54882 100644 --- a/reactos/dll/win32/ntmarta/ntmarta.c +++ b/reactos/dll/win32/ntmarta/ntmarta.c @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 07/26/2005 Created */ -#include +#include "ntmarta.h" #define NDEBUG #include diff --git a/reactos/dll/win32/ntmarta/ntmarta.h b/reactos/dll/win32/ntmarta/ntmarta.h index cf7202eea37..d09405834a8 100644 --- a/reactos/dll/win32/ntmarta/ntmarta.h +++ b/reactos/dll/win32/ntmarta/ntmarta.h @@ -1,12 +1,11 @@ #define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN #define NTOS_MODE_USER #include #include #include #include -#include #include -#include #include #ifndef HAS_FN_PROGRESSW diff --git a/reactos/dll/win32/ntmarta/ntmarta.rc b/reactos/dll/win32/ntmarta/ntmarta.rc index 5ecb019f3c1..07cca30b4bf 100644 --- a/reactos/dll/win32/ntmarta/ntmarta.rc +++ b/reactos/dll/win32/ntmarta/ntmarta.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS MARTA Provider\0" #define REACTOS_STR_INTERNAL_NAME "ntmarta\0" diff --git a/reactos/dll/win32/ntprint/ntprint.c b/reactos/dll/win32/ntprint/ntprint.c index b8166661854..aed6e98e7e9 100644 --- a/reactos/dll/win32/ntprint/ntprint.c +++ b/reactos/dll/win32/ntprint/ntprint.c @@ -18,21 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winnls.h" -#include "winver.h" -#include "winspool.h" +#include +#include +//#include "winerror.h" +#include +//#include "winnls.h" +//#include "winver.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ntprint); diff --git a/reactos/dll/win32/ntprint/ntprint.rc b/reactos/dll/win32/ntprint/ntprint.rc index 272f15159e6..7cafb61bc50 100644 --- a/reactos/dll/win32/ntprint/ntprint.rc +++ b/reactos/dll/win32/ntprint/ntprint.rc @@ -19,7 +19,7 @@ * */ -#include "winver.h" +//#include "winver.h" #define WINE_FILENAME_STR "ntprint.dll" #define WINE_FILEDESCRIPTION_STR "Spooler Setup API (Printing)" @@ -31,4 +31,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/objsel/factory.c b/reactos/dll/win32/objsel/factory.c index cb0fb491cb4..29db0c31224 100644 --- a/reactos/dll/win32/objsel/factory.c +++ b/reactos/dll/win32/objsel/factory.c @@ -21,7 +21,7 @@ #include "objsel_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(objsel); diff --git a/reactos/dll/win32/objsel/objsel.c b/reactos/dll/win32/objsel/objsel.c index 83a845dc8eb..3d065a29d89 100644 --- a/reactos/dll/win32/objsel/objsel.c +++ b/reactos/dll/win32/objsel/objsel.c @@ -19,9 +19,9 @@ */ #include "objsel_private.h" -#include "rpcproxy.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(objsel); diff --git a/reactos/dll/win32/objsel/objsel.rc b/reactos/dll/win32/objsel/objsel.rc index fe6b5f0cf04..5d595fd67b3 100644 --- a/reactos/dll/win32/objsel/objsel.rc +++ b/reactos/dll/win32/objsel/objsel.rc @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" +#include +//#include "winbase.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -27,4 +27,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILENAME_STR "objsel.dll" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/objsel/objsel_private.h b/reactos/dll/win32/objsel/objsel_private.h index f6e6baa0df1..615c9215639 100644 --- a/reactos/dll/win32/objsel/objsel_private.h +++ b/reactos/dll/win32/objsel/objsel_private.h @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include #include -#include -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" +//#include +//#include "winerror.h" +#include +#include +//#include "winreg.h" +//#include "wingdi.h" +//#include "winuser.h" #define COBJMACROS -#include "ole2.h" -#include "strmif.h" -#include "olectl.h" -#include "unknwn.h" -#include "objsel.h" -#include "wine/unicode.h" -#include "uuids.h" +#include +//#include "strmif.h" +//#include "olectl.h" +//#include "unknwn.h" +#include +//#include "wine/unicode.h" +//#include "uuids.h" /********************************************************************** * Dll lifetime tracking declaration for objsel.dll diff --git a/reactos/dll/win32/odbc32/odbc32.rc b/reactos/dll/win32/odbc32/odbc32.rc index 91fcfa32ab6..9b049d31b29 100644 --- a/reactos/dll/win32/odbc32/odbc32.rc +++ b/reactos/dll/win32/odbc32/odbc32.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ODBC Client DLL\0" #define REACTOS_STR_INTERNAL_NAME "odbc32\0" diff --git a/reactos/dll/win32/odbc32/proxyodbc.c b/reactos/dll/win32/odbc32/proxyodbc.c index a5d5615b54a..f75c8a2b705 100644 --- a/reactos/dll/win32/odbc32/proxyodbc.c +++ b/reactos/dll/win32/odbc32/proxyodbc.c @@ -25,28 +25,30 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS -#include -#include -#include -#include +#include +#include + +//#include +//#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" +#include +//#include "winbase.h" +#include -#include "sql.h" -#include "sqltypes.h" -#include "sqlext.h" +//#include "sql.h" +//#include "sqltypes.h" +#include #undef TRACE_ON -#include "wine/debug.h" -#include "wine/library.h" -#include "wine/unicode.h" +#include +#include +#include #include "proxyodbc.h" diff --git a/reactos/dll/win32/odbccp32/odbccp32.c b/reactos/dll/win32/odbccp32/odbccp32.c index fb4ea2c7ea1..f87c336a024 100644 --- a/reactos/dll/win32/odbccp32/odbccp32.c +++ b/reactos/dll/win32/odbccp32/odbccp32.c @@ -20,19 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winnls.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include -#include "odbcinst.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(odbc); diff --git a/reactos/dll/win32/ole32/antimoniker.c b/reactos/dll/win32/ole32/antimoniker.c index 4c71fd4b2ce..873a78fb525 100644 --- a/reactos/dll/win32/ole32/antimoniker.c +++ b/reactos/dll/win32/ole32/antimoniker.c @@ -18,19 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +#include #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/bindctx.c b/reactos/dll/win32/ole32/bindctx.c index ed6269d3e97..accb80f797c 100644 --- a/reactos/dll/win32/ole32/bindctx.c +++ b/reactos/dll/win32/ole32/bindctx.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "objbase.h" +//#include "winerror.h" +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/classmoniker.c b/reactos/dll/win32/ole32/classmoniker.c index d5c013b56ae..546c678400c 100644 --- a/reactos/dll/win32/ole32/classmoniker.c +++ b/reactos/dll/win32/ole32/classmoniker.c @@ -19,21 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wine/debug.h" -#include "ole2.h" -#include "wine/unicode.h" +//#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +#include +#include #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/clipboard.c b/reactos/dll/win32/ole32/clipboard.c index a7308c25251..dd7900b7806 100644 --- a/reactos/dll/win32/ole32/clipboard.c +++ b/reactos/dll/win32/ole32/clipboard.c @@ -58,24 +58,27 @@ * */ -#include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include +//#include +//#include #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "winnls.h" -#include "ole2.h" -#include "wine/debug.h" -#include "olestd.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +#include +#include +//#include "olestd.h" #include "storage32.h" diff --git a/reactos/dll/win32/ole32/comcat.c b/reactos/dll/win32/ole32/comcat.c index 288289064bc..5cef5dbb790 100644 --- a/reactos/dll/win32/ole32/comcat.c +++ b/reactos/dll/win32/ole32/comcat.c @@ -18,23 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +//#include "winerror.h" -#include "ole2.h" -#include "comcat.h" +#include +#include #include "compobj_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/compobj.c b/reactos/dll/win32/ole32/compobj.c index 646a1709ef0..f23468409bb 100644 --- a/reactos/dll/win32/ole32/compobj.c +++ b/reactos/dll/win32/ole32/compobj.c @@ -36,37 +36,38 @@ * */ -#include "config.h" +#include #include -#include -#include +//#include +//#include #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "ntstatus.h" +#include #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "winuser.h" +#define _INC_WINDOWS +#include +#include +//#include "winerror.h" +//#include "winreg.h" +//#include "winuser.h" #define USE_COM_CONTEXT_DEF -#include "objbase.h" -#include "ole2.h" -#include "ole2ver.h" -#include "ctxtcall.h" -#include "dde.h" +//#include "objbase.h" +#include +#include +#include +#include -#include "initguid.h" +#include #include "compobj_private.h" #include "moniker.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/compobj_private.h b/reactos/dll/win32/ole32/compobj_private.h index b76e3a72b8c..fad1ff987f5 100644 --- a/reactos/dll/win32/ole32/compobj_private.h +++ b/reactos/dll/win32/ole32/compobj_private.h @@ -29,14 +29,14 @@ #include -#include "wine/list.h" +#include #include "windef.h" #include "winbase.h" #include "wtypes.h" -#include "dcom.h" +#include #include "winreg.h" -#include "winternl.h" +#include struct apartment; typedef struct apartment APARTMENT; diff --git a/reactos/dll/win32/ole32/compositemoniker.c b/reactos/dll/win32/ole32/compositemoniker.c index a6cfd6274de..8088d953976 100644 --- a/reactos/dll/win32/ole32/compositemoniker.c +++ b/reactos/dll/win32/ole32/compositemoniker.c @@ -18,21 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +#include +#include #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/datacache.c b/reactos/dll/win32/ole32/datacache.c index 3e5e99c94cd..53a312cbc06 100644 --- a/reactos/dll/win32/ole32/datacache.c +++ b/reactos/dll/win32/ole32/datacache.c @@ -43,22 +43,25 @@ * header. I was able to figure-out where the extent of the object * was stored and the aspect, but that's about it. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "wine/unicode.h" -#include "ole2.h" -#include "wine/list.h" -#include "wine/debug.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/defaulthandler.c b/reactos/dll/win32/ole32/defaulthandler.c index b4e8203eebe..0b3db7ad50b 100644 --- a/reactos/dll/win32/ole32/defaulthandler.c +++ b/reactos/dll/win32/ole32/defaulthandler.c @@ -45,23 +45,26 @@ * - All the methods related to notification and advise sinks are * in place but no notifications are sent to the sinks yet. */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include #include "compobj_private.h" #include "storage32.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/dictionary.c b/reactos/dll/win32/ole32/dictionary.c index 593a4ff1588..99574a4d788 100644 --- a/reactos/dll/win32/ole32/dictionary.c +++ b/reactos/dll/win32/ole32/dictionary.c @@ -17,12 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include "windef.h" -#include "winbase.h" +//#include +//#include "windef.h" +//#include "winbase.h" #include "dictionary.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(storage); diff --git a/reactos/dll/win32/ole32/dictionary.h b/reactos/dll/win32/ole32/dictionary.h index f3693ccc5c2..af6785bb1df 100644 --- a/reactos/dll/win32/ole32/dictionary.h +++ b/reactos/dll/win32/ole32/dictionary.h @@ -23,8 +23,8 @@ #define __DICTIONARY_H__ #include -#include "windef.h" -#include "winbase.h" +#include +#include struct dictionary; diff --git a/reactos/dll/win32/ole32/enumx.c b/reactos/dll/win32/ole32/enumx.c index 4279ca81fa9..f9851a385b7 100644 --- a/reactos/dll/win32/ole32/enumx.c +++ b/reactos/dll/win32/ole32/enumx.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" +#include +#include +#include #include "enumx.h" -#include "wine/list.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/errorinfo.c b/reactos/dll/win32/ole32/errorinfo.c index b71ee2d947c..37e2397213b 100644 --- a/reactos/dll/win32/ole32/errorinfo.c +++ b/reactos/dll/win32/ole32/errorinfo.c @@ -23,21 +23,24 @@ * TEB at offset 0xf80. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "winerror.h" +#include +#include +#include +#include +//#include "winerror.h" -#include "wine/unicode.h" +#include #include "compobj_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/filelockbytes.c b/reactos/dll/win32/ole32/filelockbytes.c index ce74566d08f..c4d35e2f826 100644 --- a/reactos/dll/win32/ole32/filelockbytes.c +++ b/reactos/dll/win32/ole32/filelockbytes.c @@ -20,28 +20,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "objbase.h" -#include "ole2.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winerror.h" +//#include "objbase.h" +//#include "ole2.h" #include "storage32.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(storage); diff --git a/reactos/dll/win32/ole32/filemoniker.c b/reactos/dll/win32/ole32/filemoniker.c index 7a97100dcc7..396742c3a87 100644 --- a/reactos/dll/win32/ole32/filemoniker.c +++ b/reactos/dll/win32/ole32/filemoniker.c @@ -19,24 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "objbase.h" +#include +#include +//#include "winerror.h" +//#include "winnls.h" +#include +#include +#include #include "moniker.h" -#include "compobj_private.h" +//#include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/ftmarshal.c b/reactos/dll/win32/ole32/ftmarshal.c index 21d9c9ab059..d4081392dc2 100644 --- a/reactos/dll/win32/ole32/ftmarshal.c +++ b/reactos/dll/win32/ole32/ftmarshal.c @@ -18,21 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include -#include -#include +//#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" +#include +#include +#include -#include "wine/debug.h" +#include #include "compobj_private.h" diff --git a/reactos/dll/win32/ole32/git.c b/reactos/dll/win32/ole32/git.c index dd65c2e5407..76a775f9fc1 100644 --- a/reactos/dll/win32/ole32/git.c +++ b/reactos/dll/win32/ole32/git.c @@ -24,23 +24,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +//#include "objbase.h" +#include +//#include "winerror.h" #include "compobj_private.h" -#include "wine/list.h" -#include "wine/debug.h" +//#include "wine/list.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/hglobalstream.c b/reactos/dll/win32/ole32/hglobalstream.c index ce0f34cefc3..5da53e12ed4 100644 --- a/reactos/dll/win32/ole32/hglobalstream.c +++ b/reactos/dll/win32/ole32/hglobalstream.c @@ -21,27 +21,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include +#include + +//#include +//#include #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "winerror.h" -#include "winternl.h" +#include +#include +//#include "winuser.h" +//#include "objbase.h" +#include +//#include "winerror.h" +//#include "winternl.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(storage); diff --git a/reactos/dll/win32/ole32/ifs.c b/reactos/dll/win32/ole32/ifs.c index 2e70e448226..fef22e0f0df 100644 --- a/reactos/dll/win32/ole32/ifs.c +++ b/reactos/dll/win32/ole32/ifs.c @@ -18,23 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include -#include -#include +//#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +//#include "winerror.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); diff --git a/reactos/dll/win32/ole32/itemmoniker.c b/reactos/dll/win32/ole32/itemmoniker.c index 4dc15bae324..d553deb41c2 100644 --- a/reactos/dll/win32/ole32/itemmoniker.c +++ b/reactos/dll/win32/ole32/itemmoniker.c @@ -18,22 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "wine/debug.h" -#include "ole2.h" -#include "wine/unicode.h" +//#include "winerror.h" +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include +#include #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/marshal.c b/reactos/dll/win32/ole32/marshal.c index a8df28c8500..87962f4df0c 100644 --- a/reactos/dll/win32/ole32/marshal.c +++ b/reactos/dll/win32/ole32/marshal.c @@ -20,23 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "winerror.h" -#include "wine/unicode.h" +#include +#include +//#include "winuser.h" +//#include "objbase.h" +#include +//#include "winerror.h" +//#include "wine/unicode.h" #include "compobj_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/memlockbytes.c b/reactos/dll/win32/ole32/memlockbytes.c index 81d3b32ab2b..5ce4b6772ee 100644 --- a/reactos/dll/win32/ole32/memlockbytes.c +++ b/reactos/dll/win32/ole32/memlockbytes.c @@ -19,24 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "winerror.h" +#include +#include +//#include "winuser.h" +#include +//#include "ole2.h" +//#include "winerror.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/moniker.c b/reactos/dll/win32/ole32/moniker.c index 1d7f2191893..4e3d46c5c66 100644 --- a/reactos/dll/win32/ole32/moniker.c +++ b/reactos/dll/win32/ole32/moniker.c @@ -21,29 +21,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include -#include +//#include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wtypes.h" -#include "ole2.h" +//#include "winerror.h" +#include +#include +//#include "winuser.h" +//#include "wtypes.h" +#include -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/exception.h" +//#include "wine/list.h" +#include +#include +#include #include "compobj_private.h" #include "moniker.h" -#include "irot.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/ole2.c b/reactos/dll/win32/ole32/ole2.c index 1bd4c1a0009..851bbeae3fa 100644 --- a/reactos/dll/win32/ole32/ole2.c +++ b/reactos/dll/win32/ole32/ole2.c @@ -23,33 +23,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include +#include + +//#include +//#include #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "ole2.h" -#include "ole2ver.h" +#include +#include +//#include "winerror.h" +#include +//#include "winuser.h" +//#include "winnls.h" +//#include "winreg.h" +#include +#include -#include "wine/unicode.h" +#include #include "compobj_private.h" -#include "wine/list.h" +//#include "wine/list.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(accel); diff --git a/reactos/dll/win32/ole32/ole2impl.c b/reactos/dll/win32/ole32/ole2impl.c index 5d92fec3c5f..3821e44964d 100644 --- a/reactos/dll/win32/ole32/ole2impl.c +++ b/reactos/dll/win32/ole32/ole2impl.c @@ -18,20 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "ole2.h" -#include "olestd.h" +#include +#include +#include +//#include "winuser.h" +#include +#include +//#include "olestd.h" #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/ole2stubs.c b/reactos/dll/win32/ole32/ole2stubs.c index 5a90e2d46e9..60fcea85323 100644 --- a/reactos/dll/win32/ole32/ole2stubs.c +++ b/reactos/dll/win32/ole32/ole2stubs.c @@ -19,16 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "objidl.h" -#include "wine/debug.h" +#include +#include +//#include "winuser.h" +#include +//#include "objidl.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/ole32_main.c b/reactos/dll/win32/ole32/ole32_main.c index 97b18a0b38c..0a1b48514b5 100644 --- a/reactos/dll/win32/ole32/ole32_main.c +++ b/reactos/dll/win32/ole32/ole32_main.c @@ -18,20 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include +//#include "wine/port.h" + +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "objbase.h" -#include "ole2.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include +//#include "ole2.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/ole32res.rc b/reactos/dll/win32/ole32/ole32res.rc index aed7e9b98c2..25b4f8bc2fa 100644 --- a/reactos/dll/win32/ole32/ole32res.rc +++ b/reactos/dll/win32/ole32/ole32res.rc @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" #define WINE_FILENAME_STR "ole32.dll" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" +#include /* * Everything that does not depend on language, diff --git a/reactos/dll/win32/ole32/oleobj.c b/reactos/dll/win32/ole32/oleobj.c index 968456d3108..eea8847eefc 100644 --- a/reactos/dll/win32/ole32/oleobj.c +++ b/reactos/dll/win32/ole32/oleobj.c @@ -19,22 +19,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winerror.h" -#include "wine/debug.h" -#include "ole2.h" +#include +#include +//#include "winuser.h" +//#include "winerror.h" +#include +#include -#include "compobj_private.h" +//#include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/oleproxy.c b/reactos/dll/win32/ole32/oleproxy.c index 184aca13437..0e075c6c5e3 100644 --- a/reactos/dll/win32/ole32/oleproxy.c +++ b/reactos/dll/win32/ole32/oleproxy.c @@ -19,27 +19,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "ole2.h" -#include "rpc.h" +#include +#include +//#include "winuser.h" +#include +//#include "ole2.h" +//#include "rpc.h" #include "compobj_private.h" #include "moniker.h" -#include "comcat.h" +#include /*********************************************************************** * DllGetClassObject [OLE32.@] diff --git a/reactos/dll/win32/ole32/pointermoniker.c b/reactos/dll/win32/ole32/pointermoniker.c index 9af162aa165..436d6e25edd 100644 --- a/reactos/dll/win32/ole32/pointermoniker.c +++ b/reactos/dll/win32/ole32/pointermoniker.c @@ -19,20 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "objbase.h" -#include "oleidl.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +//#include "winuser.h" +#include +#include +#include #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/rpc.c b/reactos/dll/win32/ole32/rpc.c index 9b572065bc4..238bfbba1b5 100644 --- a/reactos/dll/win32/ole32/rpc.c +++ b/reactos/dll/win32/ole32/rpc.c @@ -20,30 +20,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winsvc.h" -#include "objbase.h" -#include "ole2.h" -#include "rpc.h" -#include "winerror.h" -#include "winreg.h" -#include "wine/unicode.h" +#include +#include +//#include "winuser.h" +#include +//#include "objbase.h" +#include +//#include "rpc.h" +//#include "winerror.h" +//#include "winreg.h" +#include #include "compobj_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/stg_prop.c b/reactos/dll/win32/ole32/stg_prop.c index 89f8379bc33..99325d037c9 100644 --- a/reactos/dll/win32/ole32/stg_prop.c +++ b/reactos/dll/win32/ole32/stg_prop.c @@ -36,29 +36,29 @@ * PropertyStorage_ReadFromStream */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +//#include "winuser.h" +#include +#include #include "dictionary.h" #include "storage32.h" #include "enumx.h" -#include "oleauto.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(storage); diff --git a/reactos/dll/win32/ole32/stg_stream.c b/reactos/dll/win32/ole32/stg_stream.c index e9fc0c0b76e..856b33e35a1 100644 --- a/reactos/dll/win32/ole32/stg_stream.c +++ b/reactos/dll/win32/ole32/stg_stream.c @@ -24,20 +24,20 @@ */ #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winternl.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "winternl.h" +#include #include "storage32.h" diff --git a/reactos/dll/win32/ole32/storage32.c b/reactos/dll/win32/ole32/storage32.c index f259d246d70..69a7f8c8e08 100644 --- a/reactos/dll/win32/ole32/storage32.c +++ b/reactos/dll/win32/ole32/storage32.c @@ -31,27 +31,27 @@ */ #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +//#include "winuser.h" +#include +#include #include "storage32.h" -#include "ole2.h" /* For Write/ReadClassStm */ +#include /* For Write/ReadClassStm */ -#include "winreg.h" -#include "wine/wingdi16.h" +//#include "winreg.h" +#include #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); diff --git a/reactos/dll/win32/ole32/storage32.h b/reactos/dll/win32/ole32/storage32.h index f2061f39f94..1274eb710ca 100644 --- a/reactos/dll/win32/ole32/storage32.h +++ b/reactos/dll/win32/ole32/storage32.h @@ -30,15 +30,18 @@ #ifndef __STORAGE32_H__ #define __STORAGE32_H__ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "objbase.h" -#include "winreg.h" +#include +#include +//#include "winnt.h" +#include +#include #include "winternl.h" -#include "wine/list.h" +#include /* * Definitions for the file format offsets. diff --git a/reactos/dll/win32/ole32/stubmanager.c b/reactos/dll/win32/ole32/stubmanager.c index e7018b927bd..806776c3cf2 100644 --- a/reactos/dll/win32/ole32/stubmanager.c +++ b/reactos/dll/win32/ole32/stubmanager.c @@ -23,21 +23,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "rpc.h" +#include +#include +//#include "winuser.h" +#include +//#include "rpc.h" -#include "wine/debug.h" +#include #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/ole32/usrmarshal.c b/reactos/dll/win32/ole32/usrmarshal.c index d1f56c7983d..b8ec9897b50 100644 --- a/reactos/dll/win32/ole32/usrmarshal.c +++ b/reactos/dll/win32/ole32/usrmarshal.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" -#include "ole2.h" -#include "oleauto.h" -#include "rpcproxy.h" +#include +//#include "oleauto.h" +//#include "rpcproxy.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleacc/main.c b/reactos/dll/win32/oleacc/main.c index 34bdb61bcde..6d88e7e9567 100644 --- a/reactos/dll/win32/oleacc/main.c +++ b/reactos/dll/win32/oleacc/main.c @@ -18,15 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "oleacc.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +#include +//#include "winuser.h" +#include +#include + +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(oleacc); diff --git a/reactos/dll/win32/oleacc/oleacc.rc b/reactos/dll/win32/oleacc/oleacc.rc index 442639ec402..05152bf1072 100644 --- a/reactos/dll/win32/oleacc/oleacc.rc +++ b/reactos/dll/win32/oleacc/oleacc.rc @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "oleacc.h" +//#include "windef.h" +//#include "oleacc.h" #ifdef LANGUAGE_EN_US #include "oleacc_En.rc" diff --git a/reactos/dll/win32/oleaut32/connpt.c b/reactos/dll/win32/oleaut32/connpt.c index 59768a02982..d5c396d9e8d 100644 --- a/reactos/dll/win32/oleaut32/connpt.c +++ b/reactos/dll/win32/oleaut32/connpt.c @@ -22,22 +22,25 @@ * comments just above that function for information. */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #include -#include +//#include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "olectl.h" -#include "connpt.h" +//#include "winerror.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +#include +//#include "connpt.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/dispatch.c b/reactos/dll/win32/oleaut32/dispatch.c index 760f8aaf305..fe5158fd7b9 100644 --- a/reactos/dll/win32/oleaut32/dispatch.c +++ b/reactos/dll/win32/oleaut32/dispatch.c @@ -19,23 +19,26 @@ * */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include +#include + +//#include +//#include #include -#include -#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "winerror.h" +#include +#include +#include +#include +//#include "winerror.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/hash.c b/reactos/dll/win32/oleaut32/hash.c index a2710df6542..bc07483b8cd 100644 --- a/reactos/dll/win32/oleaut32/hash.c +++ b/reactos/dll/win32/oleaut32/hash.c @@ -18,14 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "objbase.h" -#include "oaidl.h" -#include "wine/debug.h" +#include +#include +#include +#include +//#include "oaidl.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/oleaut.c b/reactos/dll/win32/oleaut32/oleaut.c index 250a8129546..fa52acc2036 100644 --- a/reactos/dll/win32/oleaut32/oleaut.c +++ b/reactos/dll/win32/oleaut32/oleaut.c @@ -18,27 +18,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include -#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include +#include +#include +//#include "winuser.h" +//#include "winerror.h" -#include "ole2.h" -#include "olectl.h" -#include "oleauto.h" -#include "initguid.h" +#include +#include +//#include "oleauto.h" +#include #include "typelib.h" -#include "oleaut32_oaidl.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(heap); diff --git a/reactos/dll/win32/oleaut32/oleaut32.rc b/reactos/dll/win32/oleaut32/oleaut32.rc index bb096d26096..abb8fcf6c29 100644 --- a/reactos/dll/win32/oleaut32/oleaut32.rc +++ b/reactos/dll/win32/oleaut32/oleaut32.rc @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "resource.h" +//#include "windef.h" +//#include "winbase.h" +//#include "resource.h" #ifdef LANGUAGE_BG_BG #include "oleaut32_Bg.rc" @@ -122,4 +122,4 @@ #define WINE_FILEVERSION_STR "6.0.6001.18000" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/oleaut32/olefont.c b/reactos/dll/win32/oleaut32/olefont.c index b5c0cb4882b..b4f3101a6ce 100644 --- a/reactos/dll/win32/oleaut32/olefont.c +++ b/reactos/dll/win32/oleaut32/olefont.c @@ -21,28 +21,31 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +//#include +//#include #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/list.h" -#include "wine/unicode.h" -#include "objbase.h" -#include "oleauto.h" /* for SysAllocString(....) */ -#include "ole2.h" -#include "olectl.h" -#include "wine/debug.h" +//#include "winerror.h" +#include +//#include "winbase.h" +#include +//#include "winuser.h" +#include +#include +#include +#include /* for SysAllocString(....) */ +//#include "ole2.h" +#include +#include #include "connpt.h" /* for CreateConnectionPoint */ -#include "oaidl.h" +//#include "oaidl.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/olepicture.c b/reactos/dll/win32/oleaut32/olepicture.c index 3fdb1c7e0cf..051621f28c7 100644 --- a/reactos/dll/win32/oleaut32/olepicture.c +++ b/reactos/dll/win32/oleaut32/olepicture.c @@ -36,35 +36,38 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #ifdef HAVE_UNISTD_H # include #endif -#include +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "olectl.h" -#include "oleauto.h" +//#include "winerror.h" +#include +#include +#include +//#include "winuser.h" +#include +#include +//#include "oleauto.h" #include "connpt.h" -#include "urlmon.h" -#include "initguid.h" -#include "wincodec.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/library.h" +//#include "urlmon.h" +#include +#include +#include +#include +//#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(olepicture); diff --git a/reactos/dll/win32/oleaut32/olepropframe.c b/reactos/dll/win32/oleaut32/olepropframe.c index 8111e6b478c..d86d40507b4 100644 --- a/reactos/dll/win32/oleaut32/olepropframe.c +++ b/reactos/dll/win32/oleaut32/olepropframe.c @@ -19,19 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ole2.h" -#include "olectl.h" -#include "oledlg.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/recinfo.c b/reactos/dll/win32/oleaut32/recinfo.c index f6f56535863..5a865f6e629 100644 --- a/reactos/dll/win32/oleaut32/recinfo.c +++ b/reactos/dll/win32/oleaut32/recinfo.c @@ -16,20 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oaidl.h" -#include "oleauto.h" +#include +#include +#include +//#include "oaidl.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/safearray.c b/reactos/dll/win32/oleaut32/safearray.c index 57a0d107c82..f3f4c5a6d08 100644 --- a/reactos/dll/win32/oleaut32/safearray.c +++ b/reactos/dll/win32/oleaut32/safearray.c @@ -31,19 +31,22 @@ * 0x10: SAFEARRAYBOUNDS[0...] */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "variant.h" -#include "wine/debug.h" +#include +//#include "winerror.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/reactos/dll/win32/oleaut32/tmarshal.c b/reactos/dll/win32/oleaut32/tmarshal.c index 1c5326ba03b..8f6d696c7d2 100644 --- a/reactos/dll/win32/oleaut32/tmarshal.c +++ b/reactos/dll/win32/oleaut32/tmarshal.c @@ -21,33 +21,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include -#include -#include -#include +//#include +//#include +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" +//#include "winerror.h" +#include +#include +#include +#include +//#include "winuser.h" -#include "ole2.h" -#include "propidl.h" /* for LPSAFEARRAY_User* functions */ +#include +//#include "propidl.h" /* for LPSAFEARRAY_User* functions */ #include "typelib.h" #include "variant.h" -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; diff --git a/reactos/dll/win32/oleaut32/typelib.c b/reactos/dll/win32/oleaut32/typelib.c index fa9b0501ecb..f5e7f82d08e 100644 --- a/reactos/dll/win32/oleaut32/typelib.c +++ b/reactos/dll/win32/oleaut32/typelib.c @@ -45,33 +45,36 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include -#include +#include +//#include "wine/port.h" + +//#include +//#include +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "lzexpand.h" +#include +#include +#include +//#include "winnls.h" +#include +#include +#include -#include "wine/unicode.h" -#include "objbase.h" +#include +#include #include "typelib.h" -#include "wine/debug.h" +#include #include "variant.h" -#include "wine/list.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); diff --git a/reactos/dll/win32/oleaut32/typelib.h b/reactos/dll/win32/oleaut32/typelib.h index d6e752ad80b..15e8f02500a 100644 --- a/reactos/dll/win32/oleaut32/typelib.h +++ b/reactos/dll/win32/oleaut32/typelib.h @@ -21,11 +21,11 @@ #ifndef _WINE_TYPELIB_H #define _WINE_TYPELIB_H -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "oleauto.h" +//#include "windef.h" +//#include "winbase.h" +#include #define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1) diff --git a/reactos/dll/win32/oleaut32/typelib2.c b/reactos/dll/win32/oleaut32/typelib2.c index 689d9afca61..c855776f756 100644 --- a/reactos/dll/win32/oleaut32/typelib2.c +++ b/reactos/dll/win32/oleaut32/typelib2.c @@ -26,30 +26,33 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include -#include -#include -#include +#include +//#include "wine/port.h" + +//#include +//#include +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" +//#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +//#include "winreg.h" +//#include "winuser.h" -#include "wine/unicode.h" -#include "objbase.h" +#include +#include #include "typelib.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /* WINE_DEFAULT_DEBUG_CHANNEL(ole); */ diff --git a/reactos/dll/win32/oleaut32/usrmarshal.c b/reactos/dll/win32/oleaut32/usrmarshal.c index 2414a9ec8e3..0c2ff593825 100644 --- a/reactos/dll/win32/oleaut32/usrmarshal.c +++ b/reactos/dll/win32/oleaut32/usrmarshal.c @@ -19,24 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "winerror.h" -#include "ole2.h" -#include "oleauto.h" -#include "typelib.h" -#include "ocidl.h" -#include "wine/debug.h" +#include +//#include "oleauto.h" +//#include "typelib.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oleaut32/varformat.c b/reactos/dll/win32/oleaut32/varformat.c index 351529c596e..268eca2bce7 100644 --- a/reactos/dll/win32/oleaut32/varformat.c +++ b/reactos/dll/win32/oleaut32/varformat.c @@ -25,21 +25,24 @@ * Please submit a test case if you find a difference. */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include -#include -#include +#include + +//#include +//#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +#include +//#include "winerror.h" #include "variant.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/reactos/dll/win32/oleaut32/variant.c b/reactos/dll/win32/oleaut32/variant.c index 21a27587969..5600e167b87 100644 --- a/reactos/dll/win32/oleaut32/variant.c +++ b/reactos/dll/win32/oleaut32/variant.c @@ -25,23 +25,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include -#include -#include +#include + +//#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +#include +//#include "winerror.h" #include "variant.h" #include "resource.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(variant); diff --git a/reactos/dll/win32/oleaut32/variant.h b/reactos/dll/win32/oleaut32/variant.h index 265fcc8041e..14b6c058e1b 100644 --- a/reactos/dll/win32/oleaut32/variant.h +++ b/reactos/dll/win32/oleaut32/variant.h @@ -19,10 +19,10 @@ */ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winerror.h" -#include "objbase.h" -#include "oleauto.h" +//#include "windef.h" +//#include "winerror.h" +#include +#include #include /* Get just the type from a variant pointer */ diff --git a/reactos/dll/win32/oleaut32/vartype.c b/reactos/dll/win32/oleaut32/vartype.c index 2d27f9df195..c7bc15bacfb 100644 --- a/reactos/dll/win32/oleaut32/vartype.c +++ b/reactos/dll/win32/oleaut32/vartype.c @@ -18,15 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/debug.h" -#include "wine/unicode.h" -#include "winbase.h" -#include "winuser.h" -#include "winnt.h" +#include +#include +//#include "winbase.h" +#include +//#include "winnt.h" #include "variant.h" #include "resource.h" diff --git a/reactos/dll/win32/olecli32/olecli_main.c b/reactos/dll/win32/olecli32/olecli_main.c index 7abd4383727..01dc2cd7663 100644 --- a/reactos/dll/win32/olecli32/olecli_main.c +++ b/reactos/dll/win32/olecli32/olecli_main.c @@ -21,18 +21,20 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" +#define WIN32_NO_STATUS -#include +#include -#include "windef.h" -#include "wine/windef16.h" -#include "winbase.h" -#include "wingdi.h" -#include "wownt32.h" -#include "objbase.h" +//#include + +//#include "windef.h" +#include +//#include "winbase.h" +#include +//#include "wownt32.h" +//#include "objbase.h" #include "olecli.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c index 01d242e6322..43337a8dc45 100644 --- a/reactos/dll/win32/oledlg/insobjdlg.c +++ b/reactos/dll/win32/oledlg/insobjdlg.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include +#include +//#include "winternl.h" +//#include "winerror.h" +#include +#include +#include +#include -#include "oledlg.h" +//#include "oledlg.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(oledlg); diff --git a/reactos/dll/win32/oledlg/oledlg_main.c b/reactos/dll/win32/oledlg/oledlg_main.c index 6033231ea6f..c368e0692c7 100644 --- a/reactos/dll/win32/oledlg/oledlg_main.c +++ b/reactos/dll/win32/oledlg/oledlg_main.c @@ -18,18 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "oledlg.h" -#include "ole2.h" -#include "oledlg_private.h" +#include +#include +//#include "winerror.h" +#include +#include +#include +//#include "ole2.h" +//#include "oledlg_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oledlg/pastespl.c b/reactos/dll/win32/oledlg/pastespl.c index ae5e2f2f04d..50e9cede873 100644 --- a/reactos/dll/win32/oledlg/pastespl.c +++ b/reactos/dll/win32/oledlg/pastespl.c @@ -18,25 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "oledlg.h" +#include +#include +//#include "winerror.h" +#include +#include +//#include "winnls.h" +//#include "oledlg.h" #include "oledlg_private.h" #include "resource.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/oledlg/rsrc.rc b/reactos/dll/win32/oledlg/rsrc.rc index 6fec5b7878d..39349dcadbe 100644 --- a/reactos/dll/win32/oledlg/rsrc.rc +++ b/reactos/dll/win32/oledlg/rsrc.rc @@ -18,13 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "oledlg.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "resource.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" +//#include "oledlg.h" + +//#include "resource.h" /* * Everything specific to any language goes diff --git a/reactos/dll/win32/olepro32/olepro32stubs.c b/reactos/dll/win32/olepro32/olepro32stubs.c index a93c24cb320..c24c268c7f0 100644 --- a/reactos/dll/win32/olepro32/olepro32stubs.c +++ b/reactos/dll/win32/olepro32/olepro32stubs.c @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" +#include +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/olepro32/version.rc b/reactos/dll/win32/olepro32/version.rc index a78097695d6..9d26238402b 100644 --- a/reactos/dll/win32/olepro32/version.rc +++ b/reactos/dll/win32/olepro32/version.rc @@ -24,4 +24,4 @@ #define WINE_PRODUCTVERSION 2,40,4522,0 #define WINE_PRODUCTVERSION_STR "2.40" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/olesvr32/olesvr_main.c b/reactos/dll/win32/olesvr32/olesvr_main.c index 57c28e1b9b2..959ec61f830 100644 --- a/reactos/dll/win32/olesvr32/olesvr_main.c +++ b/reactos/dll/win32/olesvr32/olesvr_main.c @@ -21,14 +21,14 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "objbase.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/olethk32/main.c b/reactos/dll/win32/olethk32/main.c index 13de72eb197..89fb7ee5381 100644 --- a/reactos/dll/win32/olethk32/main.c +++ b/reactos/dll/win32/olethk32/main.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(olethk32); diff --git a/reactos/dll/win32/pdh/pdh_main.c b/reactos/dll/win32/pdh/pdh_main.c index bdf83a94792..9843480cacf 100644 --- a/reactos/dll/win32/pdh/pdh_main.c +++ b/reactos/dll/win32/pdh/pdh_main.c @@ -19,21 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include #include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include +#include -#include "pdh.h" -#include "pdhmsg.h" -#include "winperf.h" +#include +#include +//#include "winperf.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(pdh); diff --git a/reactos/dll/win32/pidgen/main.c b/reactos/dll/win32/pidgen/main.c index 3aa3e844449..dfd77f80047 100644 --- a/reactos/dll/win32/pidgen/main.c +++ b/reactos/dll/win32/pidgen/main.c @@ -16,12 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(pidgen); diff --git a/reactos/dll/win32/powrprof/powrprof.c b/reactos/dll/win32/powrprof/powrprof.c index afd50a0ed49..b52a5e56631 100644 --- a/reactos/dll/win32/powrprof/powrprof.c +++ b/reactos/dll/win32/powrprof/powrprof.c @@ -21,17 +21,16 @@ #include #define WIN32_NO_STATUS -#include +#include +#include +#include #define NTOS_MODE_USER #include #include #include #include -#include -#include - -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(powrprof); diff --git a/reactos/dll/win32/powrprof/powrprof.rc b/reactos/dll/win32/powrprof/powrprof.rc index 57ac021c511..d52723f44b0 100644 --- a/reactos/dll/win32/powrprof/powrprof.rc +++ b/reactos/dll/win32/powrprof/powrprof.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Power Profile Helper DLL\0" #define REACTOS_STR_INTERNAL_NAME "powrprof\0" diff --git a/reactos/dll/win32/printui/printui.c b/reactos/dll/win32/printui/printui.c index 7a2b466d411..5c24baff2f5 100644 --- a/reactos/dll/win32/printui/printui.c +++ b/reactos/dll/win32/printui/printui.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" -#include "shellapi.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "winreg.h" +//#include "winver.h" +//#include "winnls.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include #include "printui_private.h" WINE_DEFAULT_DEBUG_CHANNEL(printui); diff --git a/reactos/dll/win32/printui/printui.rc b/reactos/dll/win32/printui/printui.rc index bfbae9820a7..1deadb19e8e 100644 --- a/reactos/dll/win32/printui/printui.rc +++ b/reactos/dll/win32/printui/printui.rc @@ -19,7 +19,7 @@ * */ -#include "winver.h" +//#include "winver.h" #define WINE_FILENAME_STR "printui.dll" #define WINE_FILEDESCRIPTION_STR "User Interface for Printing" @@ -31,4 +31,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/psapi/precomp.h b/reactos/dll/win32/psapi/precomp.h index c07d6a28d7e..36ebf4b845b 100644 --- a/reactos/dll/win32/psapi/precomp.h +++ b/reactos/dll/win32/psapi/precomp.h @@ -1,8 +1,10 @@ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include #define NTOS_MODE_USER #include -#include #include #include #include diff --git a/reactos/dll/win32/psapi/psapi.rc b/reactos/dll/win32/psapi/psapi.rc index 6356df4f2f5..d9226accba1 100644 --- a/reactos/dll/win32/psapi/psapi.rc +++ b/reactos/dll/win32/psapi/psapi.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Process Status Helper\0" #define REACTOS_STR_INTERNAL_NAME "psapi\0" diff --git a/reactos/dll/win32/pstorec/pstorec.c b/reactos/dll/win32/pstorec/pstorec.c index 0a6a6c117de..cf3bfbed265 100644 --- a/reactos/dll/win32/pstorec/pstorec.c +++ b/reactos/dll/win32/pstorec/pstorec.c @@ -18,16 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "pstore.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(pstores); diff --git a/reactos/dll/win32/pstorec/rsrc.rc b/reactos/dll/win32/pstorec/rsrc.rc index 7c60321b43b..c9c386bfaf6 100644 --- a/reactos/dll/win32/pstorec/rsrc.rc +++ b/reactos/dll/win32/pstorec/rsrc.rc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/qmgr/enum_files.c b/reactos/dll/win32/qmgr/enum_files.c index d7f36cd865f..435188a3fee 100644 --- a/reactos/dll/win32/qmgr/enum_files.c +++ b/reactos/dll/win32/qmgr/enum_files.c @@ -19,7 +19,7 @@ */ #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/enum_jobs.c b/reactos/dll/win32/qmgr/enum_jobs.c index 85aca47c496..f5da6f95923 100644 --- a/reactos/dll/win32/qmgr/enum_jobs.c +++ b/reactos/dll/win32/qmgr/enum_jobs.c @@ -19,7 +19,7 @@ */ #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/factory.c b/reactos/dll/win32/qmgr/factory.c index 34c5ac0c1c2..89d0debe866 100644 --- a/reactos/dll/win32/qmgr/factory.c +++ b/reactos/dll/win32/qmgr/factory.c @@ -21,7 +21,7 @@ #define COBJMACROS #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/file.c b/reactos/dll/win32/qmgr/file.c index 91cabb6afcd..42ad9755705 100644 --- a/reactos/dll/win32/qmgr/file.c +++ b/reactos/dll/win32/qmgr/file.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "urlmon.h" -#include "wininet.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +#include +#include #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/job.c b/reactos/dll/win32/qmgr/job.c index 09693a3bd53..287e57194a7 100644 --- a/reactos/dll/win32/qmgr/job.c +++ b/reactos/dll/win32/qmgr/job.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/qmgr.c b/reactos/dll/win32/qmgr/qmgr.c index 1ff6050301e..4d210c947cc 100644 --- a/reactos/dll/win32/qmgr/qmgr.c +++ b/reactos/dll/win32/qmgr/qmgr.c @@ -19,7 +19,7 @@ */ #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/qmgr.h b/reactos/dll/win32/qmgr/qmgr.h index f0066c7f186..44dd746c34f 100644 --- a/reactos/dll/win32/qmgr/qmgr.h +++ b/reactos/dll/win32/qmgr/qmgr.h @@ -21,14 +21,21 @@ #ifndef __QMGR_H__ #define __QMGR_H__ -#include "windef.h" -#include "objbase.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include + +#include +#include +#include #define COBJMACROS -#include "bits1_5.h" +#include -#include -#include "wine/list.h" +//#include +#include /* Background copy job vtbl and related data */ typedef struct diff --git a/reactos/dll/win32/qmgr/qmgr_main.c b/reactos/dll/win32/qmgr/qmgr_main.c index 9c6b34582ab..eb70fe2eeee 100644 --- a/reactos/dll/win32/qmgr/qmgr_main.c +++ b/reactos/dll/win32/qmgr/qmgr_main.c @@ -21,20 +21,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "objbase.h" -#include "winuser.h" -#include "winreg.h" -#include "advpub.h" -#include "olectl.h" -#include "winsvc.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "bits.h" +//#include "bits.h" #include "qmgr.h" -#include "initguid.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/qmgr/service.c b/reactos/dll/win32/qmgr/service.c index b7dc7c39566..48f4939289f 100644 --- a/reactos/dll/win32/qmgr/service.c +++ b/reactos/dll/win32/qmgr/service.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "objbase.h" -#include "winsvc.h" -#include "bits.h" +#include +//#include "objbase.h" +#include +//#include "bits.h" #include "qmgr.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(qmgr); diff --git a/reactos/dll/win32/query/query_main.c b/reactos/dll/win32/query/query_main.c index 3414aecb2b7..ed96164bf94 100644 --- a/reactos/dll/win32/query/query_main.c +++ b/reactos/dll/win32/query/query_main.c @@ -18,22 +18,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "ntquery.h" -#include "cierror.h" -#include "initguid.h" +#include +#include +//#include "winuser.h" +//#include "winreg.h" +#include +#include +#include +//#include "initguid.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(query); diff --git a/reactos/dll/win32/rasadhlp/precomp.h b/reactos/dll/win32/rasadhlp/precomp.h index db24ad64efa..02fbd73724c 100644 --- a/reactos/dll/win32/rasadhlp/precomp.h +++ b/reactos/dll/win32/rasadhlp/precomp.h @@ -8,10 +8,17 @@ #define _WIN32_WINNT 0x502 #define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include /* PSDK Headers */ +#include +#include +#include #include -#include +//#include #include #include diff --git a/reactos/dll/win32/rasapi32/rasapi.c b/reactos/dll/win32/rasapi32/rasapi.c index 2184a2204fa..ffd7569f7c8 100644 --- a/reactos/dll/win32/rasapi32/rasapi.c +++ b/reactos/dll/win32/rasapi32/rasapi.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "ras.h" -#include "raserror.h" -#include "wine/debug.h" +//#include + +#include +//#include "winbase.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ras); diff --git a/reactos/dll/win32/rasdlg/rasdlg.c b/reactos/dll/win32/rasdlg/rasdlg.c index 682eddbf5c4..cc0590beb7a 100644 --- a/reactos/dll/win32/rasdlg/rasdlg.c +++ b/reactos/dll/win32/rasdlg/rasdlg.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include -#include "wine/debug.h" +#include +#include +//#include +#include #include WINE_DEFAULT_DEBUG_CHANNEL(ras); diff --git a/reactos/dll/win32/rasdlg/rasdlg.rc b/reactos/dll/win32/rasdlg/rasdlg.rc index 5cc7aa05eab..292b0aa0095 100644 --- a/reactos/dll/win32/rasdlg/rasdlg.rc +++ b/reactos/dll/win32/rasdlg/rasdlg.rc @@ -1,5 +1,7 @@ -#include -#include "resource.h" +#include +#include + +//#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Remote Access Common Dialog API\0" diff --git a/reactos/dll/win32/rasman/rasman.c b/reactos/dll/win32/rasman/rasman.c index 46c9697f214..7ca8b261adb 100644 --- a/reactos/dll/win32/rasman/rasman.c +++ b/reactos/dll/win32/rasman/rasman.c @@ -18,11 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include -#include -#include "wine/debug.h" +#include +#include +//#include +#include #include static HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/rasman/rasman.rc b/reactos/dll/win32/rasman/rasman.rc index 62edf1d0fc9..9f17042013c 100644 --- a/reactos/dll/win32/rasman/rasman.rc +++ b/reactos/dll/win32/rasman/rasman.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Remote Access Connection Manager\0" #define REACTOS_STR_INTERNAL_NAME "rasman\0" diff --git a/reactos/dll/win32/resutils/resutils.c b/reactos/dll/win32/resutils/resutils.c index b9e3c66fa1a..b72da3473e5 100644 --- a/reactos/dll/win32/resutils/resutils.c +++ b/reactos/dll/win32/resutils/resutils.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(resutils); diff --git a/reactos/dll/win32/riched20/editor.c b/reactos/dll/win32/riched20/editor.c index 6221f4b74d6..f7aed7f15cb 100644 --- a/reactos/dll/win32/riched20/editor.c +++ b/reactos/dll/win32/riched20/editor.c @@ -225,12 +225,12 @@ */ #include "editor.h" -#include "commdlg.h" -#include "winreg.h" +#include +//#include "winreg.h" #define NO_SHLWAPI_STREAM -#include "shlwapi.h" +//#include "shlwapi.h" #include "rtf.h" -#include "imm.h" +//#include "imm.h" #include "res.h" #define STACK_SIZE_DEFAULT 100 diff --git a/reactos/dll/win32/riched20/editor.h b/reactos/dll/win32/riched20/editor.h index b9c055fadcc..d96145f342e 100644 --- a/reactos/dll/win32/riched20/editor.h +++ b/reactos/dll/win32/riched20/editor.h @@ -19,7 +19,7 @@ */ #include "editstr.h" -#include "wine/unicode.h" +#include struct _RTF_Info; diff --git a/reactos/dll/win32/riched20/editstr.h b/reactos/dll/win32/riched20/editstr.h index 8f136cb0fa2..885d491678e 100644 --- a/reactos/dll/win32/riched20/editstr.h +++ b/reactos/dll/win32/riched20/editstr.h @@ -25,11 +25,15 @@ #define _WIN32_IE 0x0400 #endif +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION @@ -37,18 +41,18 @@ #include #include -#include -#include +//#include +//#include #include #include #include -#include +//#include #include #include -#include "imm.h" +#include #include -#include "wine/debug.h" +#include #ifdef __i386__ extern const struct ITextHostVtbl itextHostStdcallVtbl; diff --git a/reactos/dll/win32/riched20/reader.c b/reactos/dll/win32/riched20/reader.c index 02d46363f0c..524196fa1f3 100644 --- a/reactos/dll/win32/riched20/reader.c +++ b/reactos/dll/win32/riched20/reader.c @@ -36,16 +36,16 @@ * any purpose whatsoever. */ -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wine/debug.h" #include "editor.h" #include "rtf.h" diff --git a/reactos/dll/win32/riched20/richole.c b/reactos/dll/win32/riched20/richole.c index 9c74cfe4746..5ec1f37c84b 100644 --- a/reactos/dll/win32/riched20/richole.c +++ b/reactos/dll/win32/riched20/richole.c @@ -19,21 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "richole.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "ole2.h" +//#include "richole.h" #include "editor.h" -#include "tom.h" -#include "wine/debug.h" +#include +//#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); diff --git a/reactos/dll/win32/riched20/rtf.h b/reactos/dll/win32/riched20/rtf.h index 9f3822fa5b7..4b2ea37f699 100644 --- a/reactos/dll/win32/riched20/rtf.h +++ b/reactos/dll/win32/riched20/rtf.h @@ -1,14 +1,14 @@ #ifndef _RTF #define _RTF -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "richedit.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "richedit.h" /* diff --git a/reactos/dll/win32/riched20/txthost.c b/reactos/dll/win32/riched20/txthost.c index 4b72d8b4258..a17a0d02e3c 100644 --- a/reactos/dll/win32/riched20/txthost.c +++ b/reactos/dll/win32/riched20/txthost.c @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION #define COBJMACROS #include "editor.h" -#include "ole2.h" -#include "richole.h" -#include "imm.h" -#include "textserv.h" -#include "wine/debug.h" -#include "editstr.h" +//#include "ole2.h" +//#include "richole.h" +//#include "imm.h" +//#include "textserv.h" +//#include "wine/debug.h" +//#include "editstr.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); diff --git a/reactos/dll/win32/riched20/txtsrv.c b/reactos/dll/win32/riched20/txtsrv.c index e9cc5e1c5b7..4771a310060 100644 --- a/reactos/dll/win32/riched20/txtsrv.c +++ b/reactos/dll/win32/riched20/txtsrv.c @@ -18,21 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION #define COBJMACROS #include "editor.h" -#include "ole2.h" -#include "oleauto.h" -#include "richole.h" -#include "imm.h" -#include "textserv.h" -#include "wine/debug.h" -#include "editstr.h" +//#include "ole2.h" +//#include "oleauto.h" +//#include "richole.h" +//#include "imm.h" +//#include "textserv.h" +//#include "wine/debug.h" +//#include "editstr.h" #ifdef __i386__ /* thiscall functions are i386-specific */ diff --git a/reactos/dll/win32/riched20/writer.c b/reactos/dll/win32/riched20/writer.c index 653eab63444..8a69545950b 100644 --- a/reactos/dll/win32/riched20/writer.c +++ b/reactos/dll/win32/riched20/writer.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include "editor.h" #include "rtf.h" diff --git a/reactos/dll/win32/riched32/richedit.c b/reactos/dll/win32/riched32/richedit.c index 7513273291e..76a014c437f 100644 --- a/reactos/dll/win32/riched32/richedit.c +++ b/reactos/dll/win32/riched32/richedit.c @@ -21,18 +21,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winerror.h" -#include "winuser.h" -#include "richedit.h" -#include "shlwapi.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/debug.h" +#include +//#include +#include +#include +#include +#include +//#include "winerror.h" +#include +#include +#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(richedit); diff --git a/reactos/dll/win32/rpcrt4/cproxy.c b/reactos/dll/win32/rpcrt4/cproxy.c index b1acbb0c5dd..54609b9954e 100644 --- a/reactos/dll/win32/rpcrt4/cproxy.c +++ b/reactos/dll/win32/rpcrt4/cproxy.c @@ -21,24 +21,27 @@ * TODO: Handle non-i386 architectures */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include #include "cpsf.h" -#include "ndr_misc.h" -#include "ndr_stubless.h" -#include "wine/debug.h" +//#include "ndr_misc.h" +//#include "ndr_stubless.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/cpsf.c b/reactos/dll/win32/rpcrt4/cpsf.c index 9375c40fa4c..fffaeb2fa07 100644 --- a/reactos/dll/win32/rpcrt4/cpsf.c +++ b/reactos/dll/win32/rpcrt4/cpsf.c @@ -18,26 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include -#include -#include +//#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" +#include +#include +//#include "winerror.h" +#include -#include "objbase.h" +#include -#include "rpcproxy.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include #include "cpsf.h" diff --git a/reactos/dll/win32/rpcrt4/cstub.c b/reactos/dll/win32/rpcrt4/cstub.c index 74801f69b70..e59f79d3fb4 100644 --- a/reactos/dll/win32/rpcrt4/cstub.c +++ b/reactos/dll/win32/rpcrt4/cstub.c @@ -19,23 +19,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "excpt.h" +#include +#include +//#include "winerror.h" +//#include "excpt.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include #include "cpsf.h" diff --git a/reactos/dll/win32/rpcrt4/epm_towers.h b/reactos/dll/win32/rpcrt4/epm_towers.h index 1afd3eb3376..ba6d413986b 100644 --- a/reactos/dll/win32/rpcrt4/epm_towers.h +++ b/reactos/dll/win32/rpcrt4/epm_towers.h @@ -19,7 +19,7 @@ * */ -#include "epm_c.h" +#include #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 diff --git a/reactos/dll/win32/rpcrt4/ndr_clientserver.c b/reactos/dll/win32/rpcrt4/ndr_clientserver.c index 502faa10739..84159912c90 100644 --- a/reactos/dll/win32/rpcrt4/ndr_clientserver.c +++ b/reactos/dll/win32/rpcrt4/ndr_clientserver.c @@ -22,22 +22,25 @@ * - check for errors and throw exceptions */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "objbase.h" +#include -#include "rpcproxy.h" +//#include "rpcproxy.h" -#include "wine/debug.h" +#include -#include "ndr_misc.h" -#include "rpcndr.h" +//#include "ndr_misc.h" +//#include "rpcndr.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/ndr_contexthandle.c b/reactos/dll/win32/rpcrt4/ndr_contexthandle.c index cab0fc5d86e..c63e20fbafc 100644 --- a/reactos/dll/win32/rpcrt4/ndr_contexthandle.c +++ b/reactos/dll/win32/rpcrt4/ndr_contexthandle.c @@ -21,12 +21,16 @@ #include "ndr_misc.h" #include "rpc_assoc.h" -#include "rpcndr.h" +//#include "rpcndr.h" -#include "wine/rpcfc.h" +//#include "wine/rpcfc.h" -#include "wine/debug.h" -#include "wine/list.h" +#include +//#include "wine/list.h" + +#ifdef __REACTOS__ +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +#endif WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_es.c b/reactos/dll/win32/rpcrt4/ndr_es.c index cd0967ddea9..dbc73b3c2d4 100644 --- a/reactos/dll/win32/rpcrt4/ndr_es.c +++ b/reactos/dll/win32/rpcrt4/ndr_es.c @@ -18,21 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "rpc.h" -#include "midles.h" -#include "ndrtypes.h" +#include +#include +//#include "winerror.h" +#include +#include +//#include "ndrtypes.h" -#include "ndr_misc.h" +//#include "ndr_misc.h" #include "ndr_stubless.h" -#include "wine/debug.h" -#include "wine/rpcfc.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_fullpointer.c b/reactos/dll/win32/rpcrt4/ndr_fullpointer.c index 2bbd2b2b1aa..eaf0608c886 100644 --- a/reactos/dll/win32/rpcrt4/ndr_fullpointer.c +++ b/reactos/dll/win32/rpcrt4/ndr_fullpointer.c @@ -18,14 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "rpcndr.h" +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c index f0482e62dd3..83b636330a4 100644 --- a/reactos/dll/win32/rpcrt4/ndr_marshall.c +++ b/reactos/dll/win32/rpcrt4/ndr_marshall.c @@ -28,24 +28,24 @@ */ #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" #include "ndr_misc.h" -#include "rpcndr.h" -#include "ndrtypes.h" +//#include "rpcndr.h" +#include -#include "wine/unicode.h" -#include "wine/rpcfc.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_misc.h b/reactos/dll/win32/rpcrt4/ndr_misc.h index 2ca89b1744d..1c16cc0ec44 100644 --- a/reactos/dll/win32/rpcrt4/ndr_misc.h +++ b/reactos/dll/win32/rpcrt4/ndr_misc.h @@ -21,12 +21,15 @@ #ifndef __WINE_NDR_MISC_H #define __WINE_NDR_MISC_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "rpcndr.h" +#include +#include +#include +#include struct IPSFactoryBuffer; diff --git a/reactos/dll/win32/rpcrt4/ndr_ole.c b/reactos/dll/win32/rpcrt4/ndr_ole.c index c3ab5297df3..d4de1ab8a53 100644 --- a/reactos/dll/win32/rpcrt4/ndr_ole.c +++ b/reactos/dll/win32/rpcrt4/ndr_ole.c @@ -22,27 +22,30 @@ * - finish RpcStream_Vtbl */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include -#include +//#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "objbase.h" +#include #include "ndr_misc.h" -#include "rpcndr.h" -#include "rpcproxy.h" -#include "wine/rpcfc.h" -#include "cpsf.h" +//#include "rpcndr.h" +//#include "rpcproxy.h" +#include +//#include "cpsf.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c index fa5aad0f877..b11cacaf1bb 100644 --- a/reactos/dll/win32/rpcrt4/ndr_stubless.c +++ b/reactos/dll/win32/rpcrt4/ndr_stubless.c @@ -23,24 +23,27 @@ * - Some types of binding handles */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include +//#include "wine/port.h" + +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "objbase.h" -#include "rpc.h" -#include "rpcproxy.h" +#include +//#include "rpc.h" +#include -#include "wine/exception.h" -#include "wine/debug.h" -#include "wine/rpcfc.h" +#include +#include +#include #include "cpsf.h" #include "ndr_misc.h" diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.h b/reactos/dll/win32/rpcrt4/ndr_stubless.h index 61bc60682c1..92e68137708 100644 --- a/reactos/dll/win32/rpcrt4/ndr_stubless.h +++ b/reactos/dll/win32/rpcrt4/ndr_stubless.h @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "ndrtypes.h" +#include /* there can't be any alignment with the structures in this file */ -#include "pshpack1.h" +#include typedef struct _NDR_PROC_HEADER { @@ -223,7 +223,7 @@ typedef struct _NDR_EHD_CONTEXT unsigned char param_num; } NDR_EHD_CONTEXT; -#include "poppack.h" +#include enum stubless_phase { diff --git a/reactos/dll/win32/rpcrt4/rpc_assoc.c b/reactos/dll/win32/rpcrt4/rpc_assoc.c index 8364a9a4f36..28a5e2020e1 100644 --- a/reactos/dll/win32/rpcrt4/rpc_assoc.c +++ b/reactos/dll/win32/rpcrt4/rpc_assoc.c @@ -19,17 +19,22 @@ * */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include #include -#include "rpc.h" -#include "rpcndr.h" -#include "winternl.h" +#include +#include +#include +//#include "rpcndr.h" +#include -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include -#include "rpc_binding.h" +//#include "rpc_binding.h" #include "rpc_assoc.h" #include "rpc_message.h" diff --git a/reactos/dll/win32/rpcrt4/rpc_assoc.h b/reactos/dll/win32/rpcrt4/rpc_assoc.h index f8df62d3802..2960c33cb9f 100644 --- a/reactos/dll/win32/rpcrt4/rpc_assoc.h +++ b/reactos/dll/win32/rpcrt4/rpc_assoc.h @@ -20,7 +20,7 @@ */ #include "rpc_binding.h" -#include "wine/list.h" +//#include "wine/list.h" typedef struct _RpcAssoc { diff --git a/reactos/dll/win32/rpcrt4/rpc_async.c b/reactos/dll/win32/rpcrt4/rpc_async.c index 891fc5ad725..eb81b54468c 100644 --- a/reactos/dll/win32/rpcrt4/rpc_async.c +++ b/reactos/dll/win32/rpcrt4/rpc_async.c @@ -19,16 +19,21 @@ * */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "rpc.h" -#include "rpcndr.h" -#include "rpcasync.h" +#include +#include +#include +#include +//#include "rpcasync.h" -#include "wine/debug.h" +#include -#include "rpc_binding.h" -#include "rpc_message.h" +//#include "rpc_binding.h" +//#include "rpc_message.h" #include "ndr_stubless.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.c b/reactos/dll/win32/rpcrt4/rpc_binding.c index 685b569835e..a22ee41a72f 100644 --- a/reactos/dll/win32/rpcrt4/rpc_binding.c +++ b/reactos/dll/win32/rpcrt4/rpc_binding.c @@ -21,24 +21,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include -#include -#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "winternl.h" -#include "wine/unicode.h" +#include +#include +//#include "winnls.h" +//#include "winerror.h" +//#include "winternl.h" +#include -#include "rpc.h" -#include "rpcndr.h" +#include +//#include "rpcndr.h" -#include "wine/debug.h" +#include -#include "rpc_binding.h" +//#include "rpc_binding.h" #include "rpc_assoc.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.h b/reactos/dll/win32/rpcrt4/rpc_binding.h index 7d49074fc5e..fbdd1491526 100644 --- a/reactos/dll/win32/rpcrt4/rpc_binding.h +++ b/reactos/dll/win32/rpcrt4/rpc_binding.h @@ -21,9 +21,9 @@ #ifndef __WINE_RPC_BINDING_H #define __WINE_RPC_BINDING_H -#include "rpcndr.h" -#include "security.h" -#include "wine/list.h" +//#include "rpcndr.h" +#include +#include #include "rpc_defs.h" diff --git a/reactos/dll/win32/rpcrt4/rpc_defs.h b/reactos/dll/win32/rpcrt4/rpc_defs.h index 434d39699ee..f0d922f44b0 100644 --- a/reactos/dll/win32/rpcrt4/rpc_defs.h +++ b/reactos/dll/win32/rpcrt4/rpc_defs.h @@ -22,7 +22,7 @@ #ifndef __WINE_RPC_DEFS_H #define __WINE_RPC_DEFS_H -#include "pshpack1.h" +#include typedef struct { unsigned char rpc_ver; /* RPC major version (5) */ @@ -168,7 +168,7 @@ typedef struct unsigned char auth_reserved; /* reserved, must be zero */ unsigned int auth_context_id; /* unique value for the authenticated connection */ } RpcAuthVerifier; -#include "poppack.h" +#include #define RPC_AUTH_VERIFIER_LEN(common_hdr) \ ((common_hdr)->auth_len ? (common_hdr)->auth_len + sizeof(RpcAuthVerifier) : 0) diff --git a/reactos/dll/win32/rpcrt4/rpc_epmap.c b/reactos/dll/win32/rpcrt4/rpc_epmap.c index c5c25778bfb..68c2bd35c71 100644 --- a/reactos/dll/win32/rpcrt4/rpc_epmap.c +++ b/reactos/dll/win32/rpcrt4/rpc_epmap.c @@ -20,21 +20,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "rpc.h" +#include -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include #include "rpc_binding.h" -#include "epm_c.h" +//#include "epm_c.h" #include "epm_towers.h" +#ifdef __REACTOS__ +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +#endif + WINE_DEFAULT_DEBUG_CHANNEL(ole); /* The "real" RPC portmapper endpoints that I know of are: diff --git a/reactos/dll/win32/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c index 1d18627c339..34c524acd71 100644 --- a/reactos/dll/win32/rpcrt4/rpc_message.c +++ b/reactos/dll/win32/rpcrt4/rpc_message.c @@ -20,23 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _INC_WINDOWS + #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" +#include +#include +//#include "winerror.h" +#include -#include "rpc.h" -#include "rpcndr.h" -#include "rpcdcep.h" +#include +//#include "rpcndr.h" +//#include "rpcdcep.h" -#include "wine/debug.h" +#include #include "rpc_binding.h" -#include "rpc_defs.h" +//#include "rpc_defs.h" #include "rpc_message.h" #include "ncastatus.h" diff --git a/reactos/dll/win32/rpcrt4/rpc_message.h b/reactos/dll/win32/rpcrt4/rpc_message.h index 3ad876174e0..88ed182be12 100644 --- a/reactos/dll/win32/rpcrt4/rpc_message.h +++ b/reactos/dll/win32/rpcrt4/rpc_message.h @@ -21,7 +21,7 @@ #ifndef __WINE_RPC_MESSAGE_H #define __WINE_RPC_MESSAGE_H -#include "rpc_defs.h" +//#include "rpc_defs.h" typedef unsigned int NCA_STATUS; diff --git a/reactos/dll/win32/rpcrt4/rpc_server.c b/reactos/dll/win32/rpcrt4/rpc_server.c index e18cb5c3a7f..6e0c8278f72 100644 --- a/reactos/dll/win32/rpcrt4/rpc_server.c +++ b/reactos/dll/win32/rpcrt4/rpc_server.c @@ -20,29 +20,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define _INC_WINDOWS + +#include +//#include "wine/port.h" #include -#include -#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +#include +//#include "winerror.h" -#include "rpc.h" -#include "rpcndr.h" -#include "excpt.h" +#include +//#include "rpcndr.h" +//#include "excpt.h" -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include #include "rpc_server.h" #include "rpc_assoc.h" #include "rpc_message.h" -#include "rpc_defs.h" +//#include "rpc_defs.h" #include "ncastatus.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_server.h b/reactos/dll/win32/rpcrt4/rpc_server.h index a7f95395465..4cf5439f361 100644 --- a/reactos/dll/win32/rpcrt4/rpc_server.h +++ b/reactos/dll/win32/rpcrt4/rpc_server.h @@ -22,7 +22,7 @@ #define __WINE_RPC_SERVER_H #include "rpc_binding.h" -#include "wine/list.h" +//#include "wine/list.h" struct protseq_ops; diff --git a/reactos/dll/win32/rpcrt4/rpc_transport.c b/reactos/dll/win32/rpcrt4/rpc_transport.c index 1ec0fc6b667..f0fcbcfde6d 100644 --- a/reactos/dll/win32/rpcrt4/rpc_transport.c +++ b/reactos/dll/win32/rpcrt4/rpc_transport.c @@ -23,14 +23,20 @@ * */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS -#include +#include + +//#include #include -#include +//#include #include -#include -#include +//#include +//#include + +#include +#include #if defined(__MINGW32__) || defined (_MSC_VER) # include @@ -76,20 +82,18 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "wininet.h" -#include "winternl.h" -#include "wine/unicode.h" +//#include "winnls.h" +//#include "winerror.h" +#include +#include +#include -#include "rpc.h" -#include "rpcndr.h" +#include +//#include "rpcndr.h" -#include "wine/debug.h" +#include -#include "rpc_binding.h" +//#include "rpc_binding.h" #include "rpc_assoc.h" #include "rpc_message.h" #include "rpc_server.h" diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rc b/reactos/dll/win32/rpcrt4/rpcrt4.rc index 446318060a7..755788fa868 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4.rc +++ b/reactos/dll/win32/rpcrt4/rpcrt4.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" #define REACTOS_STR_INTERNAL_NAME "rpcrt4\0" diff --git a/reactos/dll/win32/rpcrt4/rpcrt4_main.c b/reactos/dll/win32/rpcrt4/rpcrt4_main.c index 2d7a754d626..651c5c31207 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4_main.c +++ b/reactos/dll/win32/rpcrt4/rpcrt4_main.c @@ -28,35 +28,36 @@ * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. */ -#include "config.h" +#include #include #include -#include -#include +//#include +//#include #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "winuser.h" -#include "winnt.h" -#include "winternl.h" -#include "ntsecapi.h" -#include "iptypes.h" -#include "iphlpapi.h" -#include "wine/unicode.h" -#include "rpc.h" +#define _INC_WINDOWS +#include +//#include "winerror.h" +#include +//#include "winuser.h" +//#include "winnt.h" +#include +#include +//#include "iptypes.h" +#include +#include +#include -#include "ole2.h" -#include "rpcndr.h" -#include "rpcproxy.h" +//#include "ole2.h" +//#include "rpcndr.h" +//#include "rpcproxy.h" -#include "rpc_binding.h" +//#include "rpc_binding.h" #include "rpc_server.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/unix_func.c b/reactos/dll/win32/rpcrt4/unix_func.c index e64af84f2e6..b9e0af28a8f 100644 --- a/reactos/dll/win32/rpcrt4/unix_func.c +++ b/reactos/dll/win32/rpcrt4/unix_func.c @@ -1,7 +1,7 @@ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#include #include -#include -#include const char * WSAAPI diff --git a/reactos/dll/win32/rsabase/version.rc b/reactos/dll/win32/rsabase/version.rc index 56c7502458f..fd05a191eab 100644 --- a/reactos/dll/win32/rsabase/version.rc +++ b/reactos/dll/win32/rsabase/version.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/rsaenh/handle.c b/reactos/dll/win32/rsaenh/handle.c index ade19093621..0812dccc7f0 100644 --- a/reactos/dll/win32/rsaenh/handle.c +++ b/reactos/dll/win32/rsaenh/handle.c @@ -21,14 +21,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + +//#include #include -#include "windef.h" -#include "winbase.h" +#include +#include #include "handle.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(handle); diff --git a/reactos/dll/win32/rsaenh/handle.h b/reactos/dll/win32/rsaenh/handle.h index 662553e2b5f..7dc70206c43 100644 --- a/reactos/dll/win32/rsaenh/handle.h +++ b/reactos/dll/win32/rsaenh/handle.h @@ -24,7 +24,7 @@ #ifndef __WINE_HANDLE_H #define __WINE_HANDLE_H -#include "wincrypt.h" +#include #ifdef __cplusplus extern "C" { diff --git a/reactos/dll/win32/rsaenh/implglue.c b/reactos/dll/win32/rsaenh/implglue.c index 2d5a1b401ca..2084b1f8ca6 100644 --- a/reactos/dll/win32/rsaenh/implglue.c +++ b/reactos/dll/win32/rsaenh/implglue.c @@ -21,17 +21,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN -#include "wine/port.h" -#include "wine/library.h" +#include -#include "windef.h" -#include "wincrypt.h" +//#include "wine/port.h" +#include + +//#include "windef.h" +#include #include "implglue.h" -#include +//#include /* Function prototypes copied from dlls/advapi32/crypt_md4.c */ VOID WINAPI MD4Init( MD4_CTX *ctx ); diff --git a/reactos/dll/win32/rsaenh/mpi.c b/reactos/dll/win32/rsaenh/mpi.c index 055da3d940d..d75241091d2 100644 --- a/reactos/dll/win32/rsaenh/mpi.c +++ b/reactos/dll/win32/rsaenh/mpi.c @@ -30,8 +30,8 @@ #include -#include "windef.h" -#include "winbase.h" +#include +#include #include "tomcrypt.h" /* Known optimal configurations diff --git a/reactos/dll/win32/rsaenh/rsaenh.c b/reactos/dll/win32/rsaenh/rsaenh.c index 9d387939a1f..d59008b75f6 100644 --- a/reactos/dll/win32/rsaenh/rsaenh.c +++ b/reactos/dll/win32/rsaenh/rsaenh.c @@ -22,22 +22,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/library.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include +#include +//#include "wine/port.h" +#include +#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincrypt.h" +//#include +//#include + +#include +//#include "winbase.h" +#include +//#include "wincrypt.h" #include "handle.h" #include "implglue.h" -#include "objbase.h" -#include "rpcproxy.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/reactos/dll/win32/rsaenh/sha2.c b/reactos/dll/win32/rsaenh/sha2.c index 76e7184a0c2..e60b4719b39 100644 --- a/reactos/dll/win32/rsaenh/sha2.c +++ b/reactos/dll/win32/rsaenh/sha2.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include #include #include diff --git a/reactos/dll/win32/rsaenh/tomcrypt.h b/reactos/dll/win32/rsaenh/tomcrypt.h index 49fb352729c..fe96d1a69f3 100644 --- a/reactos/dll/win32/rsaenh/tomcrypt.h +++ b/reactos/dll/win32/rsaenh/tomcrypt.h @@ -35,8 +35,8 @@ #include #include #include -#include -#include "basetsd.h" +//#include +#include /* error codes [will be expanded in future releases] */ enum { diff --git a/reactos/dll/win32/samlib/precomp.h b/reactos/dll/win32/samlib/precomp.h index 16f548cc8b7..13ce3be54d5 100644 --- a/reactos/dll/win32/samlib/precomp.h +++ b/reactos/dll/win32/samlib/precomp.h @@ -1,13 +1,15 @@ -#include #include #define WIN32_NO_STATUS -#include -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include + #define NTOS_MODE_USER #include #include -#include "sam_c.h" +#include #include diff --git a/reactos/dll/win32/samlib/samlib.rc b/reactos/dll/win32/samlib/samlib.rc index 00243c0b988..214d3e110aa 100644 --- a/reactos/dll/win32/samlib/samlib.rc +++ b/reactos/dll/win32/samlib/samlib.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Security Account Manager interface DLL\0" #define REACTOS_STR_INTERNAL_NAME "samlib\0" diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c index d678996f27a..c78cfb856b2 100644 --- a/reactos/dll/win32/samsrv/samsrv.c +++ b/reactos/dll/win32/samsrv/samsrv.c @@ -19,7 +19,7 @@ /* INCLUDES *****************************************************************/ -#include +#include "samsrv.h" WINE_DEFAULT_DEBUG_CHANNEL(samsrv); diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h index 370f4e5b886..662ad0c278f 100644 --- a/reactos/dll/win32/samsrv/samsrv.h +++ b/reactos/dll/win32/samsrv/samsrv.h @@ -8,21 +8,25 @@ */ #include +#include #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #define NTOS_MODE_USER #include #include #include #include -#include #include #include #include #include -#include "sam_s.h" +#include #include diff --git a/reactos/dll/win32/sccbase/main.c b/reactos/dll/win32/sccbase/main.c index 7a012f5606c..10e2f886eeb 100644 --- a/reactos/dll/win32/sccbase/main.c +++ b/reactos/dll/win32/sccbase/main.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(sccbase); diff --git a/reactos/dll/win32/schannel/lsamode.c b/reactos/dll/win32/schannel/lsamode.c index f43150e3d3a..7429b2c070e 100644 --- a/reactos/dll/win32/schannel/lsamode.c +++ b/reactos/dll/win32/schannel/lsamode.c @@ -20,16 +20,18 @@ #include -#include "ntstatus.h" +#include #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "sspi.h" -#include "ntsecapi.h" -#include "ntsecpkg.h" -#include "schannel.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(schannel); diff --git a/reactos/dll/win32/schannel/schannel_main.c b/reactos/dll/win32/schannel/schannel_main.c index 5f8b5691134..0fb573d21fb 100644 --- a/reactos/dll/win32/schannel/schannel_main.c +++ b/reactos/dll/win32/schannel/schannel_main.c @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(schannel); diff --git a/reactos/dll/win32/schannel/usermode.c b/reactos/dll/win32/schannel/usermode.c index 0713f822f91..3a4da26a885 100644 --- a/reactos/dll/win32/schannel/usermode.c +++ b/reactos/dll/win32/schannel/usermode.c @@ -20,15 +20,17 @@ #include -#include "ntstatus.h" +#include #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "sspi.h" -#include "ntsecapi.h" -#include "ntsecpkg.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(schannel); diff --git a/reactos/dll/win32/schannel/version.rc b/reactos/dll/win32/schannel/version.rc index 0b41bd5d7dc..95a12d7f72e 100644 --- a/reactos/dll/win32/schannel/version.rc +++ b/reactos/dll/win32/schannel/version.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/secur32/dllmain.c b/reactos/dll/win32/secur32/dllmain.c index 73c0a5c1ed9..39f8ad0c42d 100644 --- a/reactos/dll/win32/secur32/dllmain.c +++ b/reactos/dll/win32/secur32/dllmain.c @@ -9,7 +9,7 @@ */ /* INCLUDES ******************************************************************/ -#include +#include "precomp.h" /* GLOBALS *******************************************************************/ diff --git a/reactos/dll/win32/secur32/precomp.h b/reactos/dll/win32/secur32/precomp.h index b28355c09e2..ba2e353a351 100644 --- a/reactos/dll/win32/secur32/precomp.h +++ b/reactos/dll/win32/secur32/precomp.h @@ -8,14 +8,18 @@ /* INCLUDES ******************************************************************/ +#include + /* SDK/DDK/NDK Headers. */ #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #define NTOS_MODE_USER #include #include -#include #include #include -#include diff --git a/reactos/dll/win32/secur32/secext.c b/reactos/dll/win32/secur32/secext.c index 5b990639970..710f82ed9eb 100644 --- a/reactos/dll/win32/secur32/secext.c +++ b/reactos/dll/win32/secur32/secext.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/secur32/secur32.rc b/reactos/dll/win32/secur32/secur32.rc index d76366f5576..889a00d9bbe 100644 --- a/reactos/dll/win32/secur32/secur32.rc +++ b/reactos/dll/win32/secur32/secur32.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Security\0" #define REACTOS_STR_INTERNAL_NAME "secur32\0" diff --git a/reactos/dll/win32/secur32/sspi.c b/reactos/dll/win32/secur32/sspi.c index af4cdc28bb1..5cb902f26d9 100644 --- a/reactos/dll/win32/secur32/sspi.c +++ b/reactos/dll/win32/secur32/sspi.c @@ -1,4 +1,4 @@ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/secur32/stubs.c b/reactos/dll/win32/secur32/stubs.c index a864105de12..56214cf10b1 100644 --- a/reactos/dll/win32/secur32/stubs.c +++ b/reactos/dll/win32/secur32/stubs.c @@ -1,5 +1,5 @@ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/sensapi/sensapi.c b/reactos/dll/win32/sensapi/sensapi.c index 86e4a925692..22fbb6e5094 100644 --- a/reactos/dll/win32/sensapi/sensapi.c +++ b/reactos/dll/win32/sensapi/sensapi.c @@ -22,25 +22,27 @@ * connections. For Wine we just report that we are always connected. */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "sensevts.h" -#include "sensapi.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +//#include "ole2.h" +//#include "sensevts.h" +#include -#include "uuids.h" +//#include "uuids.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(sensapi); diff --git a/reactos/dll/win32/serialui/resource.h b/reactos/dll/win32/serialui/resource.h index 05402aa02a5..a6f09b3fa03 100644 --- a/reactos/dll/win32/serialui/resource.h +++ b/reactos/dll/win32/serialui/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_EVENPARITY 2001 #define IDS_MARKPARITY 2002 #define IDS_NOPARITY 2003 diff --git a/reactos/dll/win32/serialui/serialui.c b/reactos/dll/win32/serialui/serialui.c index b0eff63db25..6c0edebad0e 100644 --- a/reactos/dll/win32/serialui/serialui.c +++ b/reactos/dll/win32/serialui/serialui.c @@ -9,7 +9,7 @@ * ST (05/04/2005) Created. Implemented drvCommConfigDialog. */ -#include +#include "serialui.h" static HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/serialui/serialui.h b/reactos/dll/win32/serialui/serialui.h index ba293ca185d..f597eac5e19 100644 --- a/reactos/dll/win32/serialui/serialui.h +++ b/reactos/dll/win32/serialui/serialui.h @@ -6,8 +6,15 @@ * PROGRAMMERS: Saveliy Tretiakov (saveliyt@mail.ru) */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include + #include "resource.h" #define UNIMPLEMENTED \ diff --git a/reactos/dll/win32/serialui/serialui.rc b/reactos/dll/win32/serialui/serialui.rc index 27a4ca1844a..fdab6b60a83 100644 --- a/reactos/dll/win32/serialui/serialui.rc +++ b/reactos/dll/win32/serialui/serialui.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/setupapi/queue.c b/reactos/dll/win32/setupapi/queue.c index 5f620226e65..ccdcf284a8e 100644 --- a/reactos/dll/win32/setupapi/queue.c +++ b/reactos/dll/win32/setupapi/queue.c @@ -20,6 +20,8 @@ #include "setupapi_private.h" +#include + WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ diff --git a/reactos/dll/win32/setupapi/resource.h b/reactos/dll/win32/setupapi/resource.h index 7dc361515f6..2528d3e9234 100644 --- a/reactos/dll/win32/setupapi/resource.h +++ b/reactos/dll/win32/setupapi/resource.h @@ -1,3 +1,5 @@ +#pragma once + #define IDS_QUERY_REBOOT_TEXT 1000 #define IDS_QUERY_REBOOT_CAPTION 2000 #define IDS_INF_FILE 2001 @@ -48,4 +50,3 @@ #define IDI_SETUPAPI_WARN_OVERLAY 500 #define IDI_SETUPAPI_ERR_OVERLAY 501 #define IDI_SETUPAPI_INFO_OVERLAY 502 - diff --git a/reactos/dll/win32/setupapi/setupapi.rc b/reactos/dll/win32/setupapi/setupapi.rc index 33e87dc6308..e07a5cef3a6 100644 --- a/reactos/dll/win32/setupapi/setupapi.rc +++ b/reactos/dll/win32/setupapi/setupapi.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include +#include + #include "resource.h" #include "res/icons_res.rc" diff --git a/reactos/dll/win32/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h index a8aa5917ab2..88dd35afd08 100644 --- a/reactos/dll/win32/setupapi/setupapi_private.h +++ b/reactos/dll/win32/setupapi/setupapi_private.h @@ -20,20 +20,24 @@ #ifndef __SETUPAPI_PRIVATE_H #define __SETUPAPI_PRIVATE_H -#include -#include #include -#include #include #include #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include #include #include @@ -45,11 +49,12 @@ #include #include -#include +//#include #include + #include "rpc_private.h" -#include "resource.h" +//#include "resource.h" #ifdef __REACTOS__ #undef __WINESRC__ diff --git a/reactos/dll/win32/sfc/precomp.h b/reactos/dll/win32/sfc/precomp.h index c8b836cf4b0..b1e2ee66da9 100644 --- a/reactos/dll/win32/sfc/precomp.h +++ b/reactos/dll/win32/sfc/precomp.h @@ -1,8 +1,10 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ -#include -#include +#define WIN32_NO_STATUS +#include +#include +#include #include DWORD WINAPI sfc_8(VOID); diff --git a/reactos/dll/win32/sfc_os/precomp.h b/reactos/dll/win32/sfc_os/precomp.h index 3a0b5e06545..b47213962cb 100644 --- a/reactos/dll/win32/sfc_os/precomp.h +++ b/reactos/dll/win32/sfc_os/precomp.h @@ -1,6 +1,10 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ -#include +#define WIN32_NO_STATUS +#include +#include +#include +#include #endif diff --git a/reactos/dll/win32/sfc_os/sfc_os.c b/reactos/dll/win32/sfc_os/sfc_os.c index 57a104d1139..c35524b0938 100644 --- a/reactos/dll/win32/sfc_os/sfc_os.c +++ b/reactos/dll/win32/sfc_os/sfc_os.c @@ -19,7 +19,7 @@ */ #include "precomp.h" -#include "debug.h" +#include HINSTANCE hLibModule; diff --git a/reactos/dll/win32/shdoclc/rsrc.rc b/reactos/dll/win32/shdoclc/rsrc.rc index f6ed60949a4..58b0c296e65 100644 --- a/reactos/dll/win32/shdoclc/rsrc.rc +++ b/reactos/dll/win32/shdoclc/rsrc.rc @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" -#include "mshtmcid.h" +#include +//#include "winuser.h" +#include -#include "shdoclc.h" +//#include "shdoclc.h" #ifdef LANGUAGE_BG_BG #include "Bg.rc" diff --git a/reactos/dll/win32/shdoclc/shdoclc.h b/reactos/dll/win32/shdoclc/shdoclc.h index b5492d6243a..cc0ab28d5cf 100644 --- a/reactos/dll/win32/shdoclc/shdoclc.h +++ b/reactos/dll/win32/shdoclc/shdoclc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include #define IDS_MESSAGE_BOX_TITLE 2213 diff --git a/reactos/dll/win32/shdocvw/classinfo.c b/reactos/dll/win32/shdocvw/classinfo.c index f054398cd92..5f4faf436f0 100644 --- a/reactos/dll/win32/shdocvw/classinfo.c +++ b/reactos/dll/win32/shdocvw/classinfo.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +//#include "winbase.h" #include "shdocvw.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/client.c b/reactos/dll/win32/shdocvw/client.c index a2f2927ef6e..edafbc8a887 100644 --- a/reactos/dll/win32/shdocvw/client.c +++ b/reactos/dll/win32/shdocvw/client.c @@ -18,10 +18,10 @@ #include -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "mshtmdid.h" -#include "idispids.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/dochost.c b/reactos/dll/win32/shdocvw/dochost.c index f74d06413ac..b777272f96a 100644 --- a/reactos/dll/win32/shdocvw/dochost.c +++ b/reactos/dll/win32/shdocvw/dochost.c @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "hlink.h" -#include "exdispid.h" -#include "mshtml.h" -#include "initguid.h" +//#include "hlink.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/events.c b/reactos/dll/win32/shdocvw/events.c index 85903595295..ab79adb7332 100644 --- a/reactos/dll/win32/shdocvw/events.c +++ b/reactos/dll/win32/shdocvw/events.c @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "wine/debug.h" +//#include +#include #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/factory.c b/reactos/dll/win32/shdocvw/factory.c index 751b5a48fd6..82b3aaa374b 100644 --- a/reactos/dll/win32/shdocvw/factory.c +++ b/reactos/dll/win32/shdocvw/factory.c @@ -18,17 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include #include "shdocvw.h" -#include "winreg.h" -#include "advpub.h" -#include "isguids.h" +//#include "winreg.h" +#include +//#include "isguids.h" -#include "winver.h" +//#include "winver.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/frame.c b/reactos/dll/win32/shdocvw/frame.c index 2f089c12595..ba8d68542a9 100644 --- a/reactos/dll/win32/shdocvw/frame.c +++ b/reactos/dll/win32/shdocvw/frame.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/ie.c b/reactos/dll/win32/shdocvw/ie.c index 2a048e3ae8f..18894c690d4 100644 --- a/reactos/dll/win32/shdocvw/ie.c +++ b/reactos/dll/win32/shdocvw/ie.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/iexplore.c b/reactos/dll/win32/shdocvw/iexplore.c index a0d2684894f..523d191d219 100644 --- a/reactos/dll/win32/shdocvw/iexplore.c +++ b/reactos/dll/win32/shdocvw/iexplore.c @@ -21,24 +21,24 @@ #define COBJMACROS -#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winnls.h" -#include "ole2.h" -#include "exdisp.h" -#include "oleidl.h" +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" +//#include "winnls.h" +//#include "ole2.h" +//#include "exdisp.h" +//#include "oleidl.h" #include "shdocvw.h" -#include "mshtmcid.h" -#include "shellapi.h" -#include "winreg.h" -#include "shlwapi.h" -#include "intshcut.h" +#include +//#include "shellapi.h" +//#include "winreg.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/intshcut.c b/reactos/dll/win32/shdocvw/intshcut.c index 202a523d1f3..75502621a54 100644 --- a/reactos/dll/win32/shdocvw/intshcut.c +++ b/reactos/dll/win32/shdocvw/intshcut.c @@ -27,17 +27,17 @@ * The installer for the Zuma Deluxe Popcap game is good for testing. */ -#include -#include +//#include +//#include -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "objidl.h" -#include "shobjidl.h" -#include "intshcut.h" -#include "shellapi.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "objidl.h" +//#include "shobjidl.h" +#include +//#include "shellapi.h" +//#include "winreg.h" +//#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/navigate.c b/reactos/dll/win32/shdocvw/navigate.c index a160ee2b52e..5d33130cd84 100644 --- a/reactos/dll/win32/shdocvw/navigate.c +++ b/reactos/dll/win32/shdocvw/navigate.c @@ -19,15 +19,15 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "exdispid.h" -#include "shellapi.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wininet.h" -#include "mshtml.h" +#include +//#include "shellapi.h" +//#include "winreg.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/oleobject.c b/reactos/dll/win32/shdocvw/oleobject.c index 49a4d3b45f8..906b62e426b 100644 --- a/reactos/dll/win32/shdocvw/oleobject.c +++ b/reactos/dll/win32/shdocvw/oleobject.c @@ -23,12 +23,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "wine/debug.h" +//#include +#include #include "shdocvw.h" -#include "htiframe.h" -#include "idispids.h" -#include "mshtmdid.h" +//#include "htiframe.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/persist.c b/reactos/dll/win32/shdocvw/persist.c index 6c4f1e593be..0bab6c45f1a 100644 --- a/reactos/dll/win32/shdocvw/persist.c +++ b/reactos/dll/win32/shdocvw/persist.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/resource.h b/reactos/dll/win32/shdocvw/resource.h index 6f5c777061f..575f0ef71c3 100644 --- a/reactos/dll/win32/shdocvw/resource.h +++ b/reactos/dll/win32/shdocvw/resource.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include #define IDR_BROWSE_MAIN_MENU 1000 diff --git a/reactos/dll/win32/shdocvw/shdocvw.h b/reactos/dll/win32/shdocvw/shdocvw.h index 61dc63fb0e0..e471f3256e4 100644 --- a/reactos/dll/win32/shdocvw/shdocvw.h +++ b/reactos/dll/win32/shdocvw/shdocvw.h @@ -22,24 +22,31 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" +#include +#include -#include "ole2.h" -#include "olectl.h" -#include "shlobj.h" -#include "exdisp.h" -#include "mshtmhst.h" -#include "hlink.h" -#include "htiframe.h" +#include +#include +#include +#include +//#include "exdisp.h" +#include +#include +#include -#include "wine/unicode.h" +#include #include "resource.h" diff --git a/reactos/dll/win32/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c index a0070b489d4..6f752d5879b 100644 --- a/reactos/dll/win32/shdocvw/shdocvw_main.c +++ b/reactos/dll/win32/shdocvw/shdocvw_main.c @@ -20,21 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include -#include +//#include +//#include -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include #include "shdocvw.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wininet.h" +//#include "winreg.h" +#include +#include -#include "initguid.h" +//#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/shlinstobj.c b/reactos/dll/win32/shdocvw/shlinstobj.c index d272c91d3bc..03499a61f53 100644 --- a/reactos/dll/win32/shdocvw/shlinstobj.c +++ b/reactos/dll/win32/shdocvw/shlinstobj.c @@ -23,20 +23,20 @@ * some registry entries. This feature was introduced with win2k. Please * search for 'Shell Instance Objects' on MSDN to get more information. */ -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "oleauto.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winreg.h" +//#include "objbase.h" +//#include "oleauto.h" #include "shdocvw.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/taskbarlist.c b/reactos/dll/win32/shdocvw/taskbarlist.c index 2c380800ddf..0d5e0fa91cd 100644 --- a/reactos/dll/win32/shdocvw/taskbarlist.c +++ b/reactos/dll/win32/shdocvw/taskbarlist.c @@ -17,9 +17,9 @@ * */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include +//#include "wine/port.h" +#include #include "shdocvw.h" diff --git a/reactos/dll/win32/shdocvw/urlhist.c b/reactos/dll/win32/shdocvw/urlhist.c index c801718f1f3..c66d4c21856 100644 --- a/reactos/dll/win32/shdocvw/urlhist.c +++ b/reactos/dll/win32/shdocvw/urlhist.c @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "urlhist.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/view.c b/reactos/dll/win32/shdocvw/view.c index 9ee7c067333..b48ac5c27a3 100644 --- a/reactos/dll/win32/shdocvw/view.c +++ b/reactos/dll/win32/shdocvw/view.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shdocvw/webbrowser.c b/reactos/dll/win32/shdocvw/webbrowser.c index ac45d858b45..e9a6b5766ae 100644 --- a/reactos/dll/win32/shdocvw/webbrowser.c +++ b/reactos/dll/win32/shdocvw/webbrowser.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include #include "shdocvw.h" -#include "exdispid.h" -#include "mshtml.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index ef874d99471..41660cfe658 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D_SHELL32_ - -DCOM_NO_WINDOWS_H -D_WINE) include_directories( diff --git a/reactos/dll/win32/shell32/autocomplete.cpp b/reactos/dll/win32/shell32/autocomplete.cpp index 01afcc99f4e..12d18e4f2d0 100644 --- a/reactos/dll/win32/shell32/autocomplete.cpp +++ b/reactos/dll/win32/shell32/autocomplete.cpp @@ -35,7 +35,7 @@ */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/brsfolder.cpp b/reactos/dll/win32/shell32/brsfolder.cpp index 266fb64f952..a6e58825d20 100644 --- a/reactos/dll/win32/shell32/brsfolder.cpp +++ b/reactos/dll/win32/shell32/brsfolder.cpp @@ -23,7 +23,7 @@ * - implement new dialog style resizing */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/changenotify.cpp b/reactos/dll/win32/shell32/changenotify.cpp index c9c85967b7b..c0706a8cf00 100644 --- a/reactos/dll/win32/shell32/changenotify.cpp +++ b/reactos/dll/win32/shell32/changenotify.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/classes.cpp b/reactos/dll/win32/shell32/classes.cpp index b1e8a9e46e0..cfe96d51529 100644 --- a/reactos/dll/win32/shell32/classes.cpp +++ b/reactos/dll/win32/shell32/classes.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/clipboard.cpp b/reactos/dll/win32/shell32/clipboard.cpp index b4a6943bf17..293da4e7731 100644 --- a/reactos/dll/win32/shell32/clipboard.cpp +++ b/reactos/dll/win32/shell32/clipboard.cpp @@ -35,7 +35,7 @@ * */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/control.cpp b/reactos/dll/win32/shell32/control.cpp index 09dcbd6a5a4..421c46df5b8 100644 --- a/reactos/dll/win32/shell32/control.cpp +++ b/reactos/dll/win32/shell32/control.cpp @@ -18,7 +18,7 @@ */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); diff --git a/reactos/dll/win32/shell32/cpanel.h b/reactos/dll/win32/shell32/cpanel.h index e8b06f2d074..3685cd95b04 100644 --- a/reactos/dll/win32/shell32/cpanel.h +++ b/reactos/dll/win32/shell32/cpanel.h @@ -20,7 +20,7 @@ #ifndef __WINE_SHELL_CPANEL_H #define __WINE_SHELL_CPANEL_H -#include "cpl.h" +#include typedef struct CPlApplet { diff --git a/reactos/dll/win32/shell32/dataobject.cpp b/reactos/dll/win32/shell32/dataobject.cpp index 19368707ffb..4d13b445ccc 100644 --- a/reactos/dll/win32/shell32/dataobject.cpp +++ b/reactos/dll/win32/shell32/dataobject.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/dde.cpp b/reactos/dll/win32/shell32/dde.cpp index 96139bbdb7a..21beb48b161 100644 --- a/reactos/dll/win32/shell32/dde.cpp +++ b/reactos/dll/win32/shell32/dde.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/debughlp.cpp b/reactos/dll/win32/shell32/debughlp.cpp index a64b6f7dfae..47cc2cea525 100644 --- a/reactos/dll/win32/shell32/debughlp.cpp +++ b/reactos/dll/win32/shell32/debughlp.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(pidl); diff --git a/reactos/dll/win32/shell32/debughlp.h b/reactos/dll/win32/shell32/debughlp.h index 62fb5bf1a55..19923e4258f 100644 --- a/reactos/dll/win32/shell32/debughlp.h +++ b/reactos/dll/win32/shell32/debughlp.h @@ -21,13 +21,6 @@ #ifndef __WINE_SHELL32_DEBUGHLP_H #define __WINE_SHELL32_DEBUGHLP_H -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "shlobj.h" - extern void pdump (LPCITEMIDLIST pidl); extern BOOL pcheck (LPCITEMIDLIST pidl); extern const char * shdebugstr_guid( const struct _GUID *id ); diff --git a/reactos/dll/win32/shell32/defcontextmenu.cpp b/reactos/dll/win32/shell32/defcontextmenu.cpp index a9788f3e7b4..7b54fb153cf 100644 --- a/reactos/dll/win32/shell32/defcontextmenu.cpp +++ b/reactos/dll/win32/shell32/defcontextmenu.cpp @@ -15,7 +15,7 @@ TODO: example of the wrong way to do it. */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(dmenu); diff --git a/reactos/dll/win32/shell32/desktop.cpp b/reactos/dll/win32/shell32/desktop.cpp index 8f80a093f1e..93fc40ed189 100644 --- a/reactos/dll/win32/shell32/desktop.cpp +++ b/reactos/dll/win32/shell32/desktop.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(desktop); diff --git a/reactos/dll/win32/shell32/dialogs.cpp b/reactos/dll/win32/shell32/dialogs.cpp index 30e51a9b3a9..4d42e13d39d 100644 --- a/reactos/dll/win32/shell32/dialogs.cpp +++ b/reactos/dll/win32/shell32/dialogs.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" typedef struct diff --git a/reactos/dll/win32/shell32/dragdrophelper.cpp b/reactos/dll/win32/shell32/dragdrophelper.cpp index 84728d91e03..51a46dd1d2a 100644 --- a/reactos/dll/win32/shell32/dragdrophelper.cpp +++ b/reactos/dll/win32/shell32/dragdrophelper.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); diff --git a/reactos/dll/win32/shell32/drive.cpp b/reactos/dll/win32/shell32/drive.cpp index 60b74ef7904..3b57b7d3ee7 100644 --- a/reactos/dll/win32/shell32/drive.cpp +++ b/reactos/dll/win32/shell32/drive.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" using namespace std; #define MAX_PROPERTY_SHEET_PAGE 32 diff --git a/reactos/dll/win32/shell32/drvdefext.cpp b/reactos/dll/win32/shell32/drvdefext.cpp index 5a0aba60b39..08b03e2aff5 100644 --- a/reactos/dll/win32/shell32/drvdefext.cpp +++ b/reactos/dll/win32/shell32/drvdefext.cpp @@ -20,7 +20,7 @@ */ #define _USE_MATH_DEFINES -#include +#include "precomp.h" #include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/enumidlist.cpp b/reactos/dll/win32/shell32/enumidlist.cpp index 8270291de01..e490d5ede5d 100644 --- a/reactos/dll/win32/shell32/enumidlist.cpp +++ b/reactos/dll/win32/shell32/enumidlist.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/enumidlist.h b/reactos/dll/win32/shell32/enumidlist.h index b68265acd29..03bde1bccf0 100644 --- a/reactos/dll/win32/shell32/enumidlist.h +++ b/reactos/dll/win32/shell32/enumidlist.h @@ -16,8 +16,6 @@ #ifndef __ENUMIDLIST_H__ #define __ENUMIDLIST_H__ -#include "shlobj.h" - struct ENUMLIST { ENUMLIST *pNext; diff --git a/reactos/dll/win32/shell32/extracticon.cpp b/reactos/dll/win32/shell32/extracticon.cpp index aa51b3a542b..80c65d543d1 100644 --- a/reactos/dll/win32/shell32/extracticon.cpp +++ b/reactos/dll/win32/shell32/extracticon.cpp @@ -7,7 +7,7 @@ * PROGRAMMERS: Herv Poussineau (hpoussin@reactos.org) */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/filedefext.cpp b/reactos/dll/win32/shell32/filedefext.cpp index d086d29a038..7342e27dae3 100644 --- a/reactos/dll/win32/shell32/filedefext.cpp +++ b/reactos/dll/win32/shell32/filedefext.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/folder_options.cpp b/reactos/dll/win32/shell32/folder_options.cpp index bbeef3c47ba..f15d01604cf 100644 --- a/reactos/dll/win32/shell32/folder_options.cpp +++ b/reactos/dll/win32/shell32/folder_options.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL (fprop); diff --git a/reactos/dll/win32/shell32/folders.cpp b/reactos/dll/win32/shell32/folders.cpp index 147340d6cc4..8a6efacc5f7 100644 --- a/reactos/dll/win32/shell32/folders.cpp +++ b/reactos/dll/win32/shell32/folders.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/fprop.cpp b/reactos/dll/win32/shell32/fprop.cpp index ad8dc6cf827..e3c8411dc3a 100644 --- a/reactos/dll/win32/shell32/fprop.cpp +++ b/reactos/dll/win32/shell32/fprop.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" #define MAX_PROPERTY_SHEET_PAGE 32 diff --git a/reactos/dll/win32/shell32/iconcache.cpp b/reactos/dll/win32/shell32/iconcache.cpp index 1b8594f5fa1..5027d772061 100644 --- a/reactos/dll/win32/shell32/iconcache.cpp +++ b/reactos/dll/win32/shell32/iconcache.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/newmenu.cpp b/reactos/dll/win32/shell32/newmenu.cpp index a9410114e97..64a1404ac0d 100644 --- a/reactos/dll/win32/shell32/newmenu.cpp +++ b/reactos/dll/win32/shell32/newmenu.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/openwithmenu.cpp b/reactos/dll/win32/shell32/openwithmenu.cpp index 30b21f62ccd..9c24505e002 100644 --- a/reactos/dll/win32/shell32/openwithmenu.cpp +++ b/reactos/dll/win32/shell32/openwithmenu.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/pidl.cpp b/reactos/dll/win32/shell32/pidl.cpp index db376d691ff..c9766a83c10 100644 --- a/reactos/dll/win32/shell32/pidl.cpp +++ b/reactos/dll/win32/shell32/pidl.cpp @@ -22,7 +22,7 @@ * */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(pidl); WINE_DECLARE_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/pidl.h b/reactos/dll/win32/shell32/pidl.h index 99c21b88ff4..ad149c04402 100644 --- a/reactos/dll/win32/shell32/pidl.h +++ b/reactos/dll/win32/shell32/pidl.h @@ -35,13 +35,6 @@ #ifndef __WINE_PIDL_H #define __WINE_PIDL_H -#include - -#include -#include -#include -#include - /* * the pidl does cache fileattributes to speed up SHGetAttributes when * displaying a big number of files. diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h index 57555bec1dd..5a5b5745514 100644 --- a/reactos/dll/win32/shell32/precomp.h +++ b/reactos/dll/win32/shell32/precomp.h @@ -2,45 +2,33 @@ #define _PRECOMP_H__ #include -#include -#include -#include #include -#include -#include #define COBJMACROS #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define NTOS_MODE_USER -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -//#include -#include -#include -#include #include #include #include -#include #include #include -#include #include #include @@ -49,8 +37,8 @@ #include #include -#include "base/shell/explorer-new/todo.h" -#include "dlgs.h" +//#include "base/shell/explorer-new/todo.h" +//#include "dlgs.h" #include "pidl.h" #include "debughlp.h" #include "undocshell.h" @@ -61,7 +49,6 @@ #include "shfldr.h" #include "shellfolder.h" #include "xdg.h" -#include "shellapi.h" #include "shellitem.h" #include "shelllink.h" @@ -83,8 +70,7 @@ #include "filedefext.h" #include "drvdefext.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include extern const GUID CLSID_AdminFolderShortcut; extern const GUID CLSID_FontsFolderShortcut; diff --git a/reactos/dll/win32/shell32/shell32.rc b/reactos/dll/win32/shell32/shell32.rc index 9515c813293..2037c47106c 100644 --- a/reactos/dll/win32/shell32/shell32.rc +++ b/reactos/dll/win32/shell32/shell32.rc @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include "shlobj.h" +#include +#include +#include + #include "shresdef.h" #include "shell32_version.rc" diff --git a/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp index 67cca457276..c225d5ed538 100644 --- a/reactos/dll/win32/shell32/shell32_main.cpp +++ b/reactos/dll/win32/shell32/shell32_main.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" #include "shell32_version.h" #include diff --git a/reactos/dll/win32/shell32/shell32_main.h b/reactos/dll/win32/shell32/shell32_main.h index 04cec7eea50..d0041b5ecdd 100644 --- a/reactos/dll/win32/shell32/shell32_main.h +++ b/reactos/dll/win32/shell32/shell32_main.h @@ -22,24 +22,7 @@ #ifndef __WINE_SHELL_MAIN_H #define __WINE_SHELL_MAIN_H -#include -#include - -/* -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "objbase.h" -#include "docobj.h" -#include "undocshell.h" -#include "shlobj.h" -#include "shellapi.h" -#include "wine/windef16.h" -*/ -#include "wine/unicode.h" +#include /******************************************* diff --git a/reactos/dll/win32/shell32/shellfolder.h b/reactos/dll/win32/shell32/shellfolder.h index 7b8bd898271..4558bfa4f9a 100644 --- a/reactos/dll/win32/shell32/shellfolder.h +++ b/reactos/dll/win32/shell32/shellfolder.h @@ -21,14 +21,6 @@ #ifndef __WINE_SHELLFOLDER_HELP_H #define __WINE_SHELLFOLDER_HELP_H -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" - -#include "shlobj.h" - /***************************************************************************** * Predeclare the interfaces */ diff --git a/reactos/dll/win32/shell32/shelllink.cpp b/reactos/dll/win32/shell32/shelllink.cpp index 846e79fa38a..1ebf7833b22 100644 --- a/reactos/dll/win32/shell32/shelllink.cpp +++ b/reactos/dll/win32/shell32/shelllink.cpp @@ -33,7 +33,7 @@ * in that string is parsed an stored. */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shellole.cpp b/reactos/dll/win32/shell32/shellole.cpp index 5ad879e5ff9..e9c176b4fe3 100644 --- a/reactos/dll/win32/shell32/shellole.cpp +++ b/reactos/dll/win32/shell32/shellole.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shellord.cpp b/reactos/dll/win32/shell32/shellord.cpp index 44fa887c7d6..c1616d78b52 100644 --- a/reactos/dll/win32/shell32/shellord.cpp +++ b/reactos/dll/win32/shell32/shellord.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); diff --git a/reactos/dll/win32/shell32/shellpath.cpp b/reactos/dll/win32/shell32/shellpath.cpp index e2e30592c38..74f70d05040 100644 --- a/reactos/dll/win32/shell32/shellpath.cpp +++ b/reactos/dll/win32/shell32/shellpath.cpp @@ -24,7 +24,7 @@ * */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shellreg.cpp b/reactos/dll/win32/shell32/shellreg.cpp index e3aeee63850..600336913b0 100644 --- a/reactos/dll/win32/shell32/shellreg.cpp +++ b/reactos/dll/win32/shell32/shellreg.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shellstring.cpp b/reactos/dll/win32/shell32/shellstring.cpp index 16ea653e913..e8fd1dc6247 100644 --- a/reactos/dll/win32/shell32/shellstring.cpp +++ b/reactos/dll/win32/shell32/shellstring.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shlexec.cpp b/reactos/dll/win32/shell32/shlexec.cpp index ad53a037c45..1bb59371b67 100644 --- a/reactos/dll/win32/shell32/shlexec.cpp +++ b/reactos/dll/win32/shell32/shlexec.cpp @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(exec); diff --git a/reactos/dll/win32/shell32/shlfileop.cpp b/reactos/dll/win32/shell32/shlfileop.cpp index ac03fdbc8af..97cdb02b23a 100644 --- a/reactos/dll/win32/shell32/shlfileop.cpp +++ b/reactos/dll/win32/shell32/shlfileop.cpp @@ -22,7 +22,7 @@ */ //#define NO_SHLWAPI_STREAM -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shlfolder.cpp b/reactos/dll/win32/shell32/shlfolder.cpp index d4e53214ded..7f8d8267aae 100644 --- a/reactos/dll/win32/shell32/shlfolder.cpp +++ b/reactos/dll/win32/shell32/shlfolder.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shlfsbind.cpp b/reactos/dll/win32/shell32/shlfsbind.cpp index af48a54c553..b3179a03045 100644 --- a/reactos/dll/win32/shell32/shlfsbind.cpp +++ b/reactos/dll/win32/shell32/shlfsbind.cpp @@ -20,7 +20,7 @@ * */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(pidl); diff --git a/reactos/dll/win32/shell32/shlmenu.cpp b/reactos/dll/win32/shell32/shlmenu.cpp index 0e41fcfec53..7fa1c7e3364 100644 --- a/reactos/dll/win32/shell32/shlmenu.cpp +++ b/reactos/dll/win32/shell32/shlmenu.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" #ifdef FM_SEPARATOR #undef FM_SEPARATOR diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp index 707f2b8e275..bdbfe17ef27 100644 --- a/reactos/dll/win32/shell32/shlview.cpp +++ b/reactos/dll/win32/shell32/shlview.cpp @@ -48,7 +48,7 @@ TODO: 13. Reorder of columns doesn't work - might be bug in comctl32 */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/shpolicy.cpp b/reactos/dll/win32/shell32/shpolicy.cpp index 88e487c5207..c9f0ef3668e 100644 --- a/reactos/dll/win32/shell32/shpolicy.cpp +++ b/reactos/dll/win32/shell32/shpolicy.cpp @@ -29,7 +29,7 @@ * Up to date as of SHELL32 v5.00 (W2K) */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/startmenu.cpp b/reactos/dll/win32/shell32/startmenu.cpp index 442147c020b..9d735db504f 100644 --- a/reactos/dll/win32/shell32/startmenu.cpp +++ b/reactos/dll/win32/shell32/startmenu.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell32start); diff --git a/reactos/dll/win32/shell32/stubs.cpp b/reactos/dll/win32/shell32/stubs.cpp index 17a27204bc1..037f4bafe8a 100644 --- a/reactos/dll/win32/shell32/stubs.cpp +++ b/reactos/dll/win32/shell32/stubs.cpp @@ -10,7 +10,7 @@ */ -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shell32/systray.cpp b/reactos/dll/win32/shell32/systray.cpp index c09e271ff31..3c83420a032 100644 --- a/reactos/dll/win32/shell32/systray.cpp +++ b/reactos/dll/win32/shell32/systray.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "precomp.h" /* copy data structure for tray notifications */ typedef struct TrayNotifyCDS_Dummy { diff --git a/reactos/dll/win32/shell32/undocshell.h b/reactos/dll/win32/shell32/undocshell.h index 40aa482430b..043b8f49cd9 100644 --- a/reactos/dll/win32/shell32/undocshell.h +++ b/reactos/dll/win32/shell32/undocshell.h @@ -19,14 +19,6 @@ #ifndef __WINE_UNDOCSHELL_H #define __WINE_UNDOCSHELL_H -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "shlobj.h" - #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/reactos/dll/win32/shfolder/version.rc b/reactos/dll/win32/shfolder/version.rc index 726bd7f464c..63251fee7ce 100644 --- a/reactos/dll/win32/shfolder/version.rc +++ b/reactos/dll/win32/shfolder/version.rc @@ -22,4 +22,4 @@ #define WINE_PRODUCTVERSION 6,00,2800,1106 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106" -#include "wine/wine_common_ver.rc" +#include diff --git a/reactos/dll/win32/shimgvw/rsrc.rc b/reactos/dll/win32/shimgvw/rsrc.rc index 94056ce94de..574ef37fa61 100644 --- a/reactos/dll/win32/shimgvw/rsrc.rc +++ b/reactos/dll/win32/shimgvw/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - // UTF-8 #pragma code_page(65001) #ifdef LANGUAGE_BG_BG diff --git a/reactos/dll/win32/shimgvw/shimgvw.c b/reactos/dll/win32/shimgvw/shimgvw.c index e8796499fac..a6f951d881b 100644 --- a/reactos/dll/win32/shimgvw/shimgvw.c +++ b/reactos/dll/win32/shimgvw/shimgvw.c @@ -9,11 +9,18 @@ * 28/05/2008 Created */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/reactos/dll/win32/shimgvw/shimgvw.h b/reactos/dll/win32/shimgvw/shimgvw.h index 90cec1536b0..47135ead049 100644 --- a/reactos/dll/win32/shimgvw/shimgvw.h +++ b/reactos/dll/win32/shimgvw/shimgvw.h @@ -1,5 +1,3 @@ -#include - #include "resource.h" #define TB_IMAGE_WIDTH 16 diff --git a/reactos/dll/win32/shimgvw/shimgvw.rc b/reactos/dll/win32/shimgvw/shimgvw.rc index 5b5451750fd..e43e5b9eb21 100644 --- a/reactos/dll/win32/shimgvw/shimgvw.rc +++ b/reactos/dll/win32/shimgvw/shimgvw.rc @@ -1,4 +1,5 @@ -#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/shlwapi/assoc.c b/reactos/dll/win32/shlwapi/assoc.c index 31569908b30..b2dca99a79c 100644 --- a/reactos/dll/win32/shlwapi/assoc.c +++ b/reactos/dll/win32/shlwapi/assoc.c @@ -17,19 +17,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "objbase.h" -#include "shlguid.h" -#include "shlobj.h" -#include "shlwapi.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +//#include + +#include +#include +#include +#include +//#include "objbase.h" +//#include "shlguid.h" +#include +#include +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/clist.c b/reactos/dll/win32/shlwapi/clist.c index 52bee37c9e4..d4db8da36a8 100644 --- a/reactos/dll/win32/shlwapi/clist.c +++ b/reactos/dll/win32/shlwapi/clist.c @@ -17,17 +17,21 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "shlobj.h" -#include "wine/debug.h" +#include +#include +//#include "winuser.h" +//#include "objbase.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/istream.c b/reactos/dll/win32/shlwapi/istream.c index 3395209c856..1946e7e62b7 100644 --- a/reactos/dll/win32/shlwapi/istream.c +++ b/reactos/dll/win32/shlwapi/istream.c @@ -17,21 +17,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" +#include +#include +//#include "winerror.h" +#include #define NO_SHLWAPI_REG #define NO_SHLWAPI_PATH -#include "shlwapi.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/msgbox.c b/reactos/dll/win32/shlwapi/msgbox.c index 506bd4651b7..73fe8dba7c7 100644 --- a/reactos/dll/win32/shlwapi/msgbox.c +++ b/reactos/dll/win32/shlwapi/msgbox.c @@ -18,21 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +#include + #include "resource.h" diff --git a/reactos/dll/win32/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c index 88f415b7200..dfd50c5a5a3 100644 --- a/reactos/dll/win32/shlwapi/ordinal.c +++ b/reactos/dll/win32/shlwapi/ordinal.c @@ -20,37 +20,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include +//#include "wine/port.h" + +//#include #include -#include +//#include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "winver.h" -#include "winnetwk.h" -#include "mmsystem.h" -#include "objbase.h" -#include "exdisp.h" -#include "shdeprecated.h" -#include "shlobj.h" -#include "shlwapi.h" -#include "shellapi.h" -#include "commdlg.h" -#include "mlang.h" -#include "mshtmhst.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +#include +//#include "winnls.h" +#include +#include +//#include "winuser.h" +#include +#include +#include +//#include "objbase.h" +//#include "exdisp.h" +//#include "shdeprecated.h" +#include +#include +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c index 5ce64d7bb18..9fb8ac0eaf2 100644 --- a/reactos/dll/win32/shlwapi/path.c +++ b/reactos/dll/win32/shlwapi/path.c @@ -19,23 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include -#include +#include +//#include "wine/port.h" -#include "wine/unicode.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winternl.h" +//#include +//#include +//#include + +#include +#include +#include +#include +#include +#include +#include #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c index c58a8c73370..18d2db0234b 100644 --- a/reactos/dll/win32/shlwapi/reg.c +++ b/reactos/dll/win32/shlwapi/reg.c @@ -19,16 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "wine/debug.h" +//#include +#include +#include +#include +#include +#include #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/regstream.c b/reactos/dll/win32/shlwapi/regstream.c index 1b0ca4edf67..2ef0da2fc46 100644 --- a/reactos/dll/win32/shlwapi/regstream.c +++ b/reactos/dll/win32/shlwapi/regstream.c @@ -19,19 +19,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winerror.h" +#include +#include +#include +#include +//#include "shlwapi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/resource.h b/reactos/dll/win32/shlwapi/resource.h index a9af2bad621..215a4d64f29 100644 --- a/reactos/dll/win32/shlwapi/resource.h +++ b/reactos/dll/win32/shlwapi/resource.h @@ -20,7 +20,7 @@ #ifndef WINE_SHLWAPI_RESOURCE_H #define WINE_SHLWAPI_RESOURCE_H -#include +//#include #include #define IDS_BYTES_FORMAT 64 diff --git a/reactos/dll/win32/shlwapi/shlwapi.rc b/reactos/dll/win32/shlwapi/shlwapi.rc index 50d3cd7f1ad..203de15b172 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.rc +++ b/reactos/dll/win32/shlwapi/shlwapi.rc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "resource.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "resource.h" #include "version.rc" diff --git a/reactos/dll/win32/shlwapi/shlwapi_main.c b/reactos/dll/win32/shlwapi/shlwapi_main.c index 5dc515255ad..957e1d347d6 100644 --- a/reactos/dll/win32/shlwapi/shlwapi_main.c +++ b/reactos/dll/win32/shlwapi/shlwapi_main.c @@ -19,14 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" +#include +#include #define NO_SHLWAPI_REG #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "wine/debug.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/stopwatch.c b/reactos/dll/win32/shlwapi/stopwatch.c index 7f86fded4b4..d44b750d1f7 100644 --- a/reactos/dll/win32/shlwapi/stopwatch.c +++ b/reactos/dll/win32/shlwapi/stopwatch.c @@ -23,20 +23,22 @@ * B) Want to use a substandard API to tune its performance. */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS + +#include +//#include "wine/port.h" #include -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "wine/debug.h" +#include +#include +//#include "winreg.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/string.c b/reactos/dll/win32/shlwapi/string.c index b12303657f8..2ee2aa98b4b 100644 --- a/reactos/dll/win32/shlwapi/string.c +++ b/reactos/dll/win32/shlwapi/string.c @@ -19,28 +19,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include #include -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include +#include #define NO_SHLWAPI_REG #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "wingdi.h" -#include "winuser.h" -#include "shlobj.h" -#include "mlang.h" -#include "ddeml.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +#include +#include +#include +#include #include "resource.h" diff --git a/reactos/dll/win32/shlwapi/thread.c b/reactos/dll/win32/shlwapi/thread.c index f8afc298183..6006b098e88 100644 --- a/reactos/dll/win32/shlwapi/thread.c +++ b/reactos/dll/win32/shlwapi/thread.c @@ -18,23 +18,27 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include +//#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" +#include +#include +#include +//#include "winuser.h" #define NO_SHLWAPI_REG #define NO_SHLWAPI_PATH #define NO_SHLWAPI_GDI #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_USER -#include "shlwapi.h" -#include "shlobj.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/reactos/dll/win32/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c index 54b1b1047ff..a503b4c4af0 100644 --- a/reactos/dll/win32/shlwapi/url.c +++ b/reactos/dll/win32/shlwapi/url.c @@ -18,23 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "wine/unicode.h" -#include "wininet.h" -#include "winreg.h" -#include "winternl.h" +//#include +//#include +#include +#include +//#include "winnls.h" +//#include "winerror.h" +#include +#include +#include +#include #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "intshcut.h" -#include "wine/debug.h" +#include +#include +#include HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); BOOL WINAPI MLFreeLibrary(HMODULE); diff --git a/reactos/dll/win32/shlwapi/wsprintf.c b/reactos/dll/win32/shlwapi/wsprintf.c index 56eea41410d..7d213b1b48f 100644 --- a/reactos/dll/win32/shlwapi/wsprintf.c +++ b/reactos/dll/win32/shlwapi/wsprintf.c @@ -22,16 +22,18 @@ * to change it in user32 too. */ -#include -#include -#include +#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" +//#include +//#include +//#include + +//#include "windef.h" +//#include "winbase.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" +//#include "shlwapi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(string); diff --git a/reactos/dll/win32/slbcsp/main.c b/reactos/dll/win32/slbcsp/main.c index a6aece1b09d..82d2e9af2e8 100644 --- a/reactos/dll/win32/slbcsp/main.c +++ b/reactos/dll/win32/slbcsp/main.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(slbcsp); diff --git a/reactos/dll/win32/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c index 3d0554e9451..ade429ad204 100644 --- a/reactos/dll/win32/smdll/dllmain.c +++ b/reactos/dll/win32/smdll/dllmain.c @@ -6,7 +6,7 @@ * PURPOSE: SM Helper Library */ -#include +#include "precomp.h" BOOL WINAPI DllMainCRTStartup(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad) { diff --git a/reactos/dll/win32/smdll/precomp.h b/reactos/dll/win32/smdll/precomp.h index 24c55447dad..75509b224f0 100644 --- a/reactos/dll/win32/smdll/precomp.h +++ b/reactos/dll/win32/smdll/precomp.h @@ -1,5 +1,3 @@ -#define WIN32_NO_STATUS -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/dll/win32/smdll/query.c b/reactos/dll/win32/smdll/query.c index 56718d8752c..6dff3678abf 100644 --- a/reactos/dll/win32/smdll/query.c +++ b/reactos/dll/win32/smdll/query.c @@ -6,7 +6,7 @@ * PURPOSE: Call SM API SM_API_QUERY_INFORMATION (not in NT) */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/sndblst/sndblst.c b/reactos/dll/win32/sndblst/sndblst.c index e814e4b3176..6161e1a080a 100644 --- a/reactos/dll/win32/sndblst/sndblst.c +++ b/reactos/dll/win32/sndblst/sndblst.c @@ -12,8 +12,16 @@ * TODO: Adhere to maximum device name length! */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include + +#include +#include + +//#include #include #include #include diff --git a/reactos/dll/win32/snmpapi/main.c b/reactos/dll/win32/snmpapi/main.c index 1c4d1fa36cd..e66f3c9f5b9 100644 --- a/reactos/dll/win32/snmpapi/main.c +++ b/reactos/dll/win32/snmpapi/main.c @@ -19,16 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS + +#include #include #include -#include "windef.h" -#include "winbase.h" -#include "snmp.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(snmpapi); diff --git a/reactos/dll/win32/snmpapi/snmpapi.rc b/reactos/dll/win32/snmpapi/snmpapi.rc index 8abcfc8650d..73ed7feba52 100644 --- a/reactos/dll/win32/snmpapi/snmpapi.rc +++ b/reactos/dll/win32/snmpapi/snmpapi.rc @@ -1,5 +1,3 @@ -/* $Id: snmpapi.rc 22410 2006-06-19 12:34:31Z gedmurphy $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sockets 2 SNMP Helper API\0" #define REACTOS_STR_INTERNAL_NAME "snmpapi\0" diff --git a/reactos/dll/win32/spoolss/router.c b/reactos/dll/win32/spoolss/router.c index 3d239b4afb9..d48253e1254 100644 --- a/reactos/dll/win32/spoolss/router.c +++ b/reactos/dll/win32/spoolss/router.c @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" +#include +#include +//#include "winerror.h" +#include -#include "wingdi.h" -#include "winspool.h" -#include "ddk/winsplp.h" +#include +#include +#include #include "spoolss.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/reactos/dll/win32/spoolss/spoolss.h b/reactos/dll/win32/spoolss/spoolss.h index 67b3891e469..6190286bbca 100644 --- a/reactos/dll/win32/spoolss/spoolss.h +++ b/reactos/dll/win32/spoolss/spoolss.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" +#include +#include /* ################################ */ diff --git a/reactos/dll/win32/spoolss/spoolss_main.c b/reactos/dll/win32/spoolss/spoolss_main.c index 9f248f07cda..6bb1d8d3887 100644 --- a/reactos/dll/win32/spoolss/spoolss_main.c +++ b/reactos/dll/win32/spoolss/spoolss_main.c @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "winreg.h" -#include "wingdi.h" -#include "winspool.h" -#include "ddk/winsplp.h" +//#include "wingdi.h" +//#include "winspool.h" +//#include "ddk/winsplp.h" #include "spoolss.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/reactos/dll/win32/srclient/srclient_main.c b/reactos/dll/win32/srclient/srclient_main.c index a966fb14a5a..e3414e48a4a 100644 --- a/reactos/dll/win32/srclient/srclient_main.c +++ b/reactos/dll/win32/srclient/srclient_main.c @@ -16,7 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#define WIN32_NO_STATUS + +#include +#include +#include +#include #include #define NDEBUG diff --git a/reactos/dll/win32/stdole2.tlb/rsrc.rc b/reactos/dll/win32/stdole2.tlb/rsrc.rc index dc5d264abcd..cbea5852036 100644 --- a/reactos/dll/win32/stdole2.tlb/rsrc.rc +++ b/reactos/dll/win32/stdole2.tlb/rsrc.rc @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include "wine/wine_common_ver.rc" +#include /* @makedep: std_ole_v2.tlb */ 1 TYPELIB std_ole_v2.tlb diff --git a/reactos/dll/win32/stdole32.tlb/rsrc.rc b/reactos/dll/win32/stdole32.tlb/rsrc.rc index 9926dc7ec47..20c12c4b87e 100644 --- a/reactos/dll/win32/stdole32.tlb/rsrc.rc +++ b/reactos/dll/win32/stdole32.tlb/rsrc.rc @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +#include +//#include "winbase.h" +//#include "winuser.h" +//#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include "wine/wine_common_ver.rc" +#include /* @makedep: std_ole_v1.tlb */ 1 TYPELIB std_ole_v1.tlb diff --git a/reactos/dll/win32/sti/sti.c b/reactos/dll/win32/sti/sti.c index de5f4262b0e..d326710d328 100644 --- a/reactos/dll/win32/sti/sti.c +++ b/reactos/dll/win32/sti/sti.c @@ -17,19 +17,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winerror.h" -#include "objbase.h" -#include "sti.h" +#include +#include +#include +//#include "winerror.h" +//#include "objbase.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(sti); diff --git a/reactos/dll/win32/sti/sti_main.c b/reactos/dll/win32/sti/sti_main.c index c532ffbd6ac..2bd3a093b2c 100644 --- a/reactos/dll/win32/sti/sti_main.c +++ b/reactos/dll/win32/sti/sti_main.c @@ -17,20 +17,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winerror.h" -#include "objbase.h" -#include "initguid.h" -#include "wia_lh.h" -#include "sti.h" +#include +#include +//#include "winreg.h" +//#include "winerror.h" +//#include "objbase.h" +#include +//#include "wia_lh.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(sti); diff --git a/reactos/dll/win32/sxs/cache.c b/reactos/dll/win32/sxs/cache.c index 46686e541fe..d24a78fd1e2 100644 --- a/reactos/dll/win32/sxs/cache.c +++ b/reactos/dll/win32/sxs/cache.c @@ -18,20 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define INITGUID -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "winsxs.h" -#include "msxml2.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include +#include #include "sxs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); diff --git a/reactos/dll/win32/sxs/name.c b/reactos/dll/win32/sxs/name.c index 9ca911be0d7..0399c152ae6 100644 --- a/reactos/dll/win32/sxs/name.c +++ b/reactos/dll/win32/sxs/name.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "winsxs.h" +#include +#include +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "sxs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); diff --git a/reactos/dll/win32/sxs/sxs.c b/reactos/dll/win32/sxs/sxs.c index 06e6672dbf7..f25a490a2cc 100644 --- a/reactos/dll/win32/sxs/sxs.c +++ b/reactos/dll/win32/sxs/sxs.c @@ -18,10 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" +#include +#include /*********************************************************************** diff --git a/reactos/dll/win32/syssetup/precomp.h b/reactos/dll/win32/syssetup/precomp.h index a8c9def7ecf..cbcdc84d937 100644 --- a/reactos/dll/win32/syssetup/precomp.h +++ b/reactos/dll/win32/syssetup/precomp.h @@ -1,25 +1,27 @@ -#define WIN32_NO_STATUS -#include -#include +#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include +#include +#include +#include +#include +#include +#include #define NTOS_MODE_USER #include -#include #include - #include -#include #include -#include #include -#include #include #include #include -#include #include -#include -#include #include #include #include diff --git a/reactos/dll/win32/syssetup/syssetup.rc b/reactos/dll/win32/syssetup/syssetup.rc index 16ff9f81377..e76897cc105 100644 --- a/reactos/dll/win32/syssetup/syssetup.rc +++ b/reactos/dll/win32/syssetup/syssetup.rc @@ -1,4 +1,7 @@ -#include +#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/t2embed/t2embed.c b/reactos/dll/win32/t2embed/t2embed.c index 4a1ef35f024..8abb8952873 100644 --- a/reactos/dll/win32/t2embed/t2embed.c +++ b/reactos/dll/win32/t2embed/t2embed.c @@ -5,9 +5,13 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */ -#include +#define WIN32_NO_STATUS + +#include +#include +#include #include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(t2embed); diff --git a/reactos/dll/win32/t2embed/t2embed.rc b/reactos/dll/win32/t2embed/t2embed.rc index b5fa5940d17..f78a527e7b2 100644 --- a/reactos/dll/win32/t2embed/t2embed.rc +++ b/reactos/dll/win32/t2embed/t2embed.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Font Embedding Dll\0" #define REACTOS_STR_INTERNAL_NAME "t2embed\0" diff --git a/reactos/dll/win32/tapi32/assisted.c b/reactos/dll/win32/tapi32/assisted.c index 27a0c4ce55c..f0ac6e11c9d 100644 --- a/reactos/dll/win32/tapi32/assisted.c +++ b/reactos/dll/win32/tapi32/assisted.c @@ -18,18 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include +//#include "wine/port.h" + +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "objbase.h" -#include "tapi.h" -#include "wine/debug.h" +#include +#include +//#include "wingdi.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(tapi); diff --git a/reactos/dll/win32/tapi32/internal.c b/reactos/dll/win32/tapi32/internal.c index 8756c4acb17..946d433359a 100644 --- a/reactos/dll/win32/tapi32/internal.c +++ b/reactos/dll/win32/tapi32/internal.c @@ -18,19 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winnls.h" -#include "winerror.h" -#include "objbase.h" -#include "tapi.h" -#include "wine/debug.h" +//#include +//#include +//#include +//#include +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winreg.h" +//#include "winnls.h" +//#include "winerror.h" +//#include "objbase.h" +//#include "tapi.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(tapi); diff --git a/reactos/dll/win32/tapi32/line.c b/reactos/dll/win32/tapi32/line.c index 6ccdf13eb0a..de599755d26 100644 --- a/reactos/dll/win32/tapi32/line.c +++ b/reactos/dll/win32/tapi32/line.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include +//#include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "winnls.h" -#include "winerror.h" -#include "objbase.h" -#include "tapi.h" -#include "wine/debug.h" +//#include +#include +#include +//#include "wingdi.h" +#include +#include +//#include "winerror.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(tapi); diff --git a/reactos/dll/win32/tapi32/phone.c b/reactos/dll/win32/tapi32/phone.c index 994d787be70..9ca6fe1bd6b 100644 --- a/reactos/dll/win32/tapi32/phone.c +++ b/reactos/dll/win32/tapi32/phone.c @@ -18,13 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "tapi.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include /* * Additional TSPI functions: diff --git a/reactos/dll/win32/tapiui/tapiui.rc b/reactos/dll/win32/tapiui/tapiui.rc index bb63783139d..6f7989a1dfc 100644 --- a/reactos/dll/win32/tapiui/tapiui.rc +++ b/reactos/dll/win32/tapiui/tapiui.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/traffic/traffic_main.c b/reactos/dll/win32/traffic/traffic_main.c index 6b8a9751e19..e5989010052 100644 --- a/reactos/dll/win32/traffic/traffic_main.c +++ b/reactos/dll/win32/traffic/traffic_main.c @@ -17,12 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS + #include -#include "windef.h" -#include "winbase.h" -#include "traffic.h" -#include "wine/debug.h" +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(traffic); diff --git a/reactos/dll/win32/twain_32/capability.c b/reactos/dll/win32/twain_32/capability.c index 41e1627daaf..a951603e39c 100644 --- a/reactos/dll/win32/twain_32/capability.c +++ b/reactos/dll/win32/twain_32/capability.c @@ -21,11 +21,11 @@ #include -#include "windef.h" -#include "winbase.h" -#include "twain.h" +#include +#include +//#include "twain.h" #include "twain_i.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/ds_audio.c b/reactos/dll/win32/twain_32/ds_audio.c index ceb68bf7aab..af2181b16b5 100644 --- a/reactos/dll/win32/twain_32/ds_audio.c +++ b/reactos/dll/win32/twain_32/ds_audio.c @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "twain.h" -#include "twain_i.h" -#include "wine/debug.h" +#include +//#include "twain_i.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/ds_ctrl.c b/reactos/dll/win32/twain_32/ds_ctrl.c index ca71e1426c5..a2b0b54c122 100644 --- a/reactos/dll/win32/twain_32/ds_ctrl.c +++ b/reactos/dll/win32/twain_32/ds_ctrl.c @@ -22,9 +22,9 @@ # include #endif #include -#include "twain.h" +//#include "twain.h" #include "twain_i.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/ds_image.c b/reactos/dll/win32/twain_32/ds_image.c index 8722ae21150..0d3da55b53f 100644 --- a/reactos/dll/win32/twain_32/ds_image.c +++ b/reactos/dll/win32/twain_32/ds_image.c @@ -18,15 +18,15 @@ //#include "config.h" -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "twain.h" -#include "twain_i.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "twain_i.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/dsm_ctrl.c b/reactos/dll/win32/twain_32/dsm_ctrl.c index 7ece48a541d..e62474c4da9 100644 --- a/reactos/dll/win32/twain_32/dsm_ctrl.c +++ b/reactos/dll/win32/twain_32/dsm_ctrl.c @@ -20,16 +20,16 @@ //#include "config.h" -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "twain.h" +//#include "windef.h" +//#include "winbase.h" +//#include "twain.h" #include "twain_i.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/twain32_main.c b/reactos/dll/win32/twain_32/twain32_main.c index fe4e94dd607..608cb417ed9 100644 --- a/reactos/dll/win32/twain_32/twain32_main.c +++ b/reactos/dll/win32/twain_32/twain32_main.c @@ -20,11 +20,11 @@ #include -#include "windef.h" -#include "winbase.h" -#include "twain.h" +#include +#include +//#include "twain.h" #include "twain_i.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/reactos/dll/win32/twain_32/twain_32.rc b/reactos/dll/win32/twain_32/twain_32.rc index 7517797f5ad..44d070ad584 100644 --- a/reactos/dll/win32/twain_32/twain_32.rc +++ b/reactos/dll/win32/twain_32/twain_32.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "TWAIN support\0" #define REACTOS_STR_INTERNAL_NAME "twain_32\0" diff --git a/reactos/dll/win32/twain_32/twain_i.h b/reactos/dll/win32/twain_32/twain_i.h index af1aa4263b8..ab2acb49190 100644 --- a/reactos/dll/win32/twain_32/twain_i.h +++ b/reactos/dll/win32/twain_32/twain_i.h @@ -22,8 +22,8 @@ #ifdef HAVE_SANE # include #endif -#include "twain.h" -#include "windef.h" +#include +//#include "windef.h" /* internel information about an active data source */ typedef struct tagActiveDS diff --git a/reactos/dll/win32/uext2/uext2.c b/reactos/dll/win32/uext2/uext2.c index 7b6ddc99d19..d44397243fc 100644 --- a/reactos/dll/win32/uext2/uext2.c +++ b/reactos/dll/win32/uext2/uext2.c @@ -7,11 +7,8 @@ * PROGRAMMERS: Pierre Schweitzer */ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include +#include + INT WINAPI DllMain( diff --git a/reactos/dll/win32/ufat/ufat.c b/reactos/dll/win32/ufat/ufat.c index af0c81a0317..05ba6f194a8 100644 --- a/reactos/dll/win32/ufat/ufat.c +++ b/reactos/dll/win32/ufat/ufat.c @@ -7,11 +7,7 @@ * PROGRAMMERS: Herv Poussineau (hpoussin@reactos.org) */ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include +#include INT WINAPI DllMain( diff --git a/reactos/dll/win32/untfs/untfs.c b/reactos/dll/win32/untfs/untfs.c index b033ea725f7..8b451ce0532 100644 --- a/reactos/dll/win32/untfs/untfs.c +++ b/reactos/dll/win32/untfs/untfs.c @@ -7,11 +7,7 @@ * PROGRAMMERS: Pierre Schweitzer */ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include +#include INT WINAPI DllMain( diff --git a/reactos/dll/win32/updspapi/main.c b/reactos/dll/win32/updspapi/main.c index 73af32fe983..9e5427696ce 100644 --- a/reactos/dll/win32/updspapi/main.c +++ b/reactos/dll/win32/updspapi/main.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "setupapi.h" +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(updspapi); diff --git a/reactos/dll/win32/url/url_main.c b/reactos/dll/win32/url/url_main.c index b65aa02972a..3c5df00cfba 100644 --- a/reactos/dll/win32/url/url_main.c +++ b/reactos/dll/win32/url/url_main.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winerror.h" -#include "shellapi.h" -#include "shlwapi.h" -#include "intshcut.h" -#include "winuser.h" -#include "commctrl.h" -#include "prsht.h" -#include "wine/debug.h" +#include +#include +#include +//#include "winerror.h" +#include +#include +//#include "intshcut.h" +#include +//#include "commctrl.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(url); diff --git a/reactos/dll/win32/urlmon/bindctx.c b/reactos/dll/win32/urlmon/bindctx.c index 1af7fa7a129..c7bd4e45d1f 100644 --- a/reactos/dll/win32/urlmon/bindctx.c +++ b/reactos/dll/win32/urlmon/bindctx.c @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/binding.c b/reactos/dll/win32/urlmon/binding.c index 5504f6f2f4b..1eb4bf7e86b 100644 --- a/reactos/dll/win32/urlmon/binding.c +++ b/reactos/dll/win32/urlmon/binding.c @@ -17,10 +17,10 @@ */ #include "urlmon_main.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winreg.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/bindprot.c b/reactos/dll/win32/urlmon/bindprot.c index 45cf14c2cc6..ed8c5f4a733 100644 --- a/reactos/dll/win32/urlmon/bindprot.c +++ b/reactos/dll/win32/urlmon/bindprot.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/download.c b/reactos/dll/win32/urlmon/download.c index c20c87c5a1a..e86ad93defc 100644 --- a/reactos/dll/win32/urlmon/download.c +++ b/reactos/dll/win32/urlmon/download.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/file.c b/reactos/dll/win32/urlmon/file.c index 418b708fe23..bab87fe994b 100644 --- a/reactos/dll/win32/urlmon/file.c +++ b/reactos/dll/win32/urlmon/file.c @@ -17,10 +17,10 @@ */ #include "urlmon_main.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winreg.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/format.c b/reactos/dll/win32/urlmon/format.c index 6967c3b4f39..e6cc2c5840b 100644 --- a/reactos/dll/win32/urlmon/format.c +++ b/reactos/dll/win32/urlmon/format.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/ftp.c b/reactos/dll/win32/urlmon/ftp.c index 04cf49c5d82..5a69bba99b9 100644 --- a/reactos/dll/win32/urlmon/ftp.c +++ b/reactos/dll/win32/urlmon/ftp.c @@ -19,9 +19,9 @@ #include "urlmon_main.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/gopher.c b/reactos/dll/win32/urlmon/gopher.c index 4087ed5ace2..6986d3a2e23 100644 --- a/reactos/dll/win32/urlmon/gopher.c +++ b/reactos/dll/win32/urlmon/gopher.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/http.c b/reactos/dll/win32/urlmon/http.c index 5a606ca774d..0f781f0a7ad 100644 --- a/reactos/dll/win32/urlmon/http.c +++ b/reactos/dll/win32/urlmon/http.c @@ -18,12 +18,12 @@ */ #include "urlmon_main.h" -#include "wininet.h" +//#include "wininet.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/internet.c b/reactos/dll/win32/urlmon/internet.c index 3832c524daa..8955524151f 100644 --- a/reactos/dll/win32/urlmon/internet.c +++ b/reactos/dll/win32/urlmon/internet.c @@ -18,10 +18,10 @@ */ #include "urlmon_main.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "winreg.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/mimefilter.c b/reactos/dll/win32/urlmon/mimefilter.c index 1fe5246cbb0..5b92faffaec 100644 --- a/reactos/dll/win32/urlmon/mimefilter.c +++ b/reactos/dll/win32/urlmon/mimefilter.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/mk.c b/reactos/dll/win32/urlmon/mk.c index 46b4ddcc778..82f0604b601 100644 --- a/reactos/dll/win32/urlmon/mk.c +++ b/reactos/dll/win32/urlmon/mk.c @@ -17,10 +17,10 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/protocol.c b/reactos/dll/win32/urlmon/protocol.c index 326564b907c..9108f24e1c3 100644 --- a/reactos/dll/win32/urlmon/protocol.c +++ b/reactos/dll/win32/urlmon/protocol.c @@ -19,7 +19,7 @@ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/protproxy.c b/reactos/dll/win32/urlmon/protproxy.c index 06a85863b6d..30df7cef060 100644 --- a/reactos/dll/win32/urlmon/protproxy.c +++ b/reactos/dll/win32/urlmon/protproxy.c @@ -17,7 +17,7 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/sec_mgr.c b/reactos/dll/win32/urlmon/sec_mgr.c index 7b4bb35dc2a..b5901c175bf 100644 --- a/reactos/dll/win32/urlmon/sec_mgr.c +++ b/reactos/dll/win32/urlmon/sec_mgr.c @@ -21,16 +21,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "urlmon_main.h" -#include "winreg.h" -#include "wininet.h" +//#include "winreg.h" +//#include "wininet.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/session.c b/reactos/dll/win32/urlmon/session.c index fc36c0bcceb..c92549eeec8 100644 --- a/reactos/dll/win32/urlmon/session.c +++ b/reactos/dll/win32/urlmon/session.c @@ -17,9 +17,9 @@ */ #include "urlmon_main.h" -#include "winreg.h" +//#include "winreg.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c index 8ef740fedc0..7594fa7dff9 100644 --- a/reactos/dll/win32/urlmon/umon.c +++ b/reactos/dll/win32/urlmon/umon.c @@ -22,12 +22,12 @@ #include "urlmon_main.h" -#include "winreg.h" -#include "shlwapi.h" -#include "hlink.h" -#include "shellapi.h" +//#include "winreg.h" +#include +#include +//#include "shellapi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/umstream.c b/reactos/dll/win32/urlmon/umstream.c index 792cd64979b..bb9e4db6488 100644 --- a/reactos/dll/win32/urlmon/umstream.c +++ b/reactos/dll/win32/urlmon/umstream.c @@ -21,12 +21,12 @@ #include "urlmon_main.h" -#include "winreg.h" -#include "winternl.h" -#include "wininet.h" -#include "shlwapi.h" +//#include "winreg.h" +//#include "winternl.h" +//#include "wininet.h" +//#include "shlwapi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/uri.c b/reactos/dll/win32/urlmon/uri.c index f12f826e8e5..510ff0df233 100644 --- a/reactos/dll/win32/urlmon/uri.c +++ b/reactos/dll/win32/urlmon/uri.c @@ -18,12 +18,12 @@ */ #include "urlmon_main.h" -#include "wine/debug.h" +#include #define NO_SHLWAPI_REG -#include "shlwapi.h" +#include -#include "strsafe.h" +#include #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff diff --git a/reactos/dll/win32/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c index 01442c1f5c5..af5d87a4991 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.c +++ b/reactos/dll/win32/urlmon/urlmon_main.c @@ -18,19 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include "urlmon_main.h" -#include "winreg.h" +//#include "winreg.h" #define NO_SHLWAPI_REG -#include "shlwapi.h" -#include "advpub.h" +//#include "shlwapi.h" +#include -#include "wine/debug.h" +#include -#include "urlmon.h" +//#include "urlmon.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h index b60d6787a7b..6a1fda0d2ca 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.h +++ b/reactos/dll/win32/urlmon/urlmon_main.h @@ -20,21 +20,27 @@ #ifndef __WINE_URLMON_MAIN_H #define __WINE_URLMON_MAIN_H +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" -#include "wininet.h" +#include +#include +#include +//#include "winuser.h" +#include +#include +#include +#include -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/reactos/dll/win32/urlmon/usrmarshal.c b/reactos/dll/win32/urlmon/usrmarshal.c index 6ff8f04ef26..cea957fb81a 100644 --- a/reactos/dll/win32/urlmon/usrmarshal.c +++ b/reactos/dll/win32/urlmon/usrmarshal.c @@ -18,7 +18,7 @@ #include "urlmon_main.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/reactos/dll/win32/userenv/desktop.c b/reactos/dll/win32/userenv/desktop.c index cee32d3a63a..55ebba20880 100644 --- a/reactos/dll/win32/userenv/desktop.c +++ b/reactos/dll/win32/userenv/desktop.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/directory.c b/reactos/dll/win32/userenv/directory.c index 75bd23fe43a..0cabeee075c 100644 --- a/reactos/dll/win32/userenv/directory.c +++ b/reactos/dll/win32/userenv/directory.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/environment.c b/reactos/dll/win32/userenv/environment.c index 0a148abb20b..cab99597406 100644 --- a/reactos/dll/win32/userenv/environment.c +++ b/reactos/dll/win32/userenv/environment.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/gpolicy.c b/reactos/dll/win32/userenv/gpolicy.c index 7c982a59d5a..e2538134d9a 100644 --- a/reactos/dll/win32/userenv/gpolicy.c +++ b/reactos/dll/win32/userenv/gpolicy.c @@ -24,7 +24,7 @@ * PROGRAMMER: Thomas Weidenmueller */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/misc.c b/reactos/dll/win32/userenv/misc.c index 689f60f1405..9af05efb794 100644 --- a/reactos/dll/win32/userenv/misc.c +++ b/reactos/dll/win32/userenv/misc.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h index 77f4faaf224..f97e089a20c 100644 --- a/reactos/dll/win32/userenv/precomp.h +++ b/reactos/dll/win32/userenv/precomp.h @@ -1,6 +1,11 @@ #include #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/dll/win32/userenv/profile.c b/reactos/dll/win32/userenv/profile.c index 50be177e245..ac41f12efb2 100644 --- a/reactos/dll/win32/userenv/profile.c +++ b/reactos/dll/win32/userenv/profile.c @@ -24,7 +24,7 @@ * Herv Poussineau */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/registry.c b/reactos/dll/win32/userenv/registry.c index a05ad29d54b..dec7685802d 100644 --- a/reactos/dll/win32/userenv/registry.c +++ b/reactos/dll/win32/userenv/registry.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/resources.h b/reactos/dll/win32/userenv/resources.h index a434c4a518c..9f9120c14e1 100644 --- a/reactos/dll/win32/userenv/resources.h +++ b/reactos/dll/win32/userenv/resources.h @@ -25,6 +25,8 @@ * PROGRAMMER: Eric Kohl */ +#pragma once + #define IDS_PROFILEPATH 1 #define IDS_APPDATA 2 #define IDS_DESKTOP 3 diff --git a/reactos/dll/win32/userenv/setup.c b/reactos/dll/win32/userenv/setup.c index 783d35621c9..b2a9ff04fd0 100644 --- a/reactos/dll/win32/userenv/setup.c +++ b/reactos/dll/win32/userenv/setup.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/userenv.c b/reactos/dll/win32/userenv/userenv.c index 1edf4a1600a..d1338cbdf95 100644 --- a/reactos/dll/win32/userenv/userenv.c +++ b/reactos/dll/win32/userenv/userenv.c @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/dll/win32/userenv/userenv.rc b/reactos/dll/win32/userenv/userenv.rc index f30b71bc637..51d12d063ec 100644 --- a/reactos/dll/win32/userenv/userenv.rc +++ b/reactos/dll/win32/userenv/userenv.rc @@ -15,7 +15,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include + #include "resources.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/usp10/bidi.c b/reactos/dll/win32/usp10/bidi.c index a2edfa6c730..00c6d6e81f3 100644 --- a/reactos/dll/win32/usp10/bidi.c +++ b/reactos/dll/win32/usp10/bidi.c @@ -41,16 +41,16 @@ * has been modified. */ -#include "config.h" +#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "usp10.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +#include +//#include "winbase.h" +#include +//#include "winnls.h" +#include +#include +#include #include "usp10_internal.h" diff --git a/reactos/dll/win32/usp10/breaking.c b/reactos/dll/win32/usp10/breaking.c index 3efc3dac553..2310952e6a1 100644 --- a/reactos/dll/win32/usp10/breaking.c +++ b/reactos/dll/win32/usp10/breaking.c @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" +#include #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winnls.h" -#include "usp10.h" -#include "winternl.h" +#include +#include +//#include "winuser.h" +#include +//#include "winnls.h" +#include +//#include "winternl.h" -#include "wine/debug.h" +#include #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/reactos/dll/win32/usp10/indic.c b/reactos/dll/win32/usp10/indic.c index df2a977e8ad..5871fd5cc5c 100644 --- a/reactos/dll/win32/usp10/indic.c +++ b/reactos/dll/win32/usp10/indic.c @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" +#include #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "winnls.h" -#include "usp10.h" -#include "winternl.h" +#include +#include +//#include "winuser.h" +#include +//#include "winnls.h" +#include +//#include "winternl.h" -#include "wine/debug.h" +#include #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/reactos/dll/win32/usp10/indicsyllable.c b/reactos/dll/win32/usp10/indicsyllable.c index 0a10784b18c..efa735a3eb0 100644 --- a/reactos/dll/win32/usp10/indicsyllable.c +++ b/reactos/dll/win32/usp10/indicsyllable.c @@ -3,7 +3,7 @@ /* and from http://www.unicode.org/Public/6.0.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +//#include "wine/unicode.h" const unsigned short indic_syllabic_table[2624] = { diff --git a/reactos/dll/win32/usp10/linebreak.c b/reactos/dll/win32/usp10/linebreak.c index 96d680af484..b44fd4b1107 100644 --- a/reactos/dll/win32/usp10/linebreak.c +++ b/reactos/dll/win32/usp10/linebreak.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +//#include "wine/unicode.h" const unsigned short wine_linebreak_table[6800] = { diff --git a/reactos/dll/win32/usp10/mirror.c b/reactos/dll/win32/usp10/mirror.c index c87162b25d7..086de7387ac 100644 --- a/reactos/dll/win32/usp10/mirror.c +++ b/reactos/dll/win32/usp10/mirror.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +#include const WCHAR wine_mirror_map[3292] = { diff --git a/reactos/dll/win32/usp10/opentype.c b/reactos/dll/win32/usp10/opentype.c index 74046fd95bb..2d8d1fcbbfc 100644 --- a/reactos/dll/win32/usp10/opentype.c +++ b/reactos/dll/win32/usp10/opentype.c @@ -21,17 +21,17 @@ #include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "usp10.h" -#include "winternl.h" +#include +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +#include #include "usp10_internal.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/reactos/dll/win32/usp10/shape.c b/reactos/dll/win32/usp10/shape.c index 5ba6e6f3ec7..00c68139747 100644 --- a/reactos/dll/win32/usp10/shape.c +++ b/reactos/dll/win32/usp10/shape.c @@ -19,19 +19,19 @@ * */ #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "usp10.h" -#include "winternl.h" +#include +#include +#include +//#include "winuser.h" +//#include "winnls.h" +#include +//#include "winternl.h" #include "usp10_internal.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/reactos/dll/win32/usp10/shaping.c b/reactos/dll/win32/usp10/shaping.c index 1ce255a092b..094c2991f6b 100644 --- a/reactos/dll/win32/usp10/shaping.c +++ b/reactos/dll/win32/usp10/shaping.c @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" +//#include "wine/unicode.h" const unsigned short wine_shaping_table[2656] = { diff --git a/reactos/dll/win32/usp10/usp10.c b/reactos/dll/win32/usp10/usp10.c index 5d8da0a0d96..c2a76669fbd 100644 --- a/reactos/dll/win32/usp10/usp10.c +++ b/reactos/dll/win32/usp10/usp10.c @@ -25,20 +25,20 @@ */ #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "usp10.h" +#include +//#include "winbase.h" +#include +#include +//#include "winnls.h" +#include +#include #include "usp10_internal.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/reactos/dll/win32/uxtheme/buffer.c b/reactos/dll/win32/uxtheme/buffer.c index 6ccf290e868..c58cfe42e7b 100644 --- a/reactos/dll/win32/uxtheme/buffer.c +++ b/reactos/dll/win32/uxtheme/buffer.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/draw.c b/reactos/dll/win32/uxtheme/draw.c index cfb9d3a4a47..95a687a68c2 100644 --- a/reactos/dll/win32/uxtheme/draw.c +++ b/reactos/dll/win32/uxtheme/draw.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/main.c b/reactos/dll/win32/uxtheme/main.c index d04cedae8e0..ff1f7f45d24 100644 --- a/reactos/dll/win32/uxtheme/main.c +++ b/reactos/dll/win32/uxtheme/main.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/metric.c b/reactos/dll/win32/uxtheme/metric.c index 3127ef4362d..05a5e932de9 100644 --- a/reactos/dll/win32/uxtheme/metric.c +++ b/reactos/dll/win32/uxtheme/metric.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/msstyles.c b/reactos/dll/win32/uxtheme/msstyles.c index 819c47d3e69..a312149c3fe 100644 --- a/reactos/dll/win32/uxtheme/msstyles.c +++ b/reactos/dll/win32/uxtheme/msstyles.c @@ -19,8 +19,8 @@ */ #include "uxthemep.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/ncscrollbar.c b/reactos/dll/win32/uxtheme/ncscrollbar.c index c8820950adc..4835dd24bdb 100644 --- a/reactos/dll/win32/uxtheme/ncscrollbar.c +++ b/reactos/dll/win32/uxtheme/ncscrollbar.c @@ -10,7 +10,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/nonclient.c b/reactos/dll/win32/uxtheme/nonclient.c index 88dc7db0a32..af7790c269f 100644 --- a/reactos/dll/win32/uxtheme/nonclient.c +++ b/reactos/dll/win32/uxtheme/nonclient.c @@ -7,7 +7,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/property.c b/reactos/dll/win32/uxtheme/property.c index 9c5faafb781..d80c893680e 100644 --- a/reactos/dll/win32/uxtheme/property.c +++ b/reactos/dll/win32/uxtheme/property.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/stylemap.c b/reactos/dll/win32/uxtheme/stylemap.c index eae20cfd078..980e154bcc0 100644 --- a/reactos/dll/win32/uxtheme/stylemap.c +++ b/reactos/dll/win32/uxtheme/stylemap.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; diff --git a/reactos/dll/win32/uxtheme/system.c b/reactos/dll/win32/uxtheme/system.c index 2aca43e626e..02e4ee041cc 100644 --- a/reactos/dll/win32/uxtheme/system.c +++ b/reactos/dll/win32/uxtheme/system.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/themehooks.c b/reactos/dll/win32/uxtheme/themehooks.c index 85bf1dc8cb6..1ec92fc2f31 100644 --- a/reactos/dll/win32/uxtheme/themehooks.c +++ b/reactos/dll/win32/uxtheme/themehooks.c @@ -7,7 +7,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/uxini.c b/reactos/dll/win32/uxtheme/uxini.c index 083fbed17f7..cb3899c9483 100644 --- a/reactos/dll/win32/uxtheme/uxini.c +++ b/reactos/dll/win32/uxtheme/uxini.c @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); diff --git a/reactos/dll/win32/uxtheme/uxthemep.h b/reactos/dll/win32/uxtheme/uxthemep.h index e8e0f5dd1dd..83915c49505 100644 --- a/reactos/dll/win32/uxtheme/uxthemep.h +++ b/reactos/dll/win32/uxtheme/uxthemep.h @@ -1,14 +1,20 @@ -#include +#include +#include +#include + +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -#include #define TMT_ENUM 200 diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.c b/reactos/dll/win32/vdmdbg/vdmdbg.c index 2cccc4785f4..7d62258b4ae 100644 --- a/reactos/dll/win32/vdmdbg/vdmdbg.c +++ b/reactos/dll/win32/vdmdbg/vdmdbg.c @@ -1,4 +1,4 @@ -#include +#include "vdmdbg.h" #define NDEBUG #include diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.h b/reactos/dll/win32/vdmdbg/vdmdbg.h index 28531f2134b..654d28c9bc3 100644 --- a/reactos/dll/win32/vdmdbg/vdmdbg.h +++ b/reactos/dll/win32/vdmdbg/vdmdbg.h @@ -1,4 +1,6 @@ -#include +#include +#include +#include #define MAX_PATH16 255 #define MAX_MODULE_NAME 9 diff --git a/reactos/dll/win32/version/info.c b/reactos/dll/win32/version/info.c index e7f7077e72b..ff846ec0ee5 100644 --- a/reactos/dll/win32/version/info.c +++ b/reactos/dll/win32/version/info.c @@ -23,18 +23,18 @@ */ #include -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winver.h" -#include "winuser.h" -#include "winternl.h" -#include "lzexpand.h" -#include "wine/unicode.h" -#include "winerror.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include +#include +//#include "winerror.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(ver); diff --git a/reactos/dll/win32/version/install.c b/reactos/dll/win32/version/install.c index d5c12eb9fe4..f2fc13104bb 100644 --- a/reactos/dll/win32/version/install.c +++ b/reactos/dll/win32/version/install.c @@ -22,19 +22,19 @@ * o Check the installation functions. */ -#include -#include +//#include +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winver.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "winerror.h" -#include "lzexpand.h" -#include "wine/debug.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" +#include +//#include "winerror.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(ver); diff --git a/reactos/dll/win32/version/resource.c b/reactos/dll/win32/version/resource.c index 3b996d2079b..48a2712e2a0 100644 --- a/reactos/dll/win32/version/resource.c +++ b/reactos/dll/win32/version/resource.c @@ -20,30 +20,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include +//#include #include -#include -#include -#include +//#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "lzexpand.h" -#include "winuser.h" -#include "winver.h" +#include +#include +#include +//#include "winuser.h" +#include #undef VS_FILE_INFO #define VS_FILE_INFO 16 -#include "wine/unicode.h" +//#include "wine/unicode.h" -#include "wine/debug.h" +#include typedef struct { diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.h b/reactos/dll/win32/wdmaud.drv/wdmaud.h index 08e43c536de..de716d7039b 100644 --- a/reactos/dll/win32/wdmaud.drv/wdmaud.h +++ b/reactos/dll/win32/wdmaud.drv/wdmaud.h @@ -1,19 +1,20 @@ #ifndef WDMAUD_H__ #define WDMAUD_H__ -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include #include #include -#include "interface.h" -#include "mmixer.h" +#include +#include #include BOOL diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rc b/reactos/dll/win32/wdmaud.drv/wdmaud.rc index 4db8cd0881b..644ff645d64 100644 --- a/reactos/dll/win32/wdmaud.drv/wdmaud.rc +++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS WDM Audio driver mapper\0" #define REACTOS_STR_INTERNAL_NAME "wdmaud\0" diff --git a/reactos/dll/win32/windowscodecs/bitmap.c b/reactos/dll/win32/windowscodecs/bitmap.c index 520fdefc1ed..9a4042ec098 100644 --- a/reactos/dll/win32/windowscodecs/bitmap.c +++ b/reactos/dll/win32/windowscodecs/bitmap.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/bmpdecode.c b/reactos/dll/win32/windowscodecs/bmpdecode.c index e0293691272..6dc1249626c 100644 --- a/reactos/dll/win32/windowscodecs/bmpdecode.c +++ b/reactos/dll/win32/windowscodecs/bmpdecode.c @@ -16,23 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +//#include "winreg.h" +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/bmpencode.c b/reactos/dll/win32/windowscodecs/bmpencode.c index 27922e73296..2bea7863cce 100644 --- a/reactos/dll/win32/windowscodecs/bmpencode.c +++ b/reactos/dll/win32/windowscodecs/bmpencode.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +//#include "winreg.h" +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/clsfactory.c b/reactos/dll/win32/windowscodecs/clsfactory.c index a57d673142f..a5aa8296b9b 100644 --- a/reactos/dll/win32/windowscodecs/clsfactory.c +++ b/reactos/dll/win32/windowscodecs/clsfactory.c @@ -16,24 +16,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "ocidl.h" -#include "initguid.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +//#include "winreg.h" +#include +//#include "ocidl.h" +#include +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/colorcontext.c b/reactos/dll/win32/windowscodecs/colorcontext.c index 457b4db7013..54434c6ca39 100644 --- a/reactos/dll/win32/windowscodecs/colorcontext.c +++ b/reactos/dll/win32/windowscodecs/colorcontext.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/converter.c b/reactos/dll/win32/windowscodecs/converter.c index 8611560ca1b..73def317f99 100644 --- a/reactos/dll/win32/windowscodecs/converter.c +++ b/reactos/dll/win32/windowscodecs/converter.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/fliprotate.c b/reactos/dll/win32/windowscodecs/fliprotate.c index 81e01cc2f1f..5a4d0fae4c2 100644 --- a/reactos/dll/win32/windowscodecs/fliprotate.c +++ b/reactos/dll/win32/windowscodecs/fliprotate.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/gifformat.c b/reactos/dll/win32/windowscodecs/gifformat.c index 84838e28d0a..85de0ba1ac5 100644 --- a/reactos/dll/win32/windowscodecs/gifformat.c +++ b/reactos/dll/win32/windowscodecs/gifformat.c @@ -17,24 +17,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +#include +//#include "wincodec.h" +#include #include "ungif.h" #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/icnsformat.c b/reactos/dll/win32/windowscodecs/icnsformat.c index c77758175fc..12db752d189 100644 --- a/reactos/dll/win32/windowscodecs/icnsformat.c +++ b/reactos/dll/win32/windowscodecs/icnsformat.c @@ -16,8 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include @@ -80,15 +84,15 @@ #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +//#include "wincodec.h" -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/library.h" +#include +//#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/icoformat.c b/reactos/dll/win32/windowscodecs/icoformat.c index 7aec245e6e0..704b8f14ce3 100644 --- a/reactos/dll/win32/windowscodecs/icoformat.c +++ b/reactos/dll/win32/windowscodecs/icoformat.c @@ -16,25 +16,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -#include "pshpack1.h" +#include typedef struct { BYTE bWidth; @@ -54,7 +57,7 @@ typedef struct WORD idCount; } ICONHEADER; -#include "poppack.h" +#include typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; diff --git a/reactos/dll/win32/windowscodecs/imgfactory.c b/reactos/dll/win32/windowscodecs/imgfactory.c index 54b390b3be7..04452e731ee 100644 --- a/reactos/dll/win32/windowscodecs/imgfactory.c +++ b/reactos/dll/win32/windowscodecs/imgfactory.c @@ -16,23 +16,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "shellapi.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +//#include "winreg.h" +#include +//#include "shellapi.h" +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/info.c b/reactos/dll/win32/windowscodecs/info.c index 3da5b207416..262e6ab9958 100644 --- a/reactos/dll/win32/windowscodecs/info.c +++ b/reactos/dll/win32/windowscodecs/info.c @@ -17,24 +17,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +#include +//#include "wincodec.h" +#include -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/jpegformat.c b/reactos/dll/win32/windowscodecs/jpegformat.c index 6463de594cd..a8866a7d57b 100644 --- a/reactos/dll/win32/windowscodecs/jpegformat.c +++ b/reactos/dll/win32/windowscodecs/jpegformat.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include #ifdef HAVE_UNISTD_H # include #endif -#include +//#include #include -#include -#include +//#include +//#include #ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ @@ -44,15 +48,15 @@ #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/library.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/main.c b/reactos/dll/win32/windowscodecs/main.c index 2898d970dfe..f12eb12abf7 100644 --- a/reactos/dll/win32/windowscodecs/main.c +++ b/reactos/dll/win32/windowscodecs/main.c @@ -16,20 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/metadatahandler.c b/reactos/dll/win32/windowscodecs/metadatahandler.c index 6b19f842bd1..f660a8afea9 100644 --- a/reactos/dll/win32/windowscodecs/metadatahandler.c +++ b/reactos/dll/win32/windowscodecs/metadatahandler.c @@ -17,24 +17,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include + +//#include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +#include +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/palette.c b/reactos/dll/win32/windowscodecs/palette.c index 045f79501bd..9094063cb15 100644 --- a/reactos/dll/win32/windowscodecs/palette.c +++ b/reactos/dll/win32/windowscodecs/palette.c @@ -17,21 +17,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +//#include "winreg.h" +#include +#include -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/pngformat.c b/reactos/dll/win32/windowscodecs/pngformat.c index 009532d21b9..b0d764943ab 100644 --- a/reactos/dll/win32/windowscodecs/pngformat.c +++ b/reactos/dll/win32/windowscodecs/pngformat.c @@ -16,10 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include +#include + +//#include #ifdef HAVE_PNG_H #include @@ -28,16 +32,16 @@ #define NONAMELESSUNION #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/library.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/propertybag.c b/reactos/dll/win32/windowscodecs/propertybag.c index 3a85df03065..4c71700b86f 100644 --- a/reactos/dll/win32/windowscodecs/propertybag.c +++ b/reactos/dll/win32/windowscodecs/propertybag.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include -#include "wincodecs_private.h" +//#include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/proxy.c b/reactos/dll/win32/windowscodecs/proxy.c index 2f727b40e73..7372aa33be6 100644 --- a/reactos/dll/win32/windowscodecs/proxy.c +++ b/reactos/dll/win32/windowscodecs/proxy.c @@ -18,22 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/regsvr.c b/reactos/dll/win32/windowscodecs/regsvr.c index e4248191d2c..af41f81d286 100644 --- a/reactos/dll/win32/windowscodecs/regsvr.c +++ b/reactos/dll/win32/windowscodecs/regsvr.c @@ -16,26 +16,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "winerror.h" -#include "objbase.h" -#include "ocidl.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +//#include "ocidl.h" +//#include "wincodec.h" +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include #include "wincodecs_private.h" diff --git a/reactos/dll/win32/windowscodecs/scaler.c b/reactos/dll/win32/windowscodecs/scaler.c index 5470d2b5685..eb8540b1fee 100644 --- a/reactos/dll/win32/windowscodecs/scaler.c +++ b/reactos/dll/win32/windowscodecs/scaler.c @@ -16,20 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/stream.c b/reactos/dll/win32/windowscodecs/stream.c index a123b9d1657..73b4f8e1761 100644 --- a/reactos/dll/win32/windowscodecs/stream.c +++ b/reactos/dll/win32/windowscodecs/stream.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "shlwapi.h" -#include "wincodec.h" -#include "wincodecs_private.h" +#include +#include +#include +#include +#include +#include +//#include "wincodecs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/tgaformat.c b/reactos/dll/win32/windowscodecs/tgaformat.c index bb6d969aee4..42d96bb2feb 100644 --- a/reactos/dll/win32/windowscodecs/tgaformat.c +++ b/reactos/dll/win32/windowscodecs/tgaformat.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" +#include +#include +#include +#include #include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/library.h" +#include +//#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/tiffformat.c b/reactos/dll/win32/windowscodecs/tiffformat.c index 6c29babc271..f18dfa6afbb 100644 --- a/reactos/dll/win32/windowscodecs/tiffformat.c +++ b/reactos/dll/win32/windowscodecs/tiffformat.c @@ -16,8 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +#include #include #ifdef HAVE_UNISTD_H @@ -29,16 +33,16 @@ #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" +#include +#include +#include +//#include "wincodec.h" +#include #include "wincodecs_private.h" -#include "wine/debug.h" -#include "wine/library.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/reactos/dll/win32/windowscodecs/ungif.c b/reactos/dll/win32/windowscodecs/ungif.c index c2887ed3dbd..da2c6451947 100644 --- a/reactos/dll/win32/windowscodecs/ungif.c +++ b/reactos/dll/win32/windowscodecs/ungif.c @@ -47,12 +47,12 @@ * 3 Sep 90 - Version 1.1 by Gershon Elber (Support for Gif89, Unique names). *****************************************************************************/ -#include -#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" +#include +#include #include "ungif.h" diff --git a/reactos/dll/win32/winemp3.acm/mpegl3.c b/reactos/dll/win32/winemp3.acm/mpegl3.c index 21962b4e42d..c8ef9dc3867 100644 --- a/reactos/dll/win32/winemp3.acm/mpegl3.c +++ b/reactos/dll/win32/winemp3.acm/mpegl3.c @@ -21,12 +21,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include #include -#include +//#include #ifdef HAVE_MPG123_H # include @@ -40,16 +40,16 @@ # endif #endif -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +//#include "mmsystem.h" +//#include "mmreg.h" +//#include "msacm.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); diff --git a/reactos/dll/win32/winfax/precomp.h b/reactos/dll/win32/winfax/precomp.h index 6d96326edb9..6a57a40931b 100644 --- a/reactos/dll/win32/winfax/precomp.h +++ b/reactos/dll/win32/winfax/precomp.h @@ -1,4 +1,6 @@ -#include +#include +#include +#include #include /* INTERNAL *******************************************************************/ diff --git a/reactos/dll/win32/winfax/winfax.rc b/reactos/dll/win32/winfax/winfax.rc index 696e55a3d87..d1e283fa3f5 100644 --- a/reactos/dll/win32/winfax/winfax.rc +++ b/reactos/dll/win32/winfax/winfax.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS FAX API Support\0" #define REACTOS_STR_INTERNAL_NAME "winfax\0" diff --git a/reactos/dll/win32/wing32/wing32.c b/reactos/dll/win32/wing32/wing32.c index b8ea30c5d53..957c79391a7 100644 --- a/reactos/dll/win32/wing32/wing32.c +++ b/reactos/dll/win32/wing32/wing32.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN -#include +#include +#include +#include +#include /*********************************************************************** * WinGCreateDC (WING32.@) diff --git a/reactos/dll/win32/winhttp/cookie.c b/reactos/dll/win32/winhttp/cookie.c index af881ea2915..661cc7945c7 100644 --- a/reactos/dll/win32/winhttp/cookie.c +++ b/reactos/dll/win32/winhttp/cookie.c @@ -16,15 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/debug.h" -#include "wine/list.h" +#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winhttp.h" +#include +//#include "wine/list.h" + +//#include "windef.h" +#include +#include #include "winhttp_private.h" diff --git a/reactos/dll/win32/winhttp/handle.c b/reactos/dll/win32/winhttp/handle.c index 7a346a85126..16bd601d96f 100644 --- a/reactos/dll/win32/winhttp/handle.c +++ b/reactos/dll/win32/winhttp/handle.c @@ -18,15 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include +#include +//#include "wine/port.h" +#include -#include "windef.h" -#include "winbase.h" -#include "winhttp.h" +//#include + +//#include "windef.h" +#include +#include #include "winhttp_private.h" diff --git a/reactos/dll/win32/winhttp/main.c b/reactos/dll/win32/winhttp/main.c index 5348d4d4677..263814ea897 100644 --- a/reactos/dll/win32/winhttp/main.c +++ b/reactos/dll/win32/winhttp/main.c @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" -#include "httprequest.h" -#include "winhttp.h" +#include +#include +#include +#include +#include +#include -#include "wine/debug.h" +#include #include "winhttp_private.h" static HINSTANCE instance; diff --git a/reactos/dll/win32/winhttp/net.c b/reactos/dll/win32/winhttp/net.c index 4bac5791f64..458312c5254 100644 --- a/reactos/dll/win32/winhttp/net.c +++ b/reactos/dll/win32/winhttp/net.c @@ -16,14 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include -#include +#include +//#include "wine/port.h" -#include +//#include +//#include +//#include + +//#include #ifdef HAVE_SYS_SOCKET_H # include #endif @@ -45,19 +49,19 @@ #define NONAMELESSUNION -#include "wine/debug.h" -#include "wine/library.h" +#include +#include -#include "windef.h" -#include "winbase.h" -#include "winhttp.h" -#include "wincrypt.h" +//#include "windef.h" +//#include "winbase.h" +#include +//#include "wincrypt.h" #include "winhttp_private.h" /* to avoid conflicts with the Unix socket headers */ #define USE_WS_PREFIX -#include "winsock2.h" +//#include "winsock2.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/reactos/dll/win32/winhttp/request.c b/reactos/dll/win32/winhttp/request.c index 88682e75d3e..1febb5ed649 100644 --- a/reactos/dll/win32/winhttp/request.c +++ b/reactos/dll/win32/winhttp/request.c @@ -19,22 +19,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include +//#include "wine/port.h" +#include #include #ifdef HAVE_ARPA_INET_H # include #endif -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "initguid.h" -#include "httprequest.h" -#include "winhttp.h" +#include +#include +#include +//#include "initguid.h" +#include +#include #include "winhttp_private.h" diff --git a/reactos/dll/win32/winhttp/session.c b/reactos/dll/win32/winhttp/session.c index e1e6841e06f..171dd1423be 100644 --- a/reactos/dll/win32/winhttp/session.c +++ b/reactos/dll/win32/winhttp/session.c @@ -16,22 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include -#include +#include +//#include "wine/port.h" +#include -#include "windef.h" -#include "winbase.h" -#include "winhttp.h" -#include "wincrypt.h" -#include "winreg.h" +//#include +//#include + +#include +#include +#include +#include +#include #define COBJMACROS -#include "ole2.h" -#include "dispex.h" -#include "activscp.h" +#include +#include +#include #include "winhttp_private.h" diff --git a/reactos/dll/win32/winhttp/url.c b/reactos/dll/win32/winhttp/url.c index d8b423cf8be..b6cfb151226 100644 --- a/reactos/dll/win32/winhttp/url.c +++ b/reactos/dll/win32/winhttp/url.c @@ -16,16 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/debug.h" +#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winhttp.h" -#include "shlwapi.h" +#include + +//#include "windef.h" +#include +//#include "winreg.h" +#include +//#include "shlwapi.h" #include "winhttp_private.h" diff --git a/reactos/dll/win32/winhttp/winhttp_private.h b/reactos/dll/win32/winhttp/winhttp_private.h index 021bc93803f..1b83dc9b395 100644 --- a/reactos/dll/win32/winhttp/winhttp_private.h +++ b/reactos/dll/win32/winhttp/winhttp_private.h @@ -23,10 +23,10 @@ # error You must include config.h to use this header #endif -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include -#include +//#include #ifdef HAVE_SYS_SOCKET_H # include #endif @@ -42,7 +42,7 @@ # define closesocket close # define ioctlsocket ioctl #endif -#include "ole2.h" +#include static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; diff --git a/reactos/dll/win32/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c index 6f9caad66fe..f4b9052957e 100644 --- a/reactos/dll/win32/wininet/cookie.c +++ b/reactos/dll/win32/wininet/cookie.c @@ -20,27 +20,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" + +#include +//#include +//#include +//#include +#ifdef HAVE_UNISTD_H +# include +#endif + +#include +#include +#include +//#include "winerror.h" #if defined(__MINGW32__) || defined (_MSC_VER) #include #endif -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -# include -#endif - -#include "windef.h" -#include "winbase.h" -#include "wininet.h" -#include "winerror.h" - -#include "wine/debug.h" +#include #include "internet.h" #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ diff --git a/reactos/dll/win32/wininet/dialogs.c b/reactos/dll/win32/wininet/dialogs.c index 9674718bce7..7294c5b6f06 100644 --- a/reactos/dll/win32/wininet/dialogs.c +++ b/reactos/dll/win32/wininet/dialogs.c @@ -18,29 +18,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" + +#include + +#include +#include +#include +//#include "winreg.h" +#include +#include +#include +//#include "winerror.h" +#define NO_SHLWAPI_STREAM +//#include "shlwapi.h" #if defined(__MINGW32__) || defined (_MSC_VER) #include #endif -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "wininet.h" -#include "winnetwk.h" -#include "wine/debug.h" -#include "winerror.h" -#define NO_SHLWAPI_STREAM -#include "shlwapi.h" - #include "internet.h" -#include "wine/unicode.h" +//#include "wine/unicode.h" #include "resource.h" diff --git a/reactos/dll/win32/wininet/ftp.c b/reactos/dll/win32/wininet/ftp.c index 54dd6551710..255a7e835f2 100644 --- a/reactos/dll/win32/wininet/ftp.c +++ b/reactos/dll/win32/wininet/ftp.c @@ -27,19 +27,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #include -#include -#include -#include +//#include +//#include +//#include #ifdef HAVE_SYS_SOCKET_H # include #endif @@ -52,21 +52,25 @@ #ifdef HAVE_SYS_IOCTL_H # include #endif -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wininet.h" -#include "winnls.h" -#include "winerror.h" -#include "winreg.h" -#include "winternl.h" -#include "shlwapi.h" +#include +#include +//#include "wingdi.h" +//#include "winuser.h" +#include +//#include "winnls.h" +//#include "winerror.h" +#include +//#include "winternl.h" +#include -#include "wine/debug.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include +#endif + +#include #include "internet.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/wininet/gopher.c b/reactos/dll/win32/wininet/gopher.c index 6688ce7a947..525ba32277b 100644 --- a/reactos/dll/win32/wininet/gopher.c +++ b/reactos/dll/win32/wininet/gopher.c @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "wininet.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/wininet/http.c b/reactos/dll/win32/wininet/http.c index 65d666ac7e1..c9262e5654e 100644 --- a/reactos/dll/win32/wininet/http.c +++ b/reactos/dll/win32/wininet/http.c @@ -27,51 +27,54 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif +#include +//#include "wine/port.h" -#include +//#include #ifdef HAVE_SYS_SOCKET_H # include #endif #ifdef HAVE_ARPA_INET_H # include #endif -#include +//#include #include -#include +//#include #ifdef HAVE_UNISTD_H # include #endif -#include +//#include #include #ifdef HAVE_ZLIB # include #endif -#include "windef.h" -#include "winbase.h" -#include "wininet.h" -#include "winerror.h" -#include "winternl.h" +#include +#include +#include +//#include "winerror.h" +#include #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG #define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI -#include "shlwapi.h" -#include "sspi.h" -#include "wincrypt.h" -#include "winuser.h" -#include "cryptuiapi.h" +#include +#include +//#include "wincrypt.h" +#include +#include + +#if defined(__MINGW32__) || defined (_MSC_VER) +#include +#endif #include "internet.h" -#include "wine/debug.h" -#include "wine/exception.h" -#include "wine/unicode.h" +#include +#include +//#include "wine/unicode.h" // ReactOS #include "inet_ntop.c" diff --git a/reactos/dll/win32/wininet/internet.c b/reactos/dll/win32/wininet/internet.c index 81ed0ae9bea..8b8e38ad78a 100644 --- a/reactos/dll/win32/wininet/internet.c +++ b/reactos/dll/win32/wininet/internet.c @@ -26,17 +26,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #include -#include +//#include #ifdef HAVE_SYS_SOCKET_H # include #endif @@ -49,31 +49,35 @@ #ifdef HAVE_SYS_TIME_H # include #endif -#include -#include +//#include +//#include #ifdef HAVE_UNISTD_H # include #endif -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" -#include "wininet.h" -#include "winineti.h" -#include "winnls.h" -#include "wine/debug.h" -#include "winerror.h" +#include +#include +#include +#include +#include +//#include "winineti.h" +//#include "winnls.h" +#include +//#include "winerror.h" #define NO_SHLWAPI_STREAM -#include "shlwapi.h" +#include -#include "wine/exception.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include +#endif + +//#include "wine/exception.h" #include "internet.h" #include "resource.h" -#include "wine/unicode.h" +//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/wininet/netconnection.c b/reactos/dll/win32/wininet/netconnection.c index be9ccab3d16..72ddc4a0fcd 100644 --- a/reactos/dll/win32/wininet/netconnection.c +++ b/reactos/dll/win32/wininet/netconnection.c @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #define NONAMELESSUNION -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - #include #ifdef HAVE_POLL_H #include @@ -69,26 +69,30 @@ #endif #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include -#include "wine/library.h" -#include "windef.h" -#include "winbase.h" -#include "wininet.h" -#include "winerror.h" -#include "wincrypt.h" +//#include "wine/library.h" +#include +#include +#include +//#include "winerror.h" +//#include "wincrypt.h" -#include "wine/debug.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include +#endif + +#include #include "internet.h" /* To avoid conflicts with the Unix socket headers. we only need it for * the error codes anyway. */ #define USE_WS_PREFIX -#include "winsock2.h" +//#include "winsock2.h" #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ diff --git a/reactos/dll/win32/wininet/resource.h b/reactos/dll/win32/wininet/resource.h index 256a374af08..bce5d34cf67 100644 --- a/reactos/dll/win32/wininet/resource.h +++ b/reactos/dll/win32/wininet/resource.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include #define IDD_INVCERTDLG 0x398 #define IDD_AUTHDLG 0x399 diff --git a/reactos/dll/win32/wininet/rsrc.rc b/reactos/dll/win32/wininet/rsrc.rc index 0f9b61dac89..9b85e1cc433 100644 --- a/reactos/dll/win32/wininet/rsrc.rc +++ b/reactos/dll/win32/wininet/rsrc.rc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +#include +//#include "winbase.h" +#include +//#include "winnls.h" #include "resource.h" @@ -123,4 +123,3 @@ #ifdef LANGUAGE_ZH_CN #include "wininet_Zh.rc" #endif - diff --git a/reactos/dll/win32/wininet/urlcache.c b/reactos/dll/win32/wininet/urlcache.c index 2d2e64c497a..679f80e869d 100644 --- a/reactos/dll/win32/wininet/urlcache.c +++ b/reactos/dll/win32/wininet/urlcache.c @@ -22,41 +22,45 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include +//#include +//#include +//#include +//#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +//#include + +#include +#include +//#include "winuser.h" +#include +#include +//#include "winerror.h" +#include +#include +#include +#include + #if defined(__MINGW32__) || defined (_MSC_VER) #include #endif -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wininet.h" -#include "winineti.h" -#include "winerror.h" -#include "winreg.h" -#include "shlwapi.h" -#include "shlobj.h" -#include "shellapi.h" - #include "internet.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include "wine/unicode.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/wininet/utility.c b/reactos/dll/win32/wininet/utility.c index 9a70e62df88..2d25aae4ca1 100644 --- a/reactos/dll/win32/wininet/utility.c +++ b/reactos/dll/win32/wininet/utility.c @@ -22,24 +22,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" + +#include +//#include +//#include +//#include + +#include +#include +#include +//#include "winnls.h" #if defined(__MINGW32__) || defined (_MSC_VER) #include #endif -#include -#include -#include -#include - -#include "windef.h" -#include "winbase.h" -#include "wininet.h" -#include "winnls.h" - -#include "wine/debug.h" +#include #include "internet.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/wininet/wininet_main.c b/reactos/dll/win32/wininet/wininet_main.c index cf4a6f2d9a0..84e1fcb3302 100644 --- a/reactos/dll/win32/wininet/wininet_main.c +++ b/reactos/dll/win32/wininet/wininet_main.c @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "shlwapi.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +//#include "winreg.h" +//#include "shlwapi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/reactos/dll/win32/winmm/driver.c b/reactos/dll/win32/winmm/driver.c index 5f2c0dceeb2..f9771d1a7ab 100644 --- a/reactos/dll/win32/winmm/driver.c +++ b/reactos/dll/win32/winmm/driver.c @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "mmddk.h" +#include +#include +//#include "wingdi.h" +#include +//#include "winnls.h" +#include +//#include "mmddk.h" #include "winemm.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "excpt.h" -#include "wine/exception.h" +#include +#include +//#include "excpt.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(driver); diff --git a/reactos/dll/win32/winmm/joystick.c b/reactos/dll/win32/winmm/joystick.c index ac4fc4ee45a..4c0fa254424 100644 --- a/reactos/dll/win32/winmm/joystick.c +++ b/reactos/dll/win32/winmm/joystick.c @@ -21,31 +21,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #ifdef HAVE_UNISTD_H # include #endif -#include -#include +//#include +//#include #include -#include -#include +//#include +//#include #ifdef HAVE_SYS_IOCTL_H #include #endif #include "winemm.h" -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "mmsystem.h" +//#include "wingdi.h" +#include +#include -#include "mmddk.h" +//#include "mmddk.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/reactos/dll/win32/winmm/lolvldrv.c b/reactos/dll/win32/winmm/lolvldrv.c index e804533c547..75a015bb356 100644 --- a/reactos/dll/win32/winmm/lolvldrv.c +++ b/reactos/dll/win32/winmm/lolvldrv.c @@ -21,19 +21,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include -#include +//#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winreg.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winreg.h" #include "winemm.h" -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/reactos/dll/win32/winmm/mci.c b/reactos/dll/win32/winmm/mci.c index e2e10e27217..d2ac74edcd9 100644 --- a/reactos/dll/win32/winmm/mci.c +++ b/reactos/dll/win32/winmm/mci.c @@ -42,28 +42,28 @@ * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO) */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "mmsystem.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "wownt32.h" +#include +//#include "winbase.h" +//#include "wingdi.h" +#include +#include +//#include "winnls.h" +#include +#include -#include "digitalv.h" +#include #include "winemm.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(mci); diff --git a/reactos/dll/win32/winmm/midimap/midimap.c b/reactos/dll/win32/winmm/midimap/midimap.c index d9916353ef4..e8214a63b42 100644 --- a/reactos/dll/win32/winmm/midimap/midimap.c +++ b/reactos/dll/win32/winmm/midimap/midimap.c @@ -24,17 +24,17 @@ */ #include -#include -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "winreg.h" -#include "wine/unicode.h" -#include "wine/debug.h" +//#include +//#include +//#include +#include +//#include "winbase.h" +//#include "wingdi.h" +#include +#include +#include +#include +#include /* * Here's how Windows stores the midiOut mapping information. diff --git a/reactos/dll/win32/winmm/midimap/midimap.rc b/reactos/dll/win32/winmm/midimap/midimap.rc index fdadd54080b..9c0ef6ca0fd 100644 --- a/reactos/dll/win32/winmm/midimap/midimap.rc +++ b/reactos/dll/win32/winmm/midimap/midimap.rc @@ -1,5 +1,3 @@ -/* $Id: midimap.rc 11297 2004-10-16 20:27:43Z gvg $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/WINE MIDI Mapper\0" #define REACTOS_STR_INTERNAL_NAME "midimap\0" diff --git a/reactos/dll/win32/winmm/mmio.c b/reactos/dll/win32/winmm/mmio.c index 3ee265256ac..8b1e6c387b8 100644 --- a/reactos/dll/win32/winmm/mmio.c +++ b/reactos/dll/win32/winmm/mmio.c @@ -28,20 +28,20 @@ */ -#include +//#include #include -#include -#include -#include +//#include +//#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "mmsystem.h" +#include +#include +#include +//#include "mmsystem.h" #include "winemm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mmio); diff --git a/reactos/dll/win32/winmm/playsound.c b/reactos/dll/win32/winmm/playsound.c index 54db68f0f8e..6196e9ff43c 100644 --- a/reactos/dll/win32/winmm/playsound.c +++ b/reactos/dll/win32/winmm/playsound.c @@ -21,19 +21,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" +#include +//#include "winbase.h" +//#include "mmsystem.h" +//#include "wingdi.h" +//#include "winuser.h" +#include #include "winemm.h" -#include "winternl.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/reactos/dll/win32/winmm/registry.c b/reactos/dll/win32/winmm/registry.c index b967723d14b..9ac94a38917 100644 --- a/reactos/dll/win32/winmm/registry.c +++ b/reactos/dll/win32/winmm/registry.c @@ -16,9 +16,10 @@ TODO: Handle system.ini */ -#include +#include +#include #include "winemm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/reactos/dll/win32/winmm/time.c b/reactos/dll/win32/winmm/time.c index dfd3eb4bc1e..1c4dbc4c907 100644 --- a/reactos/dll/win32/winmm/time.c +++ b/reactos/dll/win32/winmm/time.c @@ -20,11 +20,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include -#include +//#include +//#include #ifdef HAVE_SYS_TIME_H # include #endif @@ -32,13 +32,13 @@ # include #endif -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" +//#include "windef.h" +//#include "winbase.h" +//#include "mmsystem.h" #include "winemm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(mmtime); diff --git a/reactos/dll/win32/winmm/winemm.h b/reactos/dll/win32/winmm/winemm.h index 725294a7736..1dd73539bb4 100644 --- a/reactos/dll/win32/winmm/winemm.h +++ b/reactos/dll/win32/winmm/winemm.h @@ -21,9 +21,9 @@ #include -#include "windef.h" -#include "winbase.h" -#include "mmddk.h" +#include +//#include "winbase.h" +#include #define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio,esd" #define WINE_DEFAULT_WINMM_MAPPER "msacm32.drv" diff --git a/reactos/dll/win32/winmm/winmm.c b/reactos/dll/win32/winmm/winmm.c index b46a8086ba4..2c7644496e1 100644 --- a/reactos/dll/win32/winmm/winmm.c +++ b/reactos/dll/win32/winmm/winmm.c @@ -40,20 +40,20 @@ */ #include -#include -#include +//#include +//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "winuser.h" -#include "winnls.h" -#include "winternl.h" +#include +#include +//#include "mmsystem.h" +#include +#include +//#include "winternl.h" #include "winemm.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/reactos/dll/win32/winspool/info.c b/reactos/dll/win32/winspool/info.c index 36a1a1a0aa4..2928b8f252c 100644 --- a/reactos/dll/win32/winspool/info.c +++ b/reactos/dll/win32/winspool/info.c @@ -22,26 +22,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "wine/config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include +//#include "wine/port.h" #include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winreg.h" -#include "shlwapi.h" -#include "winspool.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winnls.h" +#include +#include +//#include "winerror.h" +#include +#include +#include +#include +//#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(winspool); diff --git a/reactos/dll/win32/winspool/stubs.c b/reactos/dll/win32/winspool/stubs.c index ef2e05528d8..d1f32d4ec92 100644 --- a/reactos/dll/win32/winspool/stubs.c +++ b/reactos/dll/win32/winspool/stubs.c @@ -8,8 +8,12 @@ * REVISIONS: */ -#include -#include +#include +#include +#include +#include +#include +#include /* * @unimplemented diff --git a/reactos/dll/win32/winspool/winspool.rc b/reactos/dll/win32/winspool/winspool.rc index ff561109b4e..4c8a4a11138 100644 --- a/reactos/dll/win32/winspool/winspool.rc +++ b/reactos/dll/win32/winspool/winspool.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows printer spooler\0" #define REACTOS_STR_INTERNAL_NAME "winspool\0" diff --git a/reactos/dll/win32/winsta/logon.c b/reactos/dll/win32/winsta/logon.c index 4bd2be64fe1..421b77ba927 100644 --- a/reactos/dll/win32/winsta/logon.c +++ b/reactos/dll/win32/winsta/logon.c @@ -6,7 +6,7 @@ * NOTES: This file contains exported functions relevant to * userinit, winlogon, lsass and friends in vista. */ -#include +#include "winsta.h" VOID WINSTAAPI WinStationDisconnect(PVOID A, diff --git a/reactos/dll/win32/winsta/main.c b/reactos/dll/win32/winsta/main.c index 13185ae38f4..400129c1d0f 100644 --- a/reactos/dll/win32/winsta/main.c +++ b/reactos/dll/win32/winsta/main.c @@ -23,7 +23,7 @@ * PROGRAMMER: Emanuele Aliberti * Samuel Serapi?n */ -#include +#include "winsta.h" HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/winsta/misc.c b/reactos/dll/win32/winsta/misc.c index ee267d17a3d..b3d21961faa 100644 --- a/reactos/dll/win32/winsta/misc.c +++ b/reactos/dll/win32/winsta/misc.c @@ -6,7 +6,7 @@ * NOTES: Misc functions. * */ -#include +#include "winsta.h" VOID WINSTAAPI LogonIdFromWinStationNameA(PVOID A, diff --git a/reactos/dll/win32/winsta/query.c b/reactos/dll/win32/winsta/query.c index 6800860c2b2..7d061a41748 100644 --- a/reactos/dll/win32/winsta/query.c +++ b/reactos/dll/win32/winsta/query.c @@ -6,7 +6,7 @@ * NOTE: Get, query and enum functions. */ -#include +#include "winsta.h" VOID WINSTAAPI diff --git a/reactos/dll/win32/winsta/security.c b/reactos/dll/win32/winsta/security.c index 7e962744c95..db304209a43 100644 --- a/reactos/dll/win32/winsta/security.c +++ b/reactos/dll/win32/winsta/security.c @@ -5,7 +5,7 @@ * PROGRAMMER: Samuel Serapi?n * NOTE: Not needed, just here for the show. */ -#include +#include "winsta.h" VOID WINSTAAPI ServerLicensingOpenA(PVOID A) diff --git a/reactos/dll/win32/winsta/server.c b/reactos/dll/win32/winsta/server.c index 98cce5b13ec..f3016d2a518 100644 --- a/reactos/dll/win32/winsta/server.c +++ b/reactos/dll/win32/winsta/server.c @@ -6,7 +6,7 @@ * */ -#include +#include "winsta.h" VOID WINSTAAPI WinStationOpenServerA(PVOID A) diff --git a/reactos/dll/win32/winsta/winsta.h b/reactos/dll/win32/winsta/winsta.h index 791fd15e6bd..f1fd8e2d25b 100644 --- a/reactos/dll/win32/winsta/winsta.h +++ b/reactos/dll/win32/winsta/winsta.h @@ -12,13 +12,13 @@ /* Default header set */ #include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winternl.h" +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winsta); diff --git a/reactos/dll/win32/winsta/ws.c b/reactos/dll/win32/winsta/ws.c index 4cfa59dc6ab..32ed9557430 100644 --- a/reactos/dll/win32/winsta/ws.c +++ b/reactos/dll/win32/winsta/ws.c @@ -5,7 +5,7 @@ * PROGRAMMER: Samuel Serapi?n * */ -#include +#include "winsta.h" VOID WINSTAAPI WinStationFreeMemory(PVOID A) diff --git a/reactos/dll/win32/wintrust/asn.c b/reactos/dll/win32/wintrust/asn.c index 865926640a3..17494aa81cb 100644 --- a/reactos/dll/win32/wintrust/asn.c +++ b/reactos/dll/win32/wintrust/asn.c @@ -18,22 +18,22 @@ * */ -#include "config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" -#include +//#include #include #include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" -#include "wintrust.h" -#include "snmp.h" -#include "winternl.h" -#include "wine/debug.h" -#include "wine/exception.h" +#include +#include +//#include "winerror.h" +//#include "wincrypt.h" +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); diff --git a/reactos/dll/win32/wintrust/crypt.c b/reactos/dll/win32/wintrust/crypt.c index 341f45bd59f..04bdc08c226 100644 --- a/reactos/dll/win32/wintrust/crypt.c +++ b/reactos/dll/win32/wintrust/crypt.c @@ -22,18 +22,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "wintrust.h" -#include "mscat.h" -#include "mssip.h" -#include "imagehlp.h" -#include "winternl.h" +#include +#include +#include +#include +//#include "mssip.h" +#include +#include -#include "wine/debug.h" -#include "wine/unicode.h" +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wintrust); diff --git a/reactos/dll/win32/wintrust/register.c b/reactos/dll/win32/wintrust/register.c index 05e48ef0d7c..07db160044e 100644 --- a/reactos/dll/win32/wintrust/register.c +++ b/reactos/dll/win32/wintrust/register.c @@ -20,20 +20,20 @@ #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "winreg.h" -#include "winnls.h" -#include "objbase.h" +#include +#include +//#include "winerror.h" +#include +#include +#include +//#include "objbase.h" -#include "guiddef.h" -#include "wintrust.h" -#include "softpub.h" -#include "mssip.h" +//#include "guiddef.h" +//#include "wintrust.h" +#include +#include #include "wintrust_priv.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wintrust); diff --git a/reactos/dll/win32/wintrust/softpub.c b/reactos/dll/win32/wintrust/softpub.c index 358ba01b6dd..22b602987cf 100644 --- a/reactos/dll/win32/wintrust/softpub.c +++ b/reactos/dll/win32/wintrust/softpub.c @@ -19,13 +19,13 @@ #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wintrust.h" -#include "mssip.h" -#include "softpub.h" -#include "winnls.h" -#include "wine/debug.h" +#include +#include +#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wintrust); diff --git a/reactos/dll/win32/wintrust/wintrust_main.c b/reactos/dll/win32/wintrust/wintrust_main.c index 9b8dd85c737..5ddad0e8758 100644 --- a/reactos/dll/win32/wintrust/wintrust_main.c +++ b/reactos/dll/win32/wintrust/wintrust_main.c @@ -17,26 +17,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include #include #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "guiddef.h" -#include "wintrust.h" -#include "softpub.h" -#include "mscat.h" -#include "objbase.h" -#include "winuser.h" -#include "cryptdlg.h" -#include "cryptuiapi.h" -#include "wintrust_priv.h" -#include "wine/debug.h" +#include +#include +//#include "winerror.h" +#include +//#include "guiddef.h" +//#include "wintrust.h" +#include +#include +#include +#include +#include +#include +//#include "wintrust_priv.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wintrust); diff --git a/reactos/dll/win32/wlanapi/main.c b/reactos/dll/win32/wlanapi/main.c index 3740f916af1..437eae85541 100644 --- a/reactos/dll/win32/wlanapi/main.c +++ b/reactos/dll/win32/wlanapi/main.c @@ -21,10 +21,14 @@ /* INCLUDES ****************************************************************/ #define WIN32_NO_STATUS -#include -#include "wlansvc_c.h" +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); diff --git a/reactos/dll/win32/wldap32/add.c b/reactos/dll/win32/wldap32/add.c index b15f5f9e41c..22b7ec6f5bd 100644 --- a/reactos/dll/win32/wldap32/add.c +++ b/reactos/dll/win32/wldap32/add.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/ber.c b/reactos/dll/win32/wldap32/ber.c index 41acd7073fa..d278517eee0 100644 --- a/reactos/dll/win32/wldap32/ber.c +++ b/reactos/dll/win32/wldap32/ber.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" +#include +#include #include "winldap.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/bind.c b/reactos/dll/win32/wldap32/bind.c index 18ca869b95a..b924f4fd3c7 100644 --- a/reactos/dll/win32/wldap32/bind.c +++ b/reactos/dll/win32/wldap32/bind.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/compare.c b/reactos/dll/win32/wldap32/compare.c index 1ab36b7c75c..8713903b090 100644 --- a/reactos/dll/win32/wldap32/compare.c +++ b/reactos/dll/win32/wldap32/compare.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/control.c b/reactos/dll/win32/wldap32/control.c index fa415f84792..e98c0e1fd04 100644 --- a/reactos/dll/win32/wldap32/control.c +++ b/reactos/dll/win32/wldap32/control.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/delete.c b/reactos/dll/win32/wldap32/delete.c index 226b868fc83..af4f50511fa 100644 --- a/reactos/dll/win32/wldap32/delete.c +++ b/reactos/dll/win32/wldap32/delete.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/dn.c b/reactos/dll/win32/wldap32/dn.c index 438430ee1e0..0d59614ea23 100644 --- a/reactos/dll/win32/wldap32/dn.c +++ b/reactos/dll/win32/wldap32/dn.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/error.c b/reactos/dll/win32/wldap32/error.c index ca088e6876f..783c8788580 100644 --- a/reactos/dll/win32/wldap32/error.c +++ b/reactos/dll/win32/wldap32/error.c @@ -18,24 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" +//#include "windef.h" +#include +#include +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" extern HINSTANCE hwldap32; diff --git a/reactos/dll/win32/wldap32/extended.c b/reactos/dll/win32/wldap32/extended.c index 821449f45eb..a9b48198f85 100644 --- a/reactos/dll/win32/wldap32/extended.c +++ b/reactos/dll/win32/wldap32/extended.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/init.c b/reactos/dll/win32/wldap32/init.c index db9b4517238..b1a46cda38b 100644 --- a/reactos/dll/win32/wldap32/init.c +++ b/reactos/dll/win32/wldap32/init.c @@ -18,24 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" #ifdef HAVE_LDAP /* Should eventually be determined by the algorithm documented on MSDN. */ diff --git a/reactos/dll/win32/wldap32/main.c b/reactos/dll/win32/wldap32/main.c index a00dee3bd70..99791ec3f95 100644 --- a/reactos/dll/win32/wldap32/main.c +++ b/reactos/dll/win32/wldap32/main.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/debug.h" -#include +#include +//#include -#include "windef.h" -#include "winbase.h" +//#include "windef.h" +#include HINSTANCE hwldap32; diff --git a/reactos/dll/win32/wldap32/misc.c b/reactos/dll/win32/wldap32/misc.c index fa9ac7ac555..67a931d6616 100644 --- a/reactos/dll/win32/wldap32/misc.c +++ b/reactos/dll/win32/wldap32/misc.c @@ -18,17 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +#include +#include #ifdef HAVE_LDAP_H #include diff --git a/reactos/dll/win32/wldap32/modify.c b/reactos/dll/win32/wldap32/modify.c index 3c4eac1e041..ccccc21f15f 100644 --- a/reactos/dll/win32/wldap32/modify.c +++ b/reactos/dll/win32/wldap32/modify.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/modrdn.c b/reactos/dll/win32/wldap32/modrdn.c index 76bf892b2a6..7996cad1bed 100644 --- a/reactos/dll/win32/wldap32/modrdn.c +++ b/reactos/dll/win32/wldap32/modrdn.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/option.c b/reactos/dll/win32/wldap32/option.c index 801d77d931c..91f7c6f5641 100644 --- a/reactos/dll/win32/wldap32/option.c +++ b/reactos/dll/win32/wldap32/option.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/page.c b/reactos/dll/win32/wldap32/page.c index b3c2d78d81e..fb731f171bb 100644 --- a/reactos/dll/win32/wldap32/page.c +++ b/reactos/dll/win32/wldap32/page.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" #ifndef LDAP_MAXINT #define LDAP_MAXINT 2147483647 diff --git a/reactos/dll/win32/wldap32/parse.c b/reactos/dll/win32/wldap32/parse.c index f7e93dd02a3..c3ea1d39702 100644 --- a/reactos/dll/win32/wldap32/parse.c +++ b/reactos/dll/win32/wldap32/parse.c @@ -18,16 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +#include +#include #ifdef HAVE_LDAP_H #include diff --git a/reactos/dll/win32/wldap32/rename.c b/reactos/dll/win32/wldap32/rename.c index 864a6af31ae..eafc34d348b 100644 --- a/reactos/dll/win32/wldap32/rename.c +++ b/reactos/dll/win32/wldap32/rename.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/search.c b/reactos/dll/win32/wldap32/search.c index 16158a4f772..99d3c35cb4c 100644 --- a/reactos/dll/win32/wldap32/search.c +++ b/reactos/dll/win32/wldap32/search.c @@ -18,23 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" #ifdef HAVE_LDAP_H #include #endif #include "winldap_private.h" -#include "wldap32.h" +//#include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); diff --git a/reactos/dll/win32/wldap32/value.c b/reactos/dll/win32/wldap32/value.c index df813ad2ebc..665255afe22 100644 --- a/reactos/dll/win32/wldap32/value.c +++ b/reactos/dll/win32/wldap32/value.c @@ -18,16 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include -#include "wine/port.h" -#include "wine/debug.h" +//#include "wine/port.h" +#include -#include +//#include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +//#include "windef.h" +#include +#include #ifdef HAVE_LDAP_H #include diff --git a/reactos/dll/win32/wldap32/wldap32.rc b/reactos/dll/win32/wldap32/wldap32.rc index cd0200b8b83..b2dba37a185 100644 --- a/reactos/dll/win32/wldap32/wldap32.rc +++ b/reactos/dll/win32/wldap32/wldap32.rc @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" #ifdef LANGUAGE_DA_DK #include "wldap32_Da.rc" diff --git a/reactos/dll/win32/wmi/wmi.rc b/reactos/dll/win32/wmi/wmi.rc index 1e1e3747d93..fd7bc07e85a 100644 --- a/reactos/dll/win32/wmi/wmi.rc +++ b/reactos/dll/win32/wmi/wmi.rc @@ -1,5 +1,3 @@ -#include - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "WMI DC and DP functionality\0" #define REACTOS_STR_INTERNAL_NAME "wmi\0" diff --git a/reactos/dll/win32/ws2_32/include/handle.h b/reactos/dll/win32/ws2_32/include/handle.h index 95fb03a9b3b..28818d7d862 100644 --- a/reactos/dll/win32/ws2_32/include/handle.h +++ b/reactos/dll/win32/ws2_32/include/handle.h @@ -7,7 +7,7 @@ #ifndef __HANDLE_H #define __HANDLE_H -#include +//#include typedef struct _PROVIDER_HANDLE { diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h index 075c9beed26..43edf3079ff 100644 --- a/reactos/dll/win32/ws2_32/include/ws2_32.h +++ b/reactos/dll/win32/ws2_32/include/ws2_32.h @@ -7,15 +7,19 @@ #ifndef __WS2_32_H #define __WS2_32_H -#include #include #include #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include #include #include -#include #define NTOS_MODE_USER #include @@ -25,11 +29,9 @@ #include #include // DNS_A_DATA -#include - #include "catalog.h" #include "handle.h" -#include "upcall.h" +//#include "upcall.h" #define EXPORT WINAPI diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c index 0963d705a6d..6a37cb81c68 100644 --- a/reactos/dll/win32/ws2_32/misc/async.c +++ b/reactos/dll/win32/ws2_32/misc/async.c @@ -34,20 +34,22 @@ * whole stuff did not work anyway to other changes). */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include "wine/config.h" -#include "wine/port.h" +#include +//#include "wine/port.h" #include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2spi.h" +#include +#include +//#include "wingdi.h" +#include +#include +//#include "ws2spi.h" -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(winsock); diff --git a/reactos/dll/win32/ws2_32/ws2_32.rc b/reactos/dll/win32/ws2_32/ws2_32.rc index cb16cfa3cba..9696f2fc07c 100644 --- a/reactos/dll/win32/ws2_32/ws2_32.rc +++ b/reactos/dll/win32/ws2_32/ws2_32.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 DLL\0" #define REACTOS_STR_INTERNAL_NAME "ws2_32\0" diff --git a/reactos/dll/win32/ws2_32_new/CMakeLists.txt b/reactos/dll/win32/ws2_32_new/CMakeLists.txt index 98722c8565c..3689850e758 100644 --- a/reactos/dll/win32/ws2_32_new/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32_new/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE src/rasdial.c src/recv.c src/rnr.c - src/scihlpr.c + #src/scihlpr.c src/select.c src/send.c src/sockctrl.c diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h index e680d3a8502..008eef1b5a3 100644 --- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h +++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h @@ -5,8 +5,9 @@ * PURPOSE: WinSock 2.2 Main Header */ -/* Definitions for NDK Usage */ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H //#define _WIN32_WINNT 0x502 #define NTOS_MODE_USER #define _CRT_SECURE_NO_DEPRECATE @@ -14,14 +15,19 @@ /* C Header */ #include +#include /* PSDK and NDK Headers */ -#include +#include +#include +#include +#include +#include #include #include -#include +//#include #include -#include +//#include /* Winsock Helper Header */ #include diff --git a/reactos/dll/win32/ws2_32_new/src/addrconv.c b/reactos/dll/win32/ws2_32_new/src/addrconv.c index 021c209293a..4e6d269edfc 100644 --- a/reactos/dll/win32/ws2_32_new/src/addrconv.c +++ b/reactos/dll/win32/ws2_32_new/src/addrconv.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/addrinfo.c b/reactos/dll/win32/ws2_32_new/src/addrinfo.c index 7bc55caf522..69d45261037 100644 --- a/reactos/dll/win32/ws2_32_new/src/addrinfo.c +++ b/reactos/dll/win32/ws2_32_new/src/addrinfo.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/async.c b/reactos/dll/win32/ws2_32_new/src/async.c index eda3cd5c3f6..dff4f40c446 100644 --- a/reactos/dll/win32/ws2_32_new/src/async.c +++ b/reactos/dll/win32/ws2_32_new/src/async.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ BOOLEAN WsAsyncThreadInitialized; diff --git a/reactos/dll/win32/ws2_32_new/src/bhook.c b/reactos/dll/win32/ws2_32_new/src/bhook.c index b6d357a9bea..eeaf740610d 100644 --- a/reactos/dll/win32/ws2_32_new/src/bhook.c +++ b/reactos/dll/win32/ws2_32_new/src/bhook.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/dcatalog.c b/reactos/dll/win32/ws2_32_new/src/dcatalog.c index 2d7d714c875..4722958ddec 100644 --- a/reactos/dll/win32/ws2_32_new/src/dcatalog.c +++ b/reactos/dll/win32/ws2_32_new/src/dcatalog.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dcatitem.c b/reactos/dll/win32/ws2_32_new/src/dcatitem.c index f3324f74aea..eca447016ee 100644 --- a/reactos/dll/win32/ws2_32_new/src/dcatitem.c +++ b/reactos/dll/win32/ws2_32_new/src/dcatitem.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dllmain.c b/reactos/dll/win32/ws2_32_new/src/dllmain.c index 3e20e224c67..369d88f9c0c 100644 --- a/reactos/dll/win32/ws2_32_new/src/dllmain.c +++ b/reactos/dll/win32/ws2_32_new/src/dllmain.c @@ -13,7 +13,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dprocess.c b/reactos/dll/win32/ws2_32_new/src/dprocess.c index 0b7f188b8ac..745db5e8137 100644 --- a/reactos/dll/win32/ws2_32_new/src/dprocess.c +++ b/reactos/dll/win32/ws2_32_new/src/dprocess.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ PWSPROCESS CurrentWsProcess; diff --git a/reactos/dll/win32/ws2_32_new/src/dprovide.c b/reactos/dll/win32/ws2_32_new/src/dprovide.c index 8c09f9b9b7b..ae64aaf59aa 100644 --- a/reactos/dll/win32/ws2_32_new/src/dprovide.c +++ b/reactos/dll/win32/ws2_32_new/src/dprovide.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dsocket.c b/reactos/dll/win32/ws2_32_new/src/dsocket.c index 62c001fbde3..d8418d0257d 100644 --- a/reactos/dll/win32/ws2_32_new/src/dsocket.c +++ b/reactos/dll/win32/ws2_32_new/src/dsocket.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dthread.c b/reactos/dll/win32/ws2_32_new/src/dthread.c index dfec705c92c..62718c0c604 100644 --- a/reactos/dll/win32/ws2_32_new/src/dthread.c +++ b/reactos/dll/win32/ws2_32_new/src/dthread.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/dupsock.c b/reactos/dll/win32/ws2_32_new/src/dupsock.c index 4167c7d4adc..c22f44bec1a 100644 --- a/reactos/dll/win32/ws2_32_new/src/dupsock.c +++ b/reactos/dll/win32/ws2_32_new/src/dupsock.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/enumprot.c b/reactos/dll/win32/ws2_32_new/src/enumprot.c index f8814f907fe..88fffba422f 100644 --- a/reactos/dll/win32/ws2_32_new/src/enumprot.c +++ b/reactos/dll/win32/ws2_32_new/src/enumprot.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/event.c b/reactos/dll/win32/ws2_32_new/src/event.c index d24d5f8f906..6b96bfbe220 100644 --- a/reactos/dll/win32/ws2_32_new/src/event.c +++ b/reactos/dll/win32/ws2_32_new/src/event.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/getproto.c b/reactos/dll/win32/ws2_32_new/src/getproto.c index 3fe8f6b5525..ed21acbd122 100644 --- a/reactos/dll/win32/ws2_32_new/src/getproto.c +++ b/reactos/dll/win32/ws2_32_new/src/getproto.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c index eae2f24345b..dcf9bac73fc 100644 --- a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c +++ b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/ioctl.c b/reactos/dll/win32/ws2_32_new/src/ioctl.c index 09c4bdb63d4..8399feed442 100644 --- a/reactos/dll/win32/ws2_32_new/src/ioctl.c +++ b/reactos/dll/win32/ws2_32_new/src/ioctl.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/nscatalo.c b/reactos/dll/win32/ws2_32_new/src/nscatalo.c index 2511b4110cb..ce82efb530d 100644 --- a/reactos/dll/win32/ws2_32_new/src/nscatalo.c +++ b/reactos/dll/win32/ws2_32_new/src/nscatalo.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nscatent.c b/reactos/dll/win32/ws2_32_new/src/nscatent.c index 0d201a92169..ebb74a18758 100644 --- a/reactos/dll/win32/ws2_32_new/src/nscatent.c +++ b/reactos/dll/win32/ws2_32_new/src/nscatent.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nspinstl.c b/reactos/dll/win32/ws2_32_new/src/nspinstl.c index f3fea466cf4..ef75f7c4316 100644 --- a/reactos/dll/win32/ws2_32_new/src/nspinstl.c +++ b/reactos/dll/win32/ws2_32_new/src/nspinstl.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/nsprovid.c b/reactos/dll/win32/ws2_32_new/src/nsprovid.c index 5b1196d2493..2d5ef48a32d 100644 --- a/reactos/dll/win32/ws2_32_new/src/nsprovid.c +++ b/reactos/dll/win32/ws2_32_new/src/nsprovid.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/nsquery.c b/reactos/dll/win32/ws2_32_new/src/nsquery.c index 7b3c7814c05..788fa29e4b6 100644 --- a/reactos/dll/win32/ws2_32_new/src/nsquery.c +++ b/reactos/dll/win32/ws2_32_new/src/nsquery.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/src/qos.c b/reactos/dll/win32/ws2_32_new/src/qos.c index a20b75ae649..24a28f53304 100644 --- a/reactos/dll/win32/ws2_32_new/src/qos.c +++ b/reactos/dll/win32/ws2_32_new/src/qos.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/qshelpr.c b/reactos/dll/win32/ws2_32_new/src/qshelpr.c index 66072745556..07292c7ce70 100644 --- a/reactos/dll/win32/ws2_32_new/src/qshelpr.c +++ b/reactos/dll/win32/ws2_32_new/src/qshelpr.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/rasdial.c b/reactos/dll/win32/ws2_32_new/src/rasdial.c index f1f620a6224..c856e6f6f3f 100644 --- a/reactos/dll/win32/ws2_32_new/src/rasdial.c +++ b/reactos/dll/win32/ws2_32_new/src/rasdial.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/recv.c b/reactos/dll/win32/ws2_32_new/src/recv.c index 6c887c997b5..9c4467b3dfb 100644 --- a/reactos/dll/win32/ws2_32_new/src/recv.c +++ b/reactos/dll/win32/ws2_32_new/src/recv.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/rnr.c b/reactos/dll/win32/ws2_32_new/src/rnr.c index 83f46e29f34..9a8c081fe6c 100644 --- a/reactos/dll/win32/ws2_32_new/src/rnr.c +++ b/reactos/dll/win32/ws2_32_new/src/rnr.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/scihlpr.c b/reactos/dll/win32/ws2_32_new/src/scihlpr.c index c7f7bde9b47..f16f1108726 100644 --- a/reactos/dll/win32/ws2_32_new/src/scihlpr.c +++ b/reactos/dll/win32/ws2_32_new/src/scihlpr.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/select.c b/reactos/dll/win32/ws2_32_new/src/select.c index 05aab6c2118..54c8128994c 100644 --- a/reactos/dll/win32/ws2_32_new/src/select.c +++ b/reactos/dll/win32/ws2_32_new/src/select.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/send.c b/reactos/dll/win32/ws2_32_new/src/send.c index 820192552e2..f4a32c79776 100644 --- a/reactos/dll/win32/ws2_32_new/src/send.c +++ b/reactos/dll/win32/ws2_32_new/src/send.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/sockctrl.c b/reactos/dll/win32/ws2_32_new/src/sockctrl.c index 0b582826ec4..76441a9bd8d 100644 --- a/reactos/dll/win32/ws2_32_new/src/sockctrl.c +++ b/reactos/dll/win32/ws2_32_new/src/sockctrl.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/socklife.c b/reactos/dll/win32/ws2_32_new/src/socklife.c index a0385e4a38c..c393a6cd661 100644 --- a/reactos/dll/win32/ws2_32_new/src/socklife.c +++ b/reactos/dll/win32/ws2_32_new/src/socklife.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/spinstal.c b/reactos/dll/win32/ws2_32_new/src/spinstal.c index 53a803106fa..d0cfb6d2d55 100644 --- a/reactos/dll/win32/ws2_32_new/src/spinstal.c +++ b/reactos/dll/win32/ws2_32_new/src/spinstal.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/sputil.c b/reactos/dll/win32/ws2_32_new/src/sputil.c index 80277c33fe3..7f840183234 100644 --- a/reactos/dll/win32/ws2_32_new/src/sputil.c +++ b/reactos/dll/win32/ws2_32_new/src/sputil.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/startup.c b/reactos/dll/win32/ws2_32_new/src/startup.c index 58a764f1b67..5aa72f769f3 100644 --- a/reactos/dll/win32/ws2_32_new/src/startup.c +++ b/reactos/dll/win32/ws2_32_new/src/startup.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/src/wsautil.c b/reactos/dll/win32/ws2_32_new/src/wsautil.c index d3304e4b75b..e2d14c0be0d 100644 --- a/reactos/dll/win32/ws2_32_new/src/wsautil.c +++ b/reactos/dll/win32/ws2_32_new/src/wsautil.c @@ -7,7 +7,7 @@ */ /* INCLUDES ******************************************************************/ -#include "ws2_32.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rc b/reactos/dll/win32/ws2_32_new/ws2_32.rc index 20f8c9b12a2..9696f2fc07c 100644 --- a/reactos/dll/win32/ws2_32_new/ws2_32.rc +++ b/reactos/dll/win32/ws2_32_new/ws2_32.rc @@ -1,5 +1,3 @@ -/* $Id: ws2_32.rc 23580 2006-08-14 17:26:36Z gedmurphy $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 DLL\0" #define REACTOS_STR_INTERNAL_NAME "ws2_32\0" diff --git a/reactos/dll/win32/ws2help/precomp.h b/reactos/dll/win32/ws2help/precomp.h index 85fdef32407..d1b8d3a9e59 100644 --- a/reactos/dll/win32/ws2help/precomp.h +++ b/reactos/dll/win32/ws2help/precomp.h @@ -9,9 +9,17 @@ /* Winsock Provider Headers */ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define _WIN32_WINNT 0x502 #define NTOS_MODE_USER #define INCL_WINSOCK_API_TYPEDEFS 1 + +#include +#include +#include +#include +#include #include /* NDK Headers */ diff --git a/reactos/dll/win32/ws2help/ws2help.rc b/reactos/dll/win32/ws2help/ws2help.rc index 0ee73c0880f..199d43ad2eb 100644 --- a/reactos/dll/win32/ws2help/ws2help.rc +++ b/reactos/dll/win32/ws2help/ws2help.rc @@ -1,5 +1,3 @@ -/* $Id: ws2help.rc 12852 2005-01-06 13:58:04Z mf $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 Helper API\0" #define REACTOS_STR_INTERNAL_NAME "ws2help\0" diff --git a/reactos/dll/win32/wshirda/wshirda.c b/reactos/dll/win32/wshirda/wshirda.c index eee977e8835..e12d6745f4d 100644 --- a/reactos/dll/win32/wshirda/wshirda.c +++ b/reactos/dll/win32/wshirda/wshirda.c @@ -8,8 +8,7 @@ * RDD 18/06-2002 Created */ #include "wshirda.h" - -#include +#include "debug.h" #if DBG diff --git a/reactos/dll/win32/wshirda/wshirda.h b/reactos/dll/win32/wshirda/wshirda.h index 0402cf7144a..4aa4c506b86 100644 --- a/reactos/dll/win32/wshirda/wshirda.h +++ b/reactos/dll/win32/wshirda/wshirda.h @@ -7,8 +7,13 @@ #ifndef __WSHIRDA_H #define __WSHIRDA_H +#include + #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include #define NTOS_MODE_USER #include diff --git a/reactos/dll/win32/wshirda/wshirda.rc b/reactos/dll/win32/wshirda/wshirda.rc index 85e8c3c9967..fa57623a76a 100644 --- a/reactos/dll/win32/wshirda/wshirda.rc +++ b/reactos/dll/win32/wshirda/wshirda.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 IRDA Helper API\0" #define REACTOS_STR_INTERNAL_NAME "wshirda\0" diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.c b/reactos/dll/win32/wshtcpip/wshtcpip.c index 4c295cc2d2e..546dec171d1 100644 --- a/reactos/dll/win32/wshtcpip/wshtcpip.c +++ b/reactos/dll/win32/wshtcpip/wshtcpip.c @@ -7,7 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ -#include +#include "wshtcpip.h" #define NDEBUG #include diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.h b/reactos/dll/win32/wshtcpip/wshtcpip.h index f96a0eccc60..c25d8d244ff 100644 --- a/reactos/dll/win32/wshtcpip/wshtcpip.h +++ b/reactos/dll/win32/wshtcpip/wshtcpip.h @@ -8,6 +8,13 @@ #define __WSHTCPIP_H #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include + +#include +#include #include #include #include diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rc b/reactos/dll/win32/wshtcpip/wshtcpip.rc index c8ccea72952..2153ac2b4ef 100644 --- a/reactos/dll/win32/wshtcpip/wshtcpip.rc +++ b/reactos/dll/win32/wshtcpip/wshtcpip.rc @@ -1,5 +1,3 @@ -/* $Id: wshtcpip.rc 21805 2006-05-05 15:40:59Z fireball $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 API\0" #define REACTOS_STR_INTERNAL_NAME "wshtcpip\0" diff --git a/reactos/dll/win32/wsock32/stubs.c b/reactos/dll/win32/wsock32/stubs.c index 2c28efe76e0..9bedf5183e2 100644 --- a/reactos/dll/win32/wsock32/stubs.c +++ b/reactos/dll/win32/wsock32/stubs.c @@ -7,10 +7,8 @@ * PROGRAMMERS: Ge van Geldorp (ge@gse.nl) * REVISIONS: */ -#include -#include -//#include +#include /* * @unimplemented diff --git a/reactos/dll/win32/wsock32/wsock32.rc b/reactos/dll/win32/wsock32/wsock32.rc index 58fa826e282..5276dcf2cf0 100644 --- a/reactos/dll/win32/wsock32/wsock32.rc +++ b/reactos/dll/win32/wsock32/wsock32.rc @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 DLL\0" #define REACTOS_STR_INTERNAL_NAME "wsock32\0" diff --git a/reactos/dll/win32/wtsapi32/wtsapi32.c b/reactos/dll/win32/wtsapi32/wtsapi32.c index 875cfb5186a..642e9ae36a6 100644 --- a/reactos/dll/win32/wtsapi32/wtsapi32.c +++ b/reactos/dll/win32/wtsapi32/wtsapi32.c @@ -15,13 +15,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include -#include "windef.h" -#include "winbase.h" -#include "wtsapi32.h" -#include "wine/debug.h" +//#include +#include +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); diff --git a/reactos/dll/win32/wuapi/downloader.c b/reactos/dll/win32/wuapi/downloader.c index 6bed32ee660..3bd6cc2d937 100644 --- a/reactos/dll/win32/wuapi/downloader.c +++ b/reactos/dll/win32/wuapi/downloader.c @@ -18,19 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "initguid.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +//#include "initguid.h" +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/installer.c b/reactos/dll/win32/wuapi/installer.c index f60d6181fcc..d3a8e846bb9 100644 --- a/reactos/dll/win32/wuapi/installer.c +++ b/reactos/dll/win32/wuapi/installer.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/main.c b/reactos/dll/win32/wuapi/main.c index 80daca0c110..b0cbca8ff14 100644 --- a/reactos/dll/win32/wuapi/main.c +++ b/reactos/dll/win32/wuapi/main.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "rpcproxy.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +//#include "ole2.h" +#include +#include +#include -#include "wine/debug.h" +#include #include "wuapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/searcher.c b/reactos/dll/win32/wuapi/searcher.c index 522f99abf08..95caf7aab3e 100644 --- a/reactos/dll/win32/wuapi/searcher.c +++ b/reactos/dll/win32/wuapi/searcher.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/session.c b/reactos/dll/win32/wuapi/session.c index a6abbc6b072..8c4b93074ac 100644 --- a/reactos/dll/win32/wuapi/session.c +++ b/reactos/dll/win32/wuapi/session.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include #include "wuapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/systeminfo.c b/reactos/dll/win32/wuapi/systeminfo.c index f3f635fabf7..b70799a7cbb 100644 --- a/reactos/dll/win32/wuapi/systeminfo.c +++ b/reactos/dll/win32/wuapi/systeminfo.c @@ -19,18 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/wuapi/updates.c b/reactos/dll/win32/wuapi/updates.c index d099fb4bef3..a4ddcde955a 100644 --- a/reactos/dll/win32/wuapi/updates.c +++ b/reactos/dll/win32/wuapi/updates.c @@ -18,18 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS + #define COBJMACROS -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "wuapi.h" +#include +#include +//#include "winuser.h" +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(wuapi); diff --git a/reactos/dll/win32/xinput1_1/xinput1_1_main.c b/reactos/dll/win32/xinput1_1/xinput1_1_main.c index 18cde9e6652..f2b7fa4b0f2 100644 --- a/reactos/dll/win32/xinput1_1/xinput1_1_main.c +++ b/reactos/dll/win32/xinput1_1/xinput1_1_main.c @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" +#include +#include BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { diff --git a/reactos/dll/win32/xinput1_2/xinput1_2_main.c b/reactos/dll/win32/xinput1_2/xinput1_2_main.c index 18cde9e6652..f2b7fa4b0f2 100644 --- a/reactos/dll/win32/xinput1_2/xinput1_2_main.c +++ b/reactos/dll/win32/xinput1_2/xinput1_2_main.c @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" +#include +#include BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { diff --git a/reactos/dll/win32/xinput1_3/xinput1_3_main.c b/reactos/dll/win32/xinput1_3/xinput1_3_main.c index 2b3a5f737d6..787830ddfe9 100644 --- a/reactos/dll/win32/xinput1_3/xinput1_3_main.c +++ b/reactos/dll/win32/xinput1_3/xinput1_3_main.c @@ -17,17 +17,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include -#include -#include +#include +//#include +//#include +//#include -#include "wine/debug.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include +//#include "windef.h" +#include +//#include "winerror.h" -#include "xinput.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(xinput); diff --git a/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c b/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c index 18cde9e6652..f2b7fa4b0f2 100644 --- a/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c +++ b/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" +#include +#include BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { diff --git a/reactos/dll/win32/xmllite/reader.c b/reactos/dll/win32/xmllite/reader.c index 8ec2eae4331..4a13ea34acf 100644 --- a/reactos/dll/win32/xmllite/reader.c +++ b/reactos/dll/win32/xmllite/reader.c @@ -18,19 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "initguid.h" -#include "objbase.h" -#include "xmllite.h" +#include +#include +#include +#include +#include #include "xmllite_private.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(xmllite); diff --git a/reactos/dll/win32/xmllite/writer.c b/reactos/dll/win32/xmllite/writer.c index f60e0d965ab..789472f7f20 100644 --- a/reactos/dll/win32/xmllite/writer.c +++ b/reactos/dll/win32/xmllite/writer.c @@ -17,15 +17,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "xmllite.h" +#include +#include +#include +#include -#include "wine/debug.h" +#include WINE_DEFAULT_DEBUG_CHANNEL(xmllite); diff --git a/reactos/dll/win32/xmllite/xmllite_main.c b/reactos/dll/win32/xmllite/xmllite_main.c index d72903ab3b6..989d3616db5 100644 --- a/reactos/dll/win32/xmllite/xmllite_main.c +++ b/reactos/dll/win32/xmllite/xmllite_main.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include #include -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" +#include +#include +#include WINE_DEFAULT_DEBUG_CHANNEL(xmllite); diff --git a/reactos/include/GL/gl.h b/reactos/include/GL/gl.h index e65e1bc8a8f..1d0d7c38c64 100644 --- a/reactos/include/GL/gl.h +++ b/reactos/include/GL/gl.h @@ -88,7 +88,8 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif -#include +//#include +#include #endif #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED diff --git a/reactos/include/psdk/mmreg.h b/reactos/include/psdk/mmreg.h index a19c5963ef2..fef38c3f0ee 100644 --- a/reactos/include/psdk/mmreg.h +++ b/reactos/include/psdk/mmreg.h @@ -22,7 +22,7 @@ #define __WINE_MMREG_H #ifndef RC_INVOKED -#include "pshpack1.h" +#include #endif @@ -518,7 +518,7 @@ typedef struct tagEXBMINFOHEADER { #endif #ifndef RC_INVOKED -#include "poppack.h" +#include #endif #endif /* __WINE_MMREG_H */ diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h index 3c751f41d8b..3f0996e8714 100644 --- a/reactos/include/psdk/mmsystem.h +++ b/reactos/include/psdk/mmsystem.h @@ -31,7 +31,9 @@ extern "C" { #define TIME_SMPTE 8 #define TIME_MIDI 16 #define TIME_TICKS 32 +#ifndef MAKEFOURCC #define MAKEFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24)) +#endif #ifndef mmioFOURCC #define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3) #endif diff --git a/reactos/include/reactos/libs/audiosrv/audiosrv.h b/reactos/include/reactos/libs/audiosrv/audiosrv.h index ccaab5b0f23..057ce3e4300 100644 --- a/reactos/include/reactos/libs/audiosrv/audiosrv.h +++ b/reactos/include/reactos/libs/audiosrv/audiosrv.h @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2007 Andrew Greenwood */ -#include +#include #ifndef AUDIOSRV_H #define AUDIOSRV_H diff --git a/reactos/include/reactos/libs/libtiff/tiffio.h b/reactos/include/reactos/libs/libtiff/tiffio.h index 3298a7afe34..71bd4f87702 100644 --- a/reactos/include/reactos/libs/libtiff/tiffio.h +++ b/reactos/include/reactos/libs/libtiff/tiffio.h @@ -121,7 +121,9 @@ typedef uint32 toff_t; /* file offset */ #if defined(USE_WIN32_FILEIO) # define VC_EXTRALEAN -# include +//# include +# define WIN32_NO_STATUS +# include # ifdef __WIN32__ DECLARE_HANDLE(thandle_t); /* Win32 file handle */ # else diff --git a/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h b/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h index 9eed3603a0b..d3cba4019a3 100644 --- a/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h +++ b/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h @@ -74,8 +74,15 @@ extern "C" #include #include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #include -#include +//#include #include #include #include diff --git a/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp b/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp index d77e4e6ba81..aa594f8f52d 100644 --- a/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp +++ b/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp @@ -4,7 +4,15 @@ // Freeware // Copyright J Brown 2001 // -#include + +//#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include + #include "globals.h" #include "cardcolor.h" diff --git a/reactos/lib/3rdparty/cardlib/cardbutton.cpp b/reactos/lib/3rdparty/cardlib/cardbutton.cpp index 1722624f59c..921d59cdebd 100644 --- a/reactos/lib/3rdparty/cardlib/cardbutton.cpp +++ b/reactos/lib/3rdparty/cardlib/cardbutton.cpp @@ -4,12 +4,15 @@ // Freeware // Copyright J Brown 2001 // -#include -#include +//#include +//#include + +#define WIN32_NO_STATUS +#include #include "cardlib.h" -#include "cardwindow.h" -#include "cardbutton.h" +//#include "cardwindow.h" +//#include "cardbutton.h" #include "cardcolor.h" HPALETTE UseNicePalette(HDC, HPALETTE); diff --git a/reactos/lib/3rdparty/cardlib/cardbutton.h b/reactos/lib/3rdparty/cardlib/cardbutton.h index 12515c44d88..541ca09da6b 100644 --- a/reactos/lib/3rdparty/cardlib/cardbutton.h +++ b/reactos/lib/3rdparty/cardlib/cardbutton.h @@ -3,7 +3,7 @@ #define MAXBUTTONTEXT 64 -#include "cardlib.h" +//#include "cardlib.h" class CardButton { diff --git a/reactos/lib/3rdparty/cardlib/cardcolor.cpp b/reactos/lib/3rdparty/cardlib/cardcolor.cpp index 86006c56011..eb76c42a3bb 100644 --- a/reactos/lib/3rdparty/cardlib/cardcolor.cpp +++ b/reactos/lib/3rdparty/cardlib/cardcolor.cpp @@ -1,7 +1,11 @@ // // Colour support // -#include +//#include + +#define WIN32_NO_STATUS +#include +#include #define MakeRGB RGB diff --git a/reactos/lib/3rdparty/cardlib/cardcount.h b/reactos/lib/3rdparty/cardlib/cardcount.h index c16fa1ce5ce..17135195132 100644 --- a/reactos/lib/3rdparty/cardlib/cardcount.h +++ b/reactos/lib/3rdparty/cardlib/cardcount.h @@ -1,7 +1,15 @@ #ifndef _CARDCOUNT_INCLUDED #define _CARDCOUNT_INCLUDED -#include +//#include + +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include #include "cardstack.h" diff --git a/reactos/lib/3rdparty/cardlib/cardlib.cpp b/reactos/lib/3rdparty/cardlib/cardlib.cpp index 4c6ef1c0a4f..ff2666e153f 100644 --- a/reactos/lib/3rdparty/cardlib/cardlib.cpp +++ b/reactos/lib/3rdparty/cardlib/cardlib.cpp @@ -4,9 +4,13 @@ // Freeware // Copyright J Brown 2001 // -#include +//#include + +#define WIN32_NO_STATUS +#include + #include "cardlib.h" -#include "globals.h" +//#include "globals.h" void LoadCardBitmaps(void); diff --git a/reactos/lib/3rdparty/cardlib/cardlib.h b/reactos/lib/3rdparty/cardlib/cardlib.h index e2d4fb91ea1..befd27d2566 100644 --- a/reactos/lib/3rdparty/cardlib/cardlib.h +++ b/reactos/lib/3rdparty/cardlib/cardlib.h @@ -85,9 +85,9 @@ typedef int (CARDLIBPROC *pDropZoneProc) (int dzid, const CardStack &cards); typedef void (CARDLIBPROC *pButtonProc) (CardButton &pButton); -#include "card.h" +//#include "card.h" #include "cardbutton.h" -#include "cardstack.h" +//#include "cardstack.h" #include "cardregion.h" #include "cardcount.h" #include "cardwindow.h" diff --git a/reactos/lib/3rdparty/cardlib/cardregion.cpp b/reactos/lib/3rdparty/cardlib/cardregion.cpp index c47b6cf5e08..e382a829583 100644 --- a/reactos/lib/3rdparty/cardlib/cardregion.cpp +++ b/reactos/lib/3rdparty/cardlib/cardregion.cpp @@ -4,12 +4,15 @@ // Freeware // Copyright J Brown 2001 // -#include +//#include + +#define WIN32_NO_STATUS +#include #include "cardlib.h" -#include "cardregion.h" -#include "cardwindow.h" -#include "cardcolor.h" +//#include "cardregion.h" +//#include "cardwindow.h" +//#include "cardcolor.h" HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height); diff --git a/reactos/lib/3rdparty/cardlib/cardregion.h b/reactos/lib/3rdparty/cardlib/cardregion.h index e81999764f4..3b831e6c680 100644 --- a/reactos/lib/3rdparty/cardlib/cardregion.h +++ b/reactos/lib/3rdparty/cardlib/cardregion.h @@ -3,7 +3,7 @@ #include "globals.h" #include "cardstack.h" -#include "cardlib.h" +//#include "cardlib.h" class CardWindow; diff --git a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp index 84b748332be..a97d70da04e 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp @@ -4,11 +4,15 @@ // Freeware // Copyright J Brown 2001 // -#include -#include +//#include + +#define WIN32_NO_STATUS +#include + +//#include #include "cardlib.h" -#include "cardregion.h" -#include "cardcolor.h" +//#include "cardregion.h" +//#include "cardcolor.h" HPALETTE UseNicePalette(HDC hdc, HPALETTE hPalette); void PaintRect(HDC hdc, RECT *rect, COLORREF colour); diff --git a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp index b8da01b33b1..3829b03852b 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp @@ -4,13 +4,17 @@ // Freeware // Copyright J Brown 2001 // -#include +//#include + +#define WIN32_NO_STATUS +#include + #include -#include +//#include #include "cardlib.h" -#include "cardwindow.h" -#include "cardregion.h" +//#include "cardwindow.h" +//#include "cardregion.h" #if 1 #define TRACE(s) diff --git a/reactos/lib/3rdparty/cardlib/cardstack.cpp b/reactos/lib/3rdparty/cardlib/cardstack.cpp index b3971e267dc..41d27abbb3c 100644 --- a/reactos/lib/3rdparty/cardlib/cardstack.cpp +++ b/reactos/lib/3rdparty/cardlib/cardstack.cpp @@ -4,7 +4,11 @@ // Freeware // Copyright J Brown 2001 // -#include +//#include + +#define WIN32_NO_STATUS +#include + #include #include "cardstack.h" diff --git a/reactos/lib/3rdparty/cardlib/cardwindow.cpp b/reactos/lib/3rdparty/cardlib/cardwindow.cpp index 5dfb52fc020..e759901aad0 100644 --- a/reactos/lib/3rdparty/cardlib/cardwindow.cpp +++ b/reactos/lib/3rdparty/cardlib/cardwindow.cpp @@ -4,15 +4,19 @@ // Freeware // Copyright J Brown 2001 // -#include -#include -#include +//#include -#include "globals.h" +#define WIN32_NO_STATUS +#include + +#include +//#include + +//#include "globals.h" #include "cardlib.h" -#include "cardbutton.h" -#include "cardregion.h" -#include "cardwindow.h" +//#include "cardbutton.h" +//#include "cardregion.h" +//#include "cardwindow.h" #include "cardcolor.h" extern HPALETTE __holdplacepal; diff --git a/reactos/lib/3rdparty/cardlib/cardwindow.h b/reactos/lib/3rdparty/cardlib/cardwindow.h index ed3fccb2f4c..195422e4c51 100644 --- a/reactos/lib/3rdparty/cardlib/cardwindow.h +++ b/reactos/lib/3rdparty/cardlib/cardwindow.h @@ -6,7 +6,7 @@ #define MAXDROPZONES 8 #include "dropzone.h" -#include "cardlib.h" +//#include "cardlib.h" class CardRegion; class CardButton; diff --git a/reactos/lib/3rdparty/cardlib/dropzone.cpp b/reactos/lib/3rdparty/cardlib/dropzone.cpp index 0db5d3f85b0..092c20179f9 100644 --- a/reactos/lib/3rdparty/cardlib/dropzone.cpp +++ b/reactos/lib/3rdparty/cardlib/dropzone.cpp @@ -4,11 +4,14 @@ // Freeware // Copyright J Brown 2001 // -#include +//#include + +#define WIN32_NO_STATUS +#include #include "cardlib.h" -#include "cardwindow.h" -#include "dropzone.h" +//#include "cardwindow.h" +//#include "dropzone.h" bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc) { diff --git a/reactos/lib/3rdparty/libxml2/config.h b/reactos/lib/3rdparty/libxml2/config.h index 8599007f9dd..7004a650bdb 100644 --- a/reactos/lib/3rdparty/libxml2/config.h +++ b/reactos/lib/3rdparty/libxml2/config.h @@ -306,7 +306,13 @@ #define GetModuleHandleA GetModuleHandleA_ #endif #if defined(__MINGW32__) -#include +//#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #endif #if defined(_MSC_VER) #undef GetModuleHandleA diff --git a/reactos/lib/3rdparty/libxml2/nanohttp.c b/reactos/lib/3rdparty/libxml2/nanohttp.c index f6694575328..58db2427474 100644 --- a/reactos/lib/3rdparty/libxml2/nanohttp.c +++ b/reactos/lib/3rdparty/libxml2/nanohttp.c @@ -78,9 +78,9 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) -#ifndef _WINSOCKAPI_ +/*#ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ -#endif +#endif*/ #include #include #undef XML_SOCKLEN_T diff --git a/reactos/lib/3rdparty/libxml2/threads.c b/reactos/lib/3rdparty/libxml2/threads.c index 1eeac0e1765..4c5c58649a5 100644 --- a/reactos/lib/3rdparty/libxml2/threads.c +++ b/reactos/lib/3rdparty/libxml2/threads.c @@ -27,7 +27,7 @@ #ifdef HAVE_PTHREAD_H #include #elif defined HAVE_WIN32_THREADS -#include +//#include #ifndef HAVE_COMPILER_TLS #include #endif diff --git a/reactos/lib/3rdparty/libxml2/xmlIO.c b/reactos/lib/3rdparty/libxml2/xmlIO.c index 8fc00e3c392..0ac4875763b 100644 --- a/reactos/lib/3rdparty/libxml2/xmlIO.c +++ b/reactos/lib/3rdparty/libxml2/xmlIO.c @@ -37,7 +37,8 @@ #endif #if defined(WIN32) || defined(_WIN32) -#include +//#include +#include #endif #if defined(_WIN32_WCE) diff --git a/reactos/lib/3rdparty/libxml2/xmlmodule.c b/reactos/lib/3rdparty/libxml2/xmlmodule.c index 9ffd610caea..577c49bcd1c 100644 --- a/reactos/lib/3rdparty/libxml2/xmlmodule.c +++ b/reactos/lib/3rdparty/libxml2/xmlmodule.c @@ -290,7 +290,7 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol) #ifdef _WIN32 -#include +//#include /* * xmlModulePlatformOpen: diff --git a/reactos/lib/atl/atlbase.cpp b/reactos/lib/atl/atlbase.cpp index 54c73b70d94..bac93d93d81 100644 --- a/reactos/lib/atl/atlbase.cpp +++ b/reactos/lib/atl/atlbase.cpp @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include -#include #include "atlbase.h" namespace ATL diff --git a/reactos/lib/atl/atlcore.cpp b/reactos/lib/atl/atlcore.cpp index 58f840bc35e..1b3c73de590 100644 --- a/reactos/lib/atl/atlcore.cpp +++ b/reactos/lib/atl/atlcore.cpp @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include #include "atlcore.h" namespace ATL diff --git a/reactos/lib/atl/atlcore.h b/reactos/lib/atl/atlcore.h index 935b31ed72c..895863cd045 100644 --- a/reactos/lib/atl/atlcore.h +++ b/reactos/lib/atl/atlcore.h @@ -21,9 +21,17 @@ #pragma once #include -#include -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include #include #ifndef ATLASSERT diff --git a/reactos/lib/epsapi/enum/precomp.h b/reactos/lib/epsapi/enum/precomp.h index 3d029daf987..b469265ff5d 100644 --- a/reactos/lib/epsapi/enum/precomp.h +++ b/reactos/lib/epsapi/enum/precomp.h @@ -1,5 +1,3 @@ -#define WIN32_NO_STATUS -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.h b/reactos/lib/fslib/ext2lib/Mke2fs.h index 31dacea7638..71dccefdaec 100644 --- a/reactos/lib/fslib/ext2lib/Mke2fs.h +++ b/reactos/lib/fslib/ext2lib/Mke2fs.h @@ -7,8 +7,6 @@ /* INCLUDES **************************************************************/ -#define WIN32_NO_STATUS -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/fslib/ntfslib/ntfslib.h b/reactos/lib/fslib/ntfslib/ntfslib.h index cf6713e6558..200dfeeba6b 100644 --- a/reactos/lib/fslib/ntfslib/ntfslib.h +++ b/reactos/lib/fslib/ntfslib/ntfslib.h @@ -3,8 +3,6 @@ * PROJECT: ReactOS NTFS FS library * FILE: lib/fslib/ntfslib/ntfslib.h */ -#define WIN32_NO_STATUS -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/fslib/vfatlib/vfatlib.h b/reactos/lib/fslib/vfatlib/vfatlib.h index c8fcdfec656..f5f3dbeb50d 100644 --- a/reactos/lib/fslib/vfatlib/vfatlib.h +++ b/reactos/lib/fslib/vfatlib/vfatlib.h @@ -7,7 +7,11 @@ #include #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h index ce3a62e271d..58ae278492f 100644 --- a/reactos/lib/fslib/vfatxlib/vfatxlib.h +++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h @@ -3,8 +3,6 @@ * PROJECT: ReactOS VFAT filesystem library * FILE: vfatxlib.h */ -#define WIN32_NO_STATUS -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/inflib/builddep.h b/reactos/lib/inflib/builddep.h index f00bdda03a0..28386492a09 100644 --- a/reactos/lib/inflib/builddep.h +++ b/reactos/lib/inflib/builddep.h @@ -58,8 +58,10 @@ BOOLEAN NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf ); #define UNICODE #define _UNICODE +#include #define WIN32_NO_STATUS -#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/recyclebin/recyclebin.h b/reactos/lib/recyclebin/recyclebin.h index b822f1d3ceb..fecd2119246 100644 --- a/reactos/lib/recyclebin/recyclebin.h +++ b/reactos/lib/recyclebin/recyclebin.h @@ -4,7 +4,15 @@ extern "C" { #endif -#include +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#include +#include +#include +#include +#include #include #define ANY_SIZE 1 diff --git a/reactos/lib/rossym/init.c b/reactos/lib/rossym/init.c index 80be79a1ee0..d77f63f9849 100644 --- a/reactos/lib/rossym/init.c +++ b/reactos/lib/rossym/init.c @@ -7,7 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#include +#include #include #include "rossympriv.h" diff --git a/reactos/lib/rossym/initum.c b/reactos/lib/rossym/initum.c index c00a13a1e09..a26a42adcc6 100644 --- a/reactos/lib/rossym/initum.c +++ b/reactos/lib/rossym/initum.c @@ -7,7 +7,9 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#include +#include +#include +#include #include #include "rossympriv.h" diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h index 15a6ba843aa..649eaa06b51 100644 --- a/reactos/lib/rtl/rtl.h +++ b/reactos/lib/rtl/rtl.h @@ -12,7 +12,6 @@ #define RTL_H /* We're a core NT DLL, we don't import syscalls */ -#define WIN32_NO_STATUS #define _INC_SWPRINTF_INL_ #undef __MSVCRT__ @@ -21,7 +20,13 @@ #include /* PSDK/NDK Headers */ -#include +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include #include #include #include diff --git a/reactos/lib/sdk/crt/except/i386/unwind.c b/reactos/lib/sdk/crt/except/i386/unwind.c index bb2c302a3b6..cda791cc989 100644 --- a/reactos/lib/sdk/crt/except/i386/unwind.c +++ b/reactos/lib/sdk/crt/except/i386/unwind.c @@ -1,6 +1,5 @@ #define WIN32_NO_STATUS #include -#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h b/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h index 5d5f936a3c5..df3d76c4e3c 100644 --- a/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h +++ b/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h @@ -13,8 +13,10 @@ extern "C" { #endif +#include #include -#include +#include +#include #ifdef __REACTOS__ #include "malloc.h" diff --git a/reactos/lib/sdk/crt/include/internal/mingw-w64/oscalls.h b/reactos/lib/sdk/crt/include/internal/mingw-w64/oscalls.h index 81356767001..a4f8817d2c1 100644 --- a/reactos/lib/sdk/crt/include/internal/mingw-w64/oscalls.h +++ b/reactos/lib/sdk/crt/include/internal/mingw-w64/oscalls.h @@ -20,7 +20,11 @@ #define NOMINMAX #define _WIN32_FUSION 0x0100 -#include +//#include +#include +#include +#include +#include #ifndef NULL #ifdef __cplusplus diff --git a/reactos/lib/sdk/crt/precomp.h b/reactos/lib/sdk/crt/precomp.h index ec7a2527b86..e97944f5e66 100644 --- a/reactos/lib/sdk/crt/precomp.h +++ b/reactos/lib/sdk/crt/precomp.h @@ -30,7 +30,10 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include +#include +#include +#include +#include #include #if !defined(_MSC_VER) diff --git a/reactos/lib/sdk/crt/startup/atonexit.c b/reactos/lib/sdk/crt/startup/atonexit.c index 442be353d88..73eed2fd80a 100644 --- a/reactos/lib/sdk/crt/startup/atonexit.c +++ b/reactos/lib/sdk/crt/startup/atonexit.c @@ -14,7 +14,7 @@ #include #include #include -#include +//#include #define _EXIT_LOCK1 8 diff --git a/reactos/lib/sdk/crt/startup/crt0_c.c b/reactos/lib/sdk/crt/startup/crt0_c.c index 165eee10825..eed3c28764d 100644 --- a/reactos/lib/sdk/crt/startup/crt0_c.c +++ b/reactos/lib/sdk/crt/startup/crt0_c.c @@ -4,7 +4,9 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include +#include +#include +#include extern HINSTANCE __mingw_winmain_hInstance; extern LPSTR __mingw_winmain_lpCmdLine; diff --git a/reactos/lib/sdk/crt/startup/crt0_w.c b/reactos/lib/sdk/crt/startup/crt0_w.c index 9f46e38a9cb..8ee7ea79bbf 100644 --- a/reactos/lib/sdk/crt/startup/crt0_w.c +++ b/reactos/lib/sdk/crt/startup/crt0_w.c @@ -3,7 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include +#include +#include /* Do the UNICODE prototyping of WinMain. Be aware that in winbase.h WinMain is a macro defined to wWinMain. */ diff --git a/reactos/lib/sdk/crt/startup/crt_handler.c b/reactos/lib/sdk/crt/startup/crt_handler.c index 5d7dc22bebd..84172172781 100644 --- a/reactos/lib/sdk/crt/startup/crt_handler.c +++ b/reactos/lib/sdk/crt/startup/crt_handler.c @@ -4,7 +4,6 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include #include #include #include @@ -13,6 +12,9 @@ #include #include +#include +#include + #if defined (_WIN64) && defined (__ia64__) #error FIXME: Unsupported __ImageBase implementation. #else diff --git a/reactos/lib/sdk/crt/startup/crtdll.c b/reactos/lib/sdk/crt/startup/crtdll.c index ed3a73fd51d..f046705135f 100644 --- a/reactos/lib/sdk/crt/startup/crtdll.c +++ b/reactos/lib/sdk/crt/startup/crtdll.c @@ -13,7 +13,7 @@ #include #include #include -#include +//#include #define _DECL_DLLMAIN #include #include diff --git a/reactos/lib/sdk/crt/startup/gccmain.c b/reactos/lib/sdk/crt/startup/gccmain.c index a0e0483ff72..a1cd04b026e 100644 --- a/reactos/lib/sdk/crt/startup/gccmain.c +++ b/reactos/lib/sdk/crt/startup/gccmain.c @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include +//#include #include #include diff --git a/reactos/lib/sdk/crt/startup/gs_support.c b/reactos/lib/sdk/crt/startup/gs_support.c index 17d95420760..1882930d2f8 100644 --- a/reactos/lib/sdk/crt/startup/gs_support.c +++ b/reactos/lib/sdk/crt/startup/gs_support.c @@ -9,7 +9,10 @@ #endif #define WIN32_NO_STATUS #include /* abort () */ -#include +//#include +#include +#include +#include #undef WIN32_NO_STATUS #include /* STATUS macros */ #ifdef _WIN64 diff --git a/reactos/lib/sdk/crt/startup/pesect.c b/reactos/lib/sdk/crt/startup/pesect.c index 8f49e6b0e67..3d1582bbe8f 100644 --- a/reactos/lib/sdk/crt/startup/pesect.c +++ b/reactos/lib/sdk/crt/startup/pesect.c @@ -4,7 +4,10 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include +//#include +#include +#include +#include #include #if defined (_WIN64) && defined (__ia64__) diff --git a/reactos/lib/sdk/crt/startup/pseudo-reloc.c b/reactos/lib/sdk/crt/startup/pseudo-reloc.c index a6edafbaaff..dd32ae584da 100644 --- a/reactos/lib/sdk/crt/startup/pseudo-reloc.c +++ b/reactos/lib/sdk/crt/startup/pseudo-reloc.c @@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -#include +//#include #include #include #include diff --git a/reactos/lib/sdk/crt/startup/tlsmthread.c b/reactos/lib/sdk/crt/startup/tlsmthread.c index c018abfd21e..fa11171fc48 100644 --- a/reactos/lib/sdk/crt/startup/tlsmthread.c +++ b/reactos/lib/sdk/crt/startup/tlsmthread.c @@ -5,11 +5,12 @@ * * Written by Kai Tietz */ -#ifndef WIN32_LEAN_AND_MEAN +/*#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include */ #include +#include int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *)); int __mingwthr_remove_key_dtor (DWORD key); diff --git a/reactos/lib/sdk/crt/startup/tlssup.c b/reactos/lib/sdk/crt/startup/tlssup.c index 3a0e63518d0..ab9337a1358 100644 --- a/reactos/lib/sdk/crt/startup/tlssup.c +++ b/reactos/lib/sdk/crt/startup/tlssup.c @@ -12,10 +12,14 @@ #include -#ifndef WIN32_LEAN_AND_MEAN +/*#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include */ + +#include +#include +#include #include #include diff --git a/reactos/lib/sdk/crt/startup/tlsthrd.c b/reactos/lib/sdk/crt/startup/tlsthrd.c index 6fbd47a5dd3..d3cf2ab2ba6 100644 --- a/reactos/lib/sdk/crt/startup/tlsthrd.c +++ b/reactos/lib/sdk/crt/startup/tlsthrd.c @@ -11,11 +11,14 @@ * */ -#ifndef WIN32_LEAN_AND_MEAN +/*#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include */ #include +#include +#include +#include WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); int ___w64_mingwthr_remove_key_dtor (DWORD key); diff --git a/reactos/lib/sdk/crt/string/mbstowcs_nt.c b/reactos/lib/sdk/crt/string/mbstowcs_nt.c index dc970349486..16a53462926 100644 --- a/reactos/lib/sdk/crt/string/mbstowcs_nt.c +++ b/reactos/lib/sdk/crt/string/mbstowcs_nt.c @@ -1,5 +1,3 @@ -#define WIN32_NO_STATUS -#include #include #include #include diff --git a/reactos/lib/sdk/crt/string/wcstombs_nt.c b/reactos/lib/sdk/crt/string/wcstombs_nt.c index 721caab2a32..cf14feb573b 100644 --- a/reactos/lib/sdk/crt/string/wcstombs_nt.c +++ b/reactos/lib/sdk/crt/string/wcstombs_nt.c @@ -1,5 +1,3 @@ -#define WIN32_NO_STATUS -#include #include #include diff --git a/reactos/lib/sdk/delayimp/delayimp.c b/reactos/lib/sdk/delayimp/delayimp.c index 25476887e4c..b8b8665e32a 100644 --- a/reactos/lib/sdk/delayimp/delayimp.c +++ b/reactos/lib/sdk/delayimp/delayimp.c @@ -7,7 +7,9 @@ * */ -#include +#include +#include +#include #include /**** load helper ****/ diff --git a/reactos/lib/sdk/nt/entry_point.c b/reactos/lib/sdk/nt/entry_point.c index 5cf7ef6d1e2..b0969cf1466 100644 --- a/reactos/lib/sdk/nt/entry_point.c +++ b/reactos/lib/sdk/nt/entry_point.c @@ -11,7 +11,7 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include -#include +//#include #define NTOS_MODE_USER #include #include diff --git a/reactos/lib/sdk/scrnsave/scrnsave.c b/reactos/lib/sdk/scrnsave/scrnsave.c index 85381452ad6..fddc48ad4d3 100644 --- a/reactos/lib/sdk/scrnsave/scrnsave.c +++ b/reactos/lib/sdk/scrnsave/scrnsave.c @@ -7,7 +7,11 @@ * Colin Finck */ -#include +#include +#include +#include +#include +#include #include #include diff --git a/reactos/lib/smlib/precomp.h b/reactos/lib/smlib/precomp.h index 49da659bf1a..7bec7451cc4 100644 --- a/reactos/lib/smlib/precomp.h +++ b/reactos/lib/smlib/precomp.h @@ -10,7 +10,8 @@ /* SDK/DDK/NDK Headers. */ #define WIN32_NO_STATUS -#include +#include +#include #define NTOS_MODE_USER #include #include diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c index 47cebc4e49a..5e135b35b3c 100644 --- a/reactos/subsystems/ntvdm/ntvdm.c +++ b/reactos/subsystems/ntvdm/ntvdm.c @@ -10,9 +10,15 @@ */ /* INCLUDES *****************************************************************/ + +#include #define WIN32_NO_STATUS -#include +#include +#include +#include +#include #include + #include "resource.h" #define NDEBUG diff --git a/reactos/subsystems/win32/csrss/csrsrv/srv.h b/reactos/subsystems/win32/csrss/csrsrv/srv.h index 94d6dfcb6af..c0d44177525 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/srv.h +++ b/reactos/subsystems/win32/csrss/csrsrv/srv.h @@ -5,9 +5,21 @@ #define NTOS_MODE_USER #include #define WIN32_NO_STATUS -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* CSR Header */ //#include diff --git a/reactos/subsystems/win32/csrss/csrss.c b/reactos/subsystems/win32/csrss/csrss.c index 4ea1ee7047a..06f5e2edb57 100644 --- a/reactos/subsystems/win32/csrss/csrss.c +++ b/reactos/subsystems/win32/csrss/csrss.c @@ -10,10 +10,14 @@ /* INCLUDES *******************************************************************/ #define WIN32_NO_STATUS -#include #define NTOS_MODE_USER -#include + +#include +#include +#include +#include #include + #define NDEBUG #include diff --git a/reactos/subsystems/win32/csrss/include/csrplugin.h b/reactos/subsystems/win32/csrss/include/csrplugin.h index 07c6b36889b..885ea8af929 100644 --- a/reactos/subsystems/win32/csrss/include/csrplugin.h +++ b/reactos/subsystems/win32/csrss/include/csrplugin.h @@ -17,7 +17,6 @@ #pragma once -#include #include "api.h" typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, diff --git a/reactos/tools/widl/header.c b/reactos/tools/widl/header.c index 2f275c7ac24..704aaf8e472 100644 --- a/reactos/tools/widl/header.c +++ b/reactos/tools/widl/header.c @@ -1486,6 +1486,10 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); fprintf(header, "#endif\n\n"); + fprintf(header, "#ifdef __REACTOS__\n"); + fprintf(header, "#define WIN32_LEAN_AND_MEAN\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#include \n" ); fprintf(header, "#include \n\n" ); diff --git a/reactos/tools/widl/proxy.c b/reactos/tools/widl/proxy.c index c9dc0bc232a..4904e11828a 100644 --- a/reactos/tools/widl/proxy.c +++ b/reactos/tools/widl/proxy.c @@ -95,7 +95,13 @@ static void init_proxy(const statement_list_t *stmts) error("Could not open %s for output\n", proxy_name); print_proxy( "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); print_proxy( "\n"); - print_proxy( "#define __midl_proxy\n"); + print_proxy( "#define __midl_proxy\n\n"); + + print_proxy( "#ifdef __REACTOS__\n"); + print_proxy( "#define WIN32_NO_STATUS\n"); + print_proxy( "#define WIN32_LEAN_AND_MEAN\n"); + print_proxy( "#endif\n\n"); + print_proxy( "#include \"objbase.h\"\n"); print_proxy( "\n"); print_proxy( "#ifndef DECLSPEC_HIDDEN\n"); diff --git a/reactos/tools/widl/widl.c b/reactos/tools/widl/widl.c index fc3d0d97862..ddf6dd0eeb1 100644 --- a/reactos/tools/widl/widl.c +++ b/reactos/tools/widl/widl.c @@ -351,6 +351,12 @@ static void write_dlldata_list(struct list *filenames) fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); + + fprintf(dlldata, "#ifdef __REACTOS__\n"); + fprintf(dlldata, "#define WIN32_NO_STATUS\n"); + fprintf(dlldata, "#define WIN32_LEAN_AND_MEAN\n"); + fprintf(dlldata, "#endif\n\n"); + fprintf(dlldata, "#include \n"); fprintf(dlldata, "#include \n\n"); start_cplusplus_guard(dlldata); @@ -475,6 +481,12 @@ void write_id_data(const statement_list_t *stmts) fprintf(idfile, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); + + fprintf(idfile, "#ifdef __REACTOS__\n", input_name); + fprintf(idfile, "#define WIN32_NO_STATUS\n", input_name); + fprintf(idfile, "#define WIN32_LEAN_AND_MEAN\n", input_name); + fprintf(idfile, "#endif\n\n", input_name); + fprintf(idfile, "#include \n"); fprintf(idfile, "#include \n\n"); fprintf(idfile, "#include \n\n"); diff --git a/reactos/win32ss/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt index 0e4ba75bb2c..77b7af61083 100644 --- a/reactos/win32ss/gdi/gdi32/CMakeLists.txt +++ b/reactos/win32ss/gdi/gdi32/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND SOURCE main/dllmain.c misc/heap.c misc/gdientry.c - misc/hacks.c + #misc/hacks.c misc/historic.c misc/misc.c misc/stubs.c diff --git a/reactos/win32ss/gdi/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h index db8cf5a81e8..e0eddddbc6b 100644 --- a/reactos/win32ss/gdi/gdi32/include/precomp.h +++ b/reactos/win32ss/gdi/gdi32/include/precomp.h @@ -10,12 +10,17 @@ /* Definitions */ #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define NTOS_MODE_USER #include /* SDK/DDK/NDK Headers. */ -#include +#include +#include +#include +#include #include #include #include diff --git a/reactos/win32ss/gdi/gdi32/main/dllmain.c b/reactos/win32ss/gdi/gdi32/main/dllmain.c index 9936c9521bb..22c80c3e2ca 100644 --- a/reactos/win32ss/gdi/gdi32/main/dllmain.c +++ b/reactos/win32ss/gdi/gdi32/main/dllmain.c @@ -7,7 +7,7 @@ * */ -#include "precomp.h" +#include extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; diff --git a/reactos/win32ss/gdi/gdi32/misc/gdientry.c b/reactos/win32ss/gdi/gdi32/misc/gdientry.c index 3b3000a1518..5ee3363add9 100644 --- a/reactos/win32ss/gdi/gdi32/misc/gdientry.c +++ b/reactos/win32ss/gdi/gdi32/misc/gdientry.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include "precomp.h" +#include /* DATA **********************************************************************/ diff --git a/reactos/win32ss/gdi/gdi32/misc/heap.c b/reactos/win32ss/gdi/gdi32/misc/heap.c index 5c2f7bb3d19..83c47473d47 100644 --- a/reactos/win32ss/gdi/gdi32/misc/heap.c +++ b/reactos/win32ss/gdi/gdi32/misc/heap.c @@ -25,7 +25,7 @@ * NOTES: */ -#include "precomp.h" +#include #include // global variables in a dll are process-global diff --git a/reactos/win32ss/gdi/gdi32/misc/historic.c b/reactos/win32ss/gdi/gdi32/misc/historic.c index 27bd7931a90..c144069ecee 100644 --- a/reactos/win32ss/gdi/gdi32/misc/historic.c +++ b/reactos/win32ss/gdi/gdi32/misc/historic.c @@ -8,7 +8,7 @@ * */ -#include "precomp.h" +#include /* * @implemented diff --git a/reactos/win32ss/gdi/gdi32/misc/misc.c b/reactos/win32ss/gdi/gdi32/misc/misc.c index debeef8b600..eb2e873bd9d 100644 --- a/reactos/win32ss/gdi/gdi32/misc/misc.c +++ b/reactos/win32ss/gdi/gdi32/misc/misc.c @@ -25,7 +25,7 @@ * 2004/09/04 Created */ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/misc/stubs.c b/reactos/win32ss/gdi/gdi32/misc/stubs.c index a258b0bb459..32fbd5de8b7 100644 --- a/reactos/win32ss/gdi/gdi32/misc/stubs.c +++ b/reactos/win32ss/gdi/gdi32/misc/stubs.c @@ -8,7 +8,7 @@ * */ -#include "precomp.h" +#include #include #define SIZEOF_DEVMODEA_300 124 diff --git a/reactos/win32ss/gdi/gdi32/misc/stubsa.c b/reactos/win32ss/gdi/gdi32/misc/stubsa.c index 4c07304d522..c4c502b7cfb 100644 --- a/reactos/win32ss/gdi/gdi32/misc/stubsa.c +++ b/reactos/win32ss/gdi/gdi32/misc/stubsa.c @@ -8,7 +8,7 @@ * */ -#include "precomp.h" +#include #include diff --git a/reactos/win32ss/gdi/gdi32/misc/stubsw.c b/reactos/win32ss/gdi/gdi32/misc/stubsw.c index 29b7406ff7c..d649db7d1b8 100644 --- a/reactos/win32ss/gdi/gdi32/misc/stubsw.c +++ b/reactos/win32ss/gdi/gdi32/misc/stubsw.c @@ -8,7 +8,7 @@ * */ -#include "precomp.h" +#include #include diff --git a/reactos/win32ss/gdi/gdi32/misc/wingl.c b/reactos/win32ss/gdi/gdi32/misc/wingl.c index 2a00f9bfc91..7389109dda5 100644 --- a/reactos/win32ss/gdi/gdi32/misc/wingl.c +++ b/reactos/win32ss/gdi/gdi32/misc/wingl.c @@ -21,7 +21,7 @@ * */ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/arc.c b/reactos/win32ss/gdi/gdi32/objects/arc.c index de2a291a98a..0e88ea79588 100644 --- a/reactos/win32ss/gdi/gdi32/objects/arc.c +++ b/reactos/win32ss/gdi/gdi32/objects/arc.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include BOOL WINAPI diff --git a/reactos/win32ss/gdi/gdi32/objects/bitmap.c b/reactos/win32ss/gdi/gdi32/objects/bitmap.c index 00be19013ab..5ec142134b7 100644 --- a/reactos/win32ss/gdi/gdi32/objects/bitmap.c +++ b/reactos/win32ss/gdi/gdi32/objects/bitmap.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/brush.c b/reactos/win32ss/gdi/gdi32/objects/brush.c index e1b7f2951e5..aca4b848ae0 100644 --- a/reactos/win32ss/gdi/gdi32/objects/brush.c +++ b/reactos/win32ss/gdi/gdi32/objects/brush.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/coord.c b/reactos/win32ss/gdi/gdi32/objects/coord.c index c24f12ba055..b919e1fe895 100644 --- a/reactos/win32ss/gdi/gdi32/objects/coord.c +++ b/reactos/win32ss/gdi/gdi32/objects/coord.c @@ -5,7 +5,7 @@ * PURPOSE: Functions for coordinate transformation * PROGRAMMER: */ -#include "precomp.h" +#include /* Currently we use a MATRIX inside the DC_ATTR containing the coordinate transformations, while we deal with XFORM structures diff --git a/reactos/win32ss/gdi/gdi32/objects/dc.c b/reactos/win32ss/gdi/gdi32/objects/dc.c index be3ffb42947..810eaa75219 100644 --- a/reactos/win32ss/gdi/gdi32/objects/dc.c +++ b/reactos/win32ss/gdi/gdi32/objects/dc.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/efloat.c b/reactos/win32ss/gdi/gdi32/objects/efloat.c index d37ffedd841..19e3140815f 100644 --- a/reactos/win32ss/gdi/gdi32/objects/efloat.c +++ b/reactos/win32ss/gdi/gdi32/objects/efloat.c @@ -5,7 +5,7 @@ * PURPOSE: Functions to convert between FLOAT and EFLOAT * PROGRAMMER: James Tabor */ -#include "precomp.h" +#include /* the following deal with IEEE single-precision numbers */ #define EXCESS 126L diff --git a/reactos/win32ss/gdi/gdi32/objects/eng.c b/reactos/win32ss/gdi/gdi32/objects/eng.c index 51144b233a0..e13f84c3e3e 100644 --- a/reactos/win32ss/gdi/gdi32/objects/eng.c +++ b/reactos/win32ss/gdi/gdi32/objects/eng.c @@ -7,7 +7,7 @@ * */ -#include "precomp.h" +#include /* * @implemented diff --git a/reactos/win32ss/gdi/gdi32/objects/enhmfile.c b/reactos/win32ss/gdi/gdi32/objects/enhmfile.c index ec68f24c63a..45ed4f28e5e 100644 --- a/reactos/win32ss/gdi/gdi32/objects/enhmfile.c +++ b/reactos/win32ss/gdi/gdi32/objects/enhmfile.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/font.c b/reactos/win32ss/gdi/gdi32/objects/font.c index 4adec907f8d..bdfa058da0a 100644 --- a/reactos/win32ss/gdi/gdi32/objects/font.c +++ b/reactos/win32ss/gdi/gdi32/objects/font.c @@ -7,7 +7,7 @@ * */ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/icm.c b/reactos/win32ss/gdi/gdi32/objects/icm.c index 02e05cb5db7..708086699b1 100644 --- a/reactos/win32ss/gdi/gdi32/objects/icm.c +++ b/reactos/win32ss/gdi/gdi32/objects/icm.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/linedda.c b/reactos/win32ss/gdi/gdi32/objects/linedda.c index 9e6997206be..1a0ae7d87f3 100644 --- a/reactos/win32ss/gdi/gdi32/objects/linedda.c +++ b/reactos/win32ss/gdi/gdi32/objects/linedda.c @@ -29,7 +29,7 @@ * NOTES: Adapted from Wine */ -#include "precomp.h" +#include #include diff --git a/reactos/win32ss/gdi/gdi32/objects/metafile.c b/reactos/win32ss/gdi/gdi32/objects/metafile.c index cf4e51759eb..410d50e458e 100644 --- a/reactos/win32ss/gdi/gdi32/objects/metafile.c +++ b/reactos/win32ss/gdi/gdi32/objects/metafile.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include /* DEFINES *******************************************************************/ diff --git a/reactos/win32ss/gdi/gdi32/objects/painting.c b/reactos/win32ss/gdi/gdi32/objects/painting.c index eab1f72bd27..169f436080e 100644 --- a/reactos/win32ss/gdi/gdi32/objects/painting.c +++ b/reactos/win32ss/gdi/gdi32/objects/painting.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include /* diff --git a/reactos/win32ss/gdi/gdi32/objects/palette.c b/reactos/win32ss/gdi/gdi32/objects/palette.c index bfb9ca7b9d4..d8856e004da 100644 --- a/reactos/win32ss/gdi/gdi32/objects/palette.c +++ b/reactos/win32ss/gdi/gdi32/objects/palette.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/path.c b/reactos/win32ss/gdi/gdi32/objects/path.c index 8a35a0e1e9f..db08f05e8c4 100644 --- a/reactos/win32ss/gdi/gdi32/objects/path.c +++ b/reactos/win32ss/gdi/gdi32/objects/path.c @@ -9,7 +9,7 @@ * */ -#include "precomp.h" +#include /* * @implemented diff --git a/reactos/win32ss/gdi/gdi32/objects/pen.c b/reactos/win32ss/gdi/gdi32/objects/pen.c index dbbe0f2de2b..af5de209871 100644 --- a/reactos/win32ss/gdi/gdi32/objects/pen.c +++ b/reactos/win32ss/gdi/gdi32/objects/pen.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/printdrv.c b/reactos/win32ss/gdi/gdi32/objects/printdrv.c index 3c6d0e89917..d1276648bf8 100644 --- a/reactos/win32ss/gdi/gdi32/objects/printdrv.c +++ b/reactos/win32ss/gdi/gdi32/objects/printdrv.c @@ -31,7 +31,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/region.c b/reactos/win32ss/gdi/gdi32/objects/region.c index a6866bbfb47..8724799020c 100644 --- a/reactos/win32ss/gdi/gdi32/objects/region.c +++ b/reactos/win32ss/gdi/gdi32/objects/region.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/text.c b/reactos/win32ss/gdi/gdi32/objects/text.c index 2e6269dbf2e..68af7c6db78 100644 --- a/reactos/win32ss/gdi/gdi32/objects/text.c +++ b/reactos/win32ss/gdi/gdi32/objects/text.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include #define NDEBUG #include diff --git a/reactos/win32ss/gdi/gdi32/objects/utils.c b/reactos/win32ss/gdi/gdi32/objects/utils.c index 7ed0d229d64..5b29ff2aa02 100644 --- a/reactos/win32ss/gdi/gdi32/objects/utils.c +++ b/reactos/win32ss/gdi/gdi32/objects/utils.c @@ -1,4 +1,4 @@ -#include "precomp.h" +#include /** * @name CalculateColorTableSize diff --git a/reactos/win32ss/user/user32/controls/edit.c b/reactos/win32ss/user/user32/controls/edit.c index a70c4fdeb13..14cb3e29db5 100644 --- a/reactos/win32ss/user/user32/controls/edit.c +++ b/reactos/win32ss/user/user32/controls/edit.c @@ -43,6 +43,8 @@ */ #include +#define WIN32_LEAN_AND_MEAN +#include #include diff --git a/reactos/win32ss/user/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h index be2e6cd8e50..ab4a588f7f9 100644 --- a/reactos/win32ss/user/user32/include/user32.h +++ b/reactos/win32ss/user/user32/include/user32.h @@ -18,11 +18,20 @@ #define OEMRESOURCE #define NTOS_MODE_USER #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include #include #include diff --git a/reactos/win32ss/user/user32/user32.rc b/reactos/win32ss/user/user32/user32.rc index 5c37975431e..cf2bf8f7c66 100644 --- a/reactos/win32ss/user/user32/user32.rc +++ b/reactos/win32ss/user/user32/user32.rc @@ -1,4 +1,5 @@ -#include +#include +#include #include "include/resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/win32ss/user/user32/windows/spy.c b/reactos/win32ss/user/user32/windows/spy.c index b1720fbf1c7..dc5297686f4 100644 --- a/reactos/win32ss/user/user32/windows/spy.c +++ b/reactos/win32ss/user/user32/windows/spy.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/reactos/win32ss/user/win32csr/rsrc.rc b/reactos/win32ss/user/win32csr/rsrc.rc index 6655b896fd2..52c3c3184e3 100644 --- a/reactos/win32ss/user/win32csr/rsrc.rc +++ b/reactos/win32ss/user/win32csr/rsrc.rc @@ -1,6 +1,3 @@ -#include -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 ICON DISCARDABLE res/terminal.ico diff --git a/reactos/win32ss/user/win32csr/w32csr.h b/reactos/win32ss/user/win32csr/w32csr.h index 357a2c9e6cb..8759ebc6281 100644 --- a/reactos/win32ss/user/win32csr/w32csr.h +++ b/reactos/win32ss/user/win32csr/w32csr.h @@ -1,8 +1,22 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include +#include +#include +#include +#include +#include +#include +#include +#include #define NTOS_MODE_USER -#include +#include +#include +#include +#include +#include #include /* External Winlogon Header */ diff --git a/reactos/win32ss/user/win32csr/win32csr.h b/reactos/win32ss/user/win32csr/win32csr.h index 5b4a68eb41b..053642496d8 100644 --- a/reactos/win32ss/user/win32csr/win32csr.h +++ b/reactos/win32ss/user/win32csr/win32csr.h @@ -8,8 +8,7 @@ #pragma once -#include -#include +#include extern HANDLE Win32CsrApiHeap; extern HINSTANCE Win32CsrDllHandle; diff --git a/reactos/win32ss/user/win32csr/win32csr.rc b/reactos/win32ss/user/win32csr/win32csr.rc index f62f25e518f..8ce91c6d7bd 100644 --- a/reactos/win32ss/user/win32csr/win32csr.rc +++ b/reactos/win32ss/user/win32csr/win32csr.rc @@ -1,4 +1,6 @@ -#include +#include +#include + #include "resource.h" #define REACTOS_VERSION_DLL From 379c1bba14409953fd08a36a1f713dfc9fd489ad Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 25 Jan 2013 18:07:06 +0000 Subject: [PATCH 45/71] [USP10] Fix ros_diff line endings. svn path=/trunk/; revision=58215 --- reactos/dll/win32/usp10/usp10_ros.diff | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/reactos/dll/win32/usp10/usp10_ros.diff b/reactos/dll/win32/usp10/usp10_ros.diff index 6176b73d4cb..9a35aad5061 100644 --- a/reactos/dll/win32/usp10/usp10_ros.diff +++ b/reactos/dll/win32/usp10/usp10_ros.diff @@ -1,22 +1,22 @@ -Index: usp10.c -=================================================================== ---- usp10.c (revision 54504) -+++ usp10.c (working copy) -@@ -3621,3 +3621,9 @@ - - return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); - } -+ -+BOOL gbLpkPresent = FALSE; -+VOID WINAPI LpkPresent() -+{ -+ gbLpkPresent = TRUE; /* Turn it on this way! Wine is out of control! */ -+} -Index: usp10.spec -=================================================================== ---- usp10.spec (revision 54504) -+++ usp10.spec (working copy) -@@ -1,4 +1,4 @@ +Index: usp10.c +=================================================================== +--- usp10.c (revision 54504) ++++ usp10.c (working copy) +@@ -3621,3 +3621,9 @@ + + return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); + } ++ ++BOOL gbLpkPresent = FALSE; ++VOID WINAPI LpkPresent() ++{ ++ gbLpkPresent = TRUE; /* Turn it on this way! Wine is out of control! */ ++} +Index: usp10.spec +=================================================================== +--- usp10.spec (revision 54504) ++++ usp10.spec (working copy) +@@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) From 97d934c8befcbf3e956cb02fa6deee580645ef47 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 25 Jan 2013 20:36:23 +0000 Subject: [PATCH 46/71] [SAMSRV] - Add missing domain information types to ntsam.h and fix conflicts in ntsecapi.h and sam.idl. - Add SamChangePasswordUser, SamChangePasswordUser2 and SamChangePasswordUser3 stubs. svn path=/trunk/; revision=58216 --- reactos/dll/win32/samlib/samlib.c | 39 ++++++++++++- reactos/dll/win32/samlib/samlib.spec | 6 +- reactos/include/ddk/ntsam.h | 83 +++++++++++++++++++++++++++- reactos/include/psdk/ntsecapi.h | 3 + reactos/include/reactos/idl/sam.idl | 10 ++-- 5 files changed, 130 insertions(+), 11 deletions(-) diff --git a/reactos/dll/win32/samlib/samlib.c b/reactos/dll/win32/samlib/samlib.c index 1b28ba309ac..be6b3541808 100644 --- a/reactos/dll/win32/samlib/samlib.c +++ b/reactos/dll/win32/samlib/samlib.c @@ -136,7 +136,7 @@ SamAddMemberToGroup(IN SAM_HANDLE GroupHandle, { NTSTATUS Status; - TRACE("SamAddMemberToGroup(%p %lu %lx)", + TRACE("SamAddMemberToGroup(%p %lu %lx)\n", GroupHandle, MemberId, Attributes); RpcTryExcept @@ -188,6 +188,43 @@ SamAddMultipleMembersToAlias(IN SAM_HANDLE AliasHandle, } +NTSTATUS +NTAPI +SamChangePasswordUser(IN SAM_HANDLE UserHandle, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +SamChangePasswordUser2(IN PUNICODE_STRING ServerName, + IN PUNICODE_STRING UserName, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +SamChangePasswordUser3(IN PUNICODE_STRING ServerName, + IN PUNICODE_STRING UserName, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword, + OUT PDOMAIN_PASSWORD_INFORMATION *EffectivePasswordPolicy, + OUT PUSER_PWD_CHANGE_FAILURE_INFORMATION *PasswordChangeFailureInfo) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + NTSTATUS NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle) diff --git a/reactos/dll/win32/samlib/samlib.spec b/reactos/dll/win32/samlib/samlib.spec index 94b0b01cf1d..161ce8de44c 100644 --- a/reactos/dll/win32/samlib/samlib.spec +++ b/reactos/dll/win32/samlib/samlib.spec @@ -1,9 +1,9 @@ @ stdcall SamAddMemberToAlias(ptr ptr) @ stdcall SamAddMemberToGroup(ptr long long) @ stdcall SamAddMultipleMembersToAlias(ptr ptr long) -@ stub SamChangePasswordUser2 -@ stub SamChangePasswordUser3 -@ stub SamChangePasswordUser +@ stdcall SamChangePasswordUser2(ptr ptr ptr ptr) +@ stdcall SamChangePasswordUser3(ptr ptr ptr ptr ptr ptr) +@ stdcall SamChangePasswordUser(ptr ptr ptr) @ stdcall SamCloseHandle(ptr) @ stdcall SamConnect(ptr ptr long ptr) @ stub SamConnectWithCreds diff --git a/reactos/include/ddk/ntsam.h b/reactos/include/ddk/ntsam.h index 886be4608bb..16883866db6 100644 --- a/reactos/include/ddk/ntsam.h +++ b/reactos/include/ddk/ntsam.h @@ -187,12 +187,12 @@ extern "C" { #define USER_PARTIAL_SECRETS_ACCOUNT 0x00100000 #define USER_USE_AES_KEYS 0x00200000 -/* Constants uses by LOGON_HOURS.UnitsPerWeek */ +/* Constants used by LOGON_HOURS.UnitsPerWeek */ #define SAM_DAYS_PER_WEEK (7) #define SAM_HOURS_PER_WEEK (24 * SAM_DAYS_PER_WEEK) #define SAM_MINUTES_PER_WEEK (60 * SAM_HOURS_PER_WEEK) -/* Flags used in USER_ALL_INFORMATION.WhichField */ +/* Flags used by USER_ALL_INFORMATION.WhichField */ #define USER_ALL_USERNAME 0x00000001 #define USER_ALL_FULLNAME 0x00000002 #define USER_ALL_USERID 0x00000004 @@ -225,6 +225,26 @@ extern "C" { #define USER_ALL_OWFPASSWORD 0x20000000 #define USER_ALL_UNDEFINED_MASK 0xC0000000 +/* Values used by USER_PWD_CHANGE_FAILURE_INFORMATION.ExtendedFailureReason */ +#define SAM_PWD_CHANGE_NO_ERROR 0 +#define SAM_PWD_CHANGE_PASSWORD_TOO_SHORT 1 +#define SAM_PWD_CHANGE_PWD_IN_HISTORY 2 +#define SAM_PWD_CHANGE_USERNAME_IN_PASSWORD 3 +#define SAM_PWD_CHANGE_FULLNAME_IN_PASSWORD 4 +#define SAM_PWD_CHANGE_NOT_COMPLEX 5 +#define SAM_PWD_CHANGE_MACHINE_PASSWORD_NOT_DEFAULT 6 +#define SAM_PWD_CHANGE_FAILED_BY_FILTER 7 +#define SAM_PWD_CHANGE_PASSWORD_TOO_LONG 8 +#define SAM_PWD_CHANGE_FAILURE_REASON_MAX 8 + +/* Flags used by DOMAIN_PASSWORD_INFORMATION.PasswordProperties */ +#define DOMAIN_PASSWORD_COMPLEX 0x00000001L +#define DOMAIN_PASSWORD_NO_ANON_CHANGE 0x00000002L +#define DOMAIN_PASSWORD_NO_CLEAR_CHANGE 0x00000004L +#define DOMAIN_LOCKOUT_ADMINS 0x00000008L +#define DOMAIN_PASSWORD_STORE_CLEARTEXT 0x00000010L +#define DOMAIN_REFUSE_PASSWORD_CHANGE 0x00000020L +#define DOMAIN_NO_LM_OWF_CHANGE 0x00000040L typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; @@ -295,6 +315,18 @@ typedef enum _DOMAIN_SERVER_ROLE DomainServerRolePrimary } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; +#ifndef _DOMAIN_PASSWORD_INFORMATION_DEFINED +#define _DOMAIN_PASSWORD_INFORMATION_DEFINED +typedef struct _DOMAIN_PASSWORD_INFORMATION +{ + USHORT MinPasswordLength; + USHORT PasswordHistoryLength; + ULONG PasswordProperties; + LARGE_INTEGER MaxPasswordAge; + LARGE_INTEGER MinPasswordAge; +} DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; +#endif + #include "pshpack4.h" typedef struct _DOMAIN_GENERAL_INFORMATION { @@ -337,6 +369,12 @@ typedef struct _DOMAIN_SERVER_ROLE_INFORMATION DOMAIN_SERVER_ROLE DomainServerRole; } DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION; +typedef struct _DOMAIN_MODIFIED_INFORMATION +{ + LARGE_INTEGER DomainModifiedCount; + LARGE_INTEGER CreationTime; +} DOMAIN_MODIFIED_INFORMATION, *PDOMAIN_MODIFIED_INFORMATION; + typedef struct _DOMAIN_STATE_INFORMATION { DOMAIN_SERVER_ENABLE_STATE DomainServerState; @@ -357,6 +395,20 @@ typedef struct _DOMAIN_GENERAL_INFORMATION2 } DOMAIN_GENERAL_INFORMATION2, *PDOMAIN_GENERAL_INFORMATION2; #include "poppack.h" +typedef struct _DOMAIN_LOCKOUT_INFORMATION +{ + LARGE_INTEGER LockoutDuration; + LARGE_INTEGER LockoutObservationWindow; + USHORT LockoutThreshold; +} DOMAIN_LOCKOUT_INFORMATION, *PDOMAIN_LOCKOUT_INFORMATION; + +typedef struct _DOMAIN_MODIFIED_INFORMATION2 +{ + LARGE_INTEGER DomainModifiedCount; + LARGE_INTEGER CreationTime; + LARGE_INTEGER ModifiedCountAtLastPromotion; +} DOMAIN_MODIFIED_INFORMATION2, *PDOMAIN_MODIFIED_INFORMATION2; + typedef enum _GROUP_INFORMATION_CLASS { GroupGeneralInformation = 1, @@ -594,6 +646,11 @@ typedef struct _USER_ALL_INFORMATION } USER_ALL_INFORMATION, *PUSER_ALL_INFORMATION; #include "poppack.h" +typedef struct _USER_PWD_CHANGE_FAILURE_INFORMATION +{ + ULONG ExtendedFailureReason; + UNICODE_STRING FilterModuleName; +} USER_PWD_CHANGE_FAILURE_INFORMATION, *PUSER_PWD_CHANGE_FAILURE_INFORMATION; #define SAM_SID_COMPATIBILITY_ALL 0 #define SAM_SID_COMPATIBILITY_LAX 1 @@ -617,6 +674,28 @@ SamAddMultipleMembersToAlias(IN SAM_HANDLE AliasHandle, IN PSID *MemberIds, IN ULONG MemberCount); +NTSTATUS +NTAPI +SamChangePasswordUser(IN SAM_HANDLE UserHandle, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword); + +NTSTATUS +NTAPI +SamChangePasswordUser2(IN PUNICODE_STRING ServerName, + IN PUNICODE_STRING UserName, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword); + +NTSTATUS +NTAPI +SamChangePasswordUser3(IN PUNICODE_STRING ServerName, + IN PUNICODE_STRING UserName, + IN PUNICODE_STRING OldPassword, + IN PUNICODE_STRING NewPassword, + OUT PDOMAIN_PASSWORD_INFORMATION *EffectivePasswordPolicy, + OUT PUSER_PWD_CHANGE_FAILURE_INFORMATION *PasswordChangeFailureInfo); + NTSTATUS NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle); diff --git a/reactos/include/psdk/ntsecapi.h b/reactos/include/psdk/ntsecapi.h index 7f9606f35c0..2aa1ec3918e 100644 --- a/reactos/include/psdk/ntsecapi.h +++ b/reactos/include/psdk/ntsecapi.h @@ -327,6 +327,8 @@ typedef enum _LSA_FOREST_TRUST_COLLISION_RECORD_TYPE { CollisionXref, CollisionOther } LSA_FOREST_TRUST_COLLISION_RECORD_TYPE; +#ifndef _DOMAIN_PASSWORD_INFORMATION_DEFINED +#define _DOMAIN_PASSWORD_INFORMATION_DEFINED typedef struct _DOMAIN_PASSWORD_INFORMATION { USHORT MinPasswordLength; USHORT PasswordHistoryLength; @@ -334,6 +336,7 @@ typedef struct _DOMAIN_PASSWORD_INFORMATION { LARGE_INTEGER MaxPasswordAge; LARGE_INTEGER MinPasswordAge; } DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; +#endif typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE; typedef struct _LSA_ENUMERATION_INFORMATION { PSID Sid; diff --git a/reactos/include/reactos/idl/sam.idl b/reactos/include/reactos/idl/sam.idl index 07c792223da..f4ae902a13f 100644 --- a/reactos/include/reactos/idl/sam.idl +++ b/reactos/include/reactos/idl/sam.idl @@ -158,12 +158,12 @@ typedef enum _DOMAIN_SERVER_ROLE } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; cpp_quote("#endif") -cpp_quote("#ifndef _NTSECAPI_H") +cpp_quote("#if !defined(_NTSECAPI_H) && !defined(_NTSAM_)") typedef struct _DOMAIN_PASSWORD_INFORMATION { - unsigned short MinPasswordLength; - unsigned short PasswordHistoryLength; - unsigned long PasswordProperties; + USHORT MinPasswordLength; + USHORT PasswordHistoryLength; + ULONG PasswordProperties; OLD_LARGE_INTEGER MaxPasswordAge; OLD_LARGE_INTEGER MinPasswordAge; } DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; @@ -179,7 +179,6 @@ typedef struct _DOMAIN_SERVER_ROLE_INFORMATION { DOMAIN_SERVER_ROLE DomainServerRole; } DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION; -cpp_quote("#endif") typedef struct _DOMAIN_MODIFIED_INFORMATION { @@ -193,6 +192,7 @@ typedef struct _DOMAIN_MODIFIED_INFORMATION2 OLD_LARGE_INTEGER CreationTime; OLD_LARGE_INTEGER ModifiedCountAtLastPromotion; } DOMAIN_MODIFIED_INFORMATION2, *PDOMAIN_MODIFIED_INFORMATION2; +cpp_quote("#endif") cpp_quote("#include ") typedef struct _SAMPR_DOMAIN_GENERAL_INFORMATION From 8900ea9af674f1b8ba37cbbc1900f72c3569ffde Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 25 Jan 2013 22:28:41 +0000 Subject: [PATCH 47/71] =?UTF-8?q?[EXPLORER=5FNEW]=20-=20Do=20not=20allow?= =?UTF-8?q?=20multiple=20"Taskbar=20and=20Start=20Menu=20Properties"=20win?= =?UTF-8?q?dows.=20Based=20on=20patch=20by=20Edijs=20Kolesnikovi=C4=8Ds=20?= =?UTF-8?q?&=20Gr=C3=A9gori=20Mac=C3=A1rio=20Harbs.=20CORE-6885=20#resolve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=58217 --- reactos/base/shell/explorer-new/precomp.h | 4 +- reactos/base/shell/explorer-new/trayprop.c | 39 ++++----------- reactos/base/shell/explorer-new/traywnd.c | 55 ++++++++++++++++++---- 3 files changed, 58 insertions(+), 40 deletions(-) diff --git a/reactos/base/shell/explorer-new/precomp.h b/reactos/base/shell/explorer-new/precomp.h index 7793d245e1d..11e6df1fa0e 100644 --- a/reactos/base/shell/explorer-new/precomp.h +++ b/reactos/base/shell/explorer-new/precomp.h @@ -269,8 +269,8 @@ ProcessStartupItems(VOID); * trayprop.h */ -HWND -DisplayTrayProperties(ITrayWindow *Tray); +VOID +DisplayTrayProperties(IN HWND hwndOwner); /* * desktop.c diff --git a/reactos/base/shell/explorer-new/trayprop.c b/reactos/base/shell/explorer-new/trayprop.c index 1d77a150ebd..36de295c48a 100644 --- a/reactos/base/shell/explorer-new/trayprop.c +++ b/reactos/base/shell/explorer-new/trayprop.c @@ -361,38 +361,26 @@ InitPropSheetPage(PROPSHEETPAGE *psp, } -HWND -DisplayTrayProperties(ITrayWindow *Tray) +VOID +DisplayTrayProperties(IN HWND hwndOwner) { - PPROPSHEET_INFO pPropInfo; + PROPSHEET_INFO propInfo; PROPSHEETHEADER psh; PROPSHEETPAGE psp[5]; TCHAR szCaption[256]; - pPropInfo = HeapAlloc(hProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PROPSHEET_INFO)); - if (!pPropInfo) - { - return NULL; - } - if (!LoadString(hExplorerInstance, IDS_TASKBAR_STARTMENU_PROP_CAPTION, szCaption, sizeof(szCaption) / sizeof(szCaption[0]))) { - HeapFree(hProcessHeap, - 0, - pPropInfo); - - return NULL; + return; } ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; - psh.hwndParent = NULL; + psh.hwndParent = hwndOwner; psh.hInstance = hExplorerInstance; psh.hIcon = NULL; psh.pszCaption = szCaption; @@ -400,18 +388,11 @@ DisplayTrayProperties(ITrayWindow *Tray) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, NotificationPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)&propInfo); + InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)&propInfo); + InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, NotificationPageProc, (LPARAM)&propInfo); + InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)&propInfo); + InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)&propInfo); PropertySheet(&psh); - - HeapFree(hProcessHeap, - 0, - pPropInfo); - - // FIXME: return the HWND - return NULL; } diff --git a/reactos/base/shell/explorer-new/traywnd.c b/reactos/base/shell/explorer-new/traywnd.c index 94b936a2e6a..194c9ff5e73 100644 --- a/reactos/base/shell/explorer-new/traywnd.c +++ b/reactos/base/shell/explorer-new/traywnd.c @@ -92,7 +92,7 @@ typedef struct IMenuPopup *StartMenuPopup; HBITMAP hbmStartMenu; - HWND hWndTrayProperties; + HWND hwndTrayPropertiesOwner; HWND hwndRunFileDlgOwner; } ITrayWindowImpl; @@ -1750,19 +1750,56 @@ ITrayWIndowImpl_GetCaptionFonts(IN OUT ITrayWindow *iface, return This->hCaptionFont; } +static DWORD WINAPI +TrayPropertiesThread(IN OUT PVOID pParam) +{ + ITrayWindowImpl *This = pParam; + HWND hwnd; + RECT posRect; + + GetWindowRect(This->hwndStart, &posRect); + hwnd = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, + posRect.left, + posRect.top, + posRect.right - posRect.left, + posRect.bottom - posRect.top, + NULL, + NULL, + NULL, + NULL); + + This->hwndTrayPropertiesOwner = hwnd; + + DisplayTrayProperties(hwnd); + + This->hwndTrayPropertiesOwner = NULL; + DestroyWindow(hwnd); + + return 0; +} + static HWND STDMETHODCALLTYPE ITrayWindowImpl_DisplayProperties(IN OUT ITrayWindow *iface) { ITrayWindowImpl *This = impl_from_ITrayWindow(iface); + HWND hTrayProp; - if (This->hWndTrayProperties != NULL) + if (This->hwndTrayPropertiesOwner) { - BringWindowToTop(This->hWndTrayProperties); - return This->hWndTrayProperties; + hTrayProp = GetLastActivePopup(This->hwndTrayPropertiesOwner); + if (hTrayProp != NULL && + hTrayProp != This->hwndTrayPropertiesOwner) + { + SetForegroundWindow(hTrayProp); + return NULL; + } } - This->hWndTrayProperties = DisplayTrayProperties(ITrayWindow_from_impl(This)); - return This->hWndTrayProperties; + CloseHandle(CreateThread(NULL, 0, TrayPropertiesThread, This, 0, NULL)); + return NULL; } static VOID @@ -2015,7 +2052,7 @@ RunFileDlgThread(IN OUT PVOID pParam) } static void -ITrayWindowImpl_ShowRunFileDlg(IN ITrayWindowImpl *This) +ITrayWindowImpl_DisplayRunFileDlg(IN ITrayWindowImpl *This) { HWND hRunDlg; if (This->hwndRunFileDlgOwner) @@ -2551,7 +2588,7 @@ HandleTrayContextMenu: case IDM_RUN: { - ITrayWindowImpl_ShowRunFileDlg(This); + ITrayWindowImpl_DisplayRunFileDlg(This); break; } @@ -2798,7 +2835,7 @@ TrayMessageLoop(IN OUT ITrayWindow *Tray) switch (Msg.wParam) { case IDHK_RUN: /* Win+R */ - ITrayWindowImpl_ShowRunFileDlg(This); + ITrayWindowImpl_DisplayRunFileDlg(This); break; } } From 5994749f531a1c13bc0fffa872407a723f3786f2 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 25 Jan 2013 23:24:46 +0000 Subject: [PATCH 48/71] [BROWSEUI_APITEST] - Add a test for SHExplorerParseCmdLine. CORE-5568 svn path=/trunk/; revision=58218 --- rostests/apitests/CMakeLists.txt | 1 + rostests/apitests/browseui/CMakeLists.txt | 10 ++ .../browseui/SHExplorerParseCmdLine.c | 147 ++++++++++++++++++ rostests/apitests/browseui/testlist.c | 16 ++ 4 files changed, 174 insertions(+) create mode 100644 rostests/apitests/browseui/CMakeLists.txt create mode 100644 rostests/apitests/browseui/SHExplorerParseCmdLine.c create mode 100644 rostests/apitests/browseui/testlist.c diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt index 6ccdeee7091..1c0a6d8604e 100644 --- a/rostests/apitests/CMakeLists.txt +++ b/rostests/apitests/CMakeLists.txt @@ -2,6 +2,7 @@ add_library(apitest apitest.c) add_subdirectory(advapi32) +add_subdirectory(browseui) add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) diff --git a/rostests/apitests/browseui/CMakeLists.txt b/rostests/apitests/browseui/CMakeLists.txt new file mode 100644 index 00000000000..d8cb019e794 --- /dev/null +++ b/rostests/apitests/browseui/CMakeLists.txt @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + SHExplorerParseCmdLine.c + testlist.c) + +add_executable(browseui_apitest ${SOURCE}) +target_link_libraries(browseui_apitest wine) +set_module_type(browseui_apitest win32cui) +add_importlibs(browseui_apitest browseui shell32 msvcrt kernel32 ntdll) +add_cd_file(TARGET browseui_apitest DESTINATION reactos/bin FOR all) diff --git a/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/rostests/apitests/browseui/SHExplorerParseCmdLine.c new file mode 100644 index 00000000000..59fb9bbccba --- /dev/null +++ b/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -0,0 +1,147 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SHExplorerParseCmdLine + * PROGRAMMER: Thomas Faber + */ + +#define UNICODE +#include +#include +#include + +#define UNKNOWN_SIZE 0x100 + +typedef struct _EXPLORER_INFO +{ + PWSTR FileName; + PIDLIST_ABSOLUTE pidl; + DWORD dwFlags; /* TODO: make some constants */ + ULONG Unknown[UNKNOWN_SIZE]; /* TODO: find out more */ +} EXPLORER_INFO, *PEXPLORER_INFO; + +PVOID +WINAPI +SHExplorerParseCmdLine( + _Out_ PEXPLORER_INFO Info); + +#define PIDL_IS_UNTOUCHED -1 +#define PIDL_IS_NULL -2 +#define PIDL_IS_PATH -3 + +#define InvalidPointer ((PVOID)0x5555555555555555ULL) + +static +VOID +TestCommandLine( + _In_ INT ExpectedRet, + _In_ INT ExpectedCsidl, + _In_ DWORD ExpectedFlags, + _In_ PCWSTR ExpectedFileName, + _In_ PCWSTR PidlPath) +{ + EXPLORER_INFO Info; + PVOID Ret; + ULONG i; + + FillMemory(&Info, sizeof(Info), 0x55); + Info.dwFlags = 0x00000000; + Ret = SHExplorerParseCmdLine(&Info); + + if (ExpectedRet == -1) + ok(Ret == Info.pidl, "Ret = %p, expected %p\n", Ret, Info.pidl); + else + ok(Ret == (PVOID)ExpectedRet, "Ret = %p, expected %p\n", Ret, (PVOID)ExpectedRet); + + if (ExpectedFileName == NULL) + ok(Info.FileName == InvalidPointer, "FileName = %p\n", Info.FileName); + else + { + ok(Info.FileName != NULL && Info.FileName != InvalidPointer, "FileName = %p\n", Info.FileName); + if (Info.FileName != NULL && Info.FileName != InvalidPointer) + { + ok(!wcscmp(Info.FileName, ExpectedFileName), "FileName = %ls, expected %ls\n", Info.FileName, ExpectedFileName); + LocalFree(Info.FileName); + } + } + + if (ExpectedCsidl == PIDL_IS_UNTOUCHED) + ok(Info.pidl == InvalidPointer, "pidl = %p\n", Info.pidl); + else if (ExpectedCsidl == PIDL_IS_NULL) + ok(Info.pidl == NULL, "pidl = %p\n", Info.pidl); + else + { + PIDLIST_ABSOLUTE ExpectedPidl; + HRESULT hr; + + ok(Info.pidl != NULL, "pidl = %p\n", Info.pidl); + if (Info.pidl != NULL && Info.pidl != InvalidPointer) + { + if (ExpectedCsidl == PIDL_IS_PATH) + { + ExpectedPidl = SHSimpleIDListFromPath(PidlPath); + hr = ExpectedPidl == NULL ? E_FAIL : S_OK; + ok(ExpectedPidl != NULL, "SHSimpleIDListFromPath failed\n"); + } + else + { + hr = SHGetFolderLocation(NULL, ExpectedCsidl, NULL, 0, &ExpectedPidl); + ok(hr == S_OK, "SHGetFolderLocation returned %08lx\n", hr); + } + if (SUCCEEDED(hr)) + { + ok(ILIsEqual(Info.pidl, ExpectedPidl), "Unexpected pidl value\n"); + ILFree(ExpectedPidl); + } + ILFree(Info.pidl); + } + } + + ok(Info.dwFlags == ExpectedFlags, "dwFlags = %08lx, expected %08lx\n", Info.dwFlags, ExpectedFlags); + for (i = 0; i < sizeof(Info.Unknown) / sizeof(Info.Unknown[0]); i++) + ok(Info.Unknown[i] == 0x55555555, "Unknown[%lu] = %08lx\n", i, Info.Unknown[i]); +} + +START_TEST(SHExplorerParseCmdLine) +{ + struct + { + PCWSTR CommandLine; + INT ExpectedRet; + INT ExpectedCsidl; + DWORD ExpectedFlags; + PCWSTR ExpectedFileName; + PCWSTR PidlPath; + } Tests[] = + { + { L"", -1, CSIDL_MYDOCUMENTS, 0x00000009 }, + { L"/e", TRUE, PIDL_IS_UNTOUCHED, 0x00000008 }, + { L"/n", TRUE, PIDL_IS_UNTOUCHED, 0x00004001 }, + { L"/x", TRUE, PIDL_IS_NULL, 0x02000000, L"/x" }, + { L"-e", TRUE, PIDL_IS_NULL, 0x02000000, L"-e" }, + { L"C:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, + { L"/e,C:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, + /* TODO: needs a lot more testcases */ + }; + const int TestCount = sizeof(Tests) / sizeof(Tests[0]); + PWSTR CommandLine; + WCHAR OriginalCommandLine[1024]; + int i; + + CommandLine = GetCommandLine(); + (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); + + for (i = 0; i < TestCount; i++) + { + wcscpy(CommandLine, L"browseui_apitest.exe "); + wcscat(CommandLine, Tests[i].CommandLine); + trace("Command line: %ls\n", CommandLine); + TestCommandLine(Tests[i].ExpectedRet, + Tests[i].ExpectedCsidl, + Tests[i].ExpectedFlags, + Tests[i].ExpectedFileName, + Tests[i].PidlPath); + } + + wcscpy(CommandLine, OriginalCommandLine); +} diff --git a/rostests/apitests/browseui/testlist.c b/rostests/apitests/browseui/testlist.c new file mode 100644 index 00000000000..6a47ca483e7 --- /dev/null +++ b/rostests/apitests/browseui/testlist.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include + +#define STANDALONE +#include "wine/test.h" + +extern void func_SHExplorerParseCmdLine(void); + +const struct test winetest_testlist[] = +{ + { "SHExplorerParseCmdLine", func_SHExplorerParseCmdLine }, + + { 0, 0 } +}; + From 1cb3985a6916dd9dab77abbfbe1fe4881aa5bf5b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 26 Jan 2013 09:34:12 +0000 Subject: [PATCH 49/71] [FREELDR] Return NULL, not FALSE on failure in Ext2ReadBlockPointerList svn path=/trunk/; revision=58219 --- reactos/boot/freeldr/freeldr/fs/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/fs/ext2.c b/reactos/boot/freeldr/freeldr/fs/ext2.c index b39ed32af6d..1e5432578bb 100644 --- a/reactos/boot/freeldr/freeldr/fs/ext2.c +++ b/reactos/boot/freeldr/freeldr/fs/ext2.c @@ -1049,7 +1049,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) if (!Ext2CopyIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } } @@ -1059,7 +1059,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.double_indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } } @@ -1069,7 +1069,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) if (!Ext2CopyTripleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.tripple_indir_block)) { MmHeapFree(BlockList); - return FALSE; + return NULL; } } From 085adf3da0b1cccc062b1b651094ebb01616291f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 26 Jan 2013 11:23:05 +0000 Subject: [PATCH 50/71] [SAMSRV] Start implementing SamrDeleteAlias and SamrDeleteUser. WIP svn path=/trunk/; revision=58220 --- reactos/dll/win32/samsrv/samrpc.c | 78 +++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 499544391ca..6c20b8d33c8 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -4553,8 +4553,41 @@ NTSTATUS NTAPI SamrDeleteAlias(IN OUT SAMPR_HANDLE *AliasHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT AliasObject; + NTSTATUS Status; + + /* Validate the alias handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + DELETE, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Fail, if the alias is built-in */ + if (AliasObject->RelativeId < 1000) + { + TRACE("You can not delete a special account!\n"); + return STATUS_SPECIAL_ACCOUNT; + } + + /* FIXME: Remove all members from the alias */ + + /* Delete the alias from the database */ + Status = SampDeleteAccountDbObject(AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Invalidate the handle */ + *AliasHandle = NULL; + + return Status; } @@ -4963,8 +4996,45 @@ NTSTATUS NTAPI SamrDeleteUser(IN OUT SAMPR_HANDLE *UserHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT UserObject; + NTSTATUS Status; + + TRACE("(%p)\n", UserHandle); + + /* Validate the user handle */ + Status = SampValidateDbObject(*UserHandle, + SamDbUserObject, + DELETE, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Fail, if the user is built-in */ + if (UserObject->RelativeId < 1000) + { + TRACE("You can not delete a special account!\n"); + return STATUS_SPECIAL_ACCOUNT; + } + + /* FIXME: Remove the user from all groups */ + + /* FIXME: Remove the user from all aliases */ + + /* Delete the user from the database */ + Status = SampDeleteAccountDbObject(UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Invalidate the handle */ + *UserHandle = NULL; + + return STATUS_SUCCESS; } From 31309d62c1b4f0ee18b6f1f58917fb3d220b4b19 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 26 Jan 2013 12:18:55 +0000 Subject: [PATCH 51/71] [SAMSRV] Implement SamrQueryInformationDomain2 and SamrQueryInformationUser2. svn path=/trunk/; revision=58221 --- reactos/dll/win32/samsrv/samrpc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index 6c20b8d33c8..b059698a186 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -6957,6 +6957,7 @@ SamrRemoveMemberFromForeignDomain(IN SAMPR_HANDLE DomainHandle, return STATUS_NOT_IMPLEMENTED; } + /* Function 46 */ NTSTATUS NTAPI @@ -6964,10 +6965,14 @@ SamrQueryInformationDomain2(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); + + return SamrQueryInformationDomain(DomainHandle, + DomainInformationClass, + Buffer); } + /* Function 47 */ NTSTATUS NTAPI @@ -6975,10 +6980,14 @@ SamrQueryInformationUser2(IN SAMPR_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PSAMPR_USER_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + + return SamrQueryInformationUser(UserHandle, + UserInformationClass, + Buffer); } + /* Function 48 */ NTSTATUS NTAPI From 8479fd6f47681ceda7b6deab8946cd8fb9dd469d Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 26 Jan 2013 13:03:33 +0000 Subject: [PATCH 52/71] [SAMSRV] Implement SamrQueryDisplayInformation2, SamrGetDisplayEnumerationIndex2 and SamrQueryDisplayInformation3. svn path=/trunk/; revision=58222 --- reactos/dll/win32/samsrv/samrpc.c | 40 ++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c index b059698a186..687956620d5 100644 --- a/reactos/dll/win32/samsrv/samrpc.c +++ b/reactos/dll/win32/samsrv/samrpc.c @@ -7000,10 +7000,22 @@ SamrQueryDisplayInformation2(IN SAMPR_HANDLE DomainHandle, OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("%p %lu %lu %lu %lu %p %p %p\n", + DomainHandle, DisplayInformationClass, Index, + EntryCount, PreferredMaximumLength, TotalAvailable, + TotalReturned, Buffer); + + return SamrQueryDisplayInformation(DomainHandle, + DisplayInformationClass, + Index, + EntryCount, + PreferredMaximumLength, + TotalAvailable, + TotalReturned, + Buffer); } + /* Function 49 */ NTSTATUS NTAPI @@ -7012,8 +7024,13 @@ SamrGetDisplayEnumerationIndex2(IN SAMPR_HANDLE DomainHandle, IN PRPC_UNICODE_STRING Prefix, OUT unsigned long *Index) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("(%p %lu %p %p)\n", + DomainHandle, DisplayInformationClass, Prefix, Index); + + return SamrGetDisplayEnumerationIndex(DomainHandle, + DisplayInformationClass, + Prefix, + Index); } @@ -7302,8 +7319,19 @@ SamrQueryDisplayInformation3(IN SAMPR_HANDLE DomainHandle, OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("%p %lu %lu %lu %lu %p %p %p\n", + DomainHandle, DisplayInformationClass, Index, + EntryCount, PreferredMaximumLength, TotalAvailable, + TotalReturned, Buffer); + + return SamrQueryDisplayInformation(DomainHandle, + DisplayInformationClass, + Index, + EntryCount, + PreferredMaximumLength, + TotalAvailable, + TotalReturned, + Buffer); } From 9f6d7cdd67442ca307693ff67b26176d9e716d97 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 26 Jan 2013 13:33:15 +0000 Subject: [PATCH 53/71] [CRT] - Import C++ compiler support headers from mingw-w64 (with some fixes) - Implement the required parts of the comsupp library svn path=/trunk/; revision=58223 --- reactos/include/crt/comdef.h | 211 ++++ reactos/include/crt/comdefsp.h | 1316 ++++++++++++++++++++++++ reactos/include/crt/comip.h | 378 +++++++ reactos/include/crt/comutil.h | 1212 ++++++++++++++++++++++ reactos/lib/sdk/CMakeLists.txt | 1 + reactos/lib/sdk/comsupp/CMakeLists.txt | 5 + reactos/lib/sdk/comsupp/comsupp.cpp | 47 + 7 files changed, 3170 insertions(+) create mode 100644 reactos/include/crt/comdef.h create mode 100644 reactos/include/crt/comdefsp.h create mode 100644 reactos/include/crt/comip.h create mode 100644 reactos/include/crt/comutil.h create mode 100644 reactos/lib/sdk/comsupp/CMakeLists.txt create mode 100644 reactos/lib/sdk/comsupp/comsupp.cpp diff --git a/reactos/include/crt/comdef.h b/reactos/include/crt/comdef.h new file mode 100644 index 00000000000..9448c061394 --- /dev/null +++ b/reactos/include/crt/comdef.h @@ -0,0 +1,211 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_COMDEF +#define _INC_COMDEF + +#include <_mingw.h> + +#ifndef RC_INVOKED + +#ifndef __cplusplus +#error Native Compiler support only available in C++ compiler +#endif + +#include +#include +#include + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +#ifdef __cplusplus + +class _com_error; +void WINAPI _com_raise_error(HRESULT hr,IErrorInfo *perrinfo = 0); +void WINAPI _set_com_error_handler(void (WINAPI *pHandler)(HRESULT hr,IErrorInfo *perrinfo)); +void WINAPI _com_issue_error(HRESULT); +void WINAPI _com_issue_errorex(HRESULT,IUnknown*,REFIID); +HRESULT WINAPI _com_dispatch_propget(IDispatch*,DISPID,VARTYPE,void*); +HRESULT __cdecl _com_dispatch_propput(IDispatch*,DISPID,VARTYPE,...); +HRESULT __cdecl _com_dispatch_method(IDispatch*,DISPID,WORD,VARTYPE,void*,const wchar_t*,...); +HRESULT WINAPI _com_dispatch_raw_propget(IDispatch*,DISPID,VARTYPE,void*) throw(); +HRESULT __cdecl _com_dispatch_raw_propput(IDispatch*,DISPID,VARTYPE,...) throw(); +HRESULT __cdecl _com_dispatch_raw_method(IDispatch*,DISPID,WORD,VARTYPE,void*,const wchar_t*,...) throw(); + +class _com_error { +public: + _com_error(HRESULT hr,IErrorInfo *perrinfo = NULL,bool fAddRef = false) throw(); + _com_error(const _com_error &that) throw(); + virtual ~_com_error() throw(); + _com_error &operator=(const _com_error &that) throw(); + HRESULT Error() const throw(); + WORD WCode() const throw(); + IErrorInfo *ErrorInfo() const throw(); + _bstr_t Description() const; + DWORD HelpContext() const throw(); + _bstr_t HelpFile() const; + _bstr_t Source() const; + GUID GUID_() const throw(); + const TCHAR *ErrorMessage() const throw(); + static HRESULT WCodeToHRESULT(WORD wCode) throw(); + static WORD HRESULTToWCode(HRESULT hr) throw(); +private: + void Dtor() throw(); + void Ctor(const _com_error &that) throw(); + enum { + WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR,FACILITY_ITF,0x200),WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR,FACILITY_ITF+1,0) - 1 + }; + HRESULT m_hresult; + IErrorInfo *m_perrinfo; + mutable TCHAR *m_pszMsg; +}; + +inline _com_error::_com_error(HRESULT hr,IErrorInfo *perrinfo,bool fAddRef) throw() : m_hresult(hr),m_perrinfo(perrinfo),m_pszMsg(NULL) { + if(m_perrinfo!=NULL && fAddRef) m_perrinfo->AddRef(); +} + +inline _com_error::_com_error(const _com_error &that) throw() { + Ctor(that); +} + +inline _com_error::~_com_error() throw() { + Dtor(); +} + +inline _com_error &_com_error::operator=(const _com_error &that) throw() { + if(this!=&that) { + Dtor(); + Ctor(that); + } + return *this; +} + +inline HRESULT _com_error::Error() const throw() { return m_hresult; } +inline WORD _com_error::WCode() const throw() { return HRESULTToWCode(m_hresult); } + +inline IErrorInfo *_com_error::ErrorInfo() const throw() { + if(m_perrinfo!=NULL) m_perrinfo->AddRef(); + return m_perrinfo; +} + +inline _bstr_t _com_error::Description() const { + BSTR bstr = NULL; + if(m_perrinfo!=NULL) m_perrinfo->GetDescription(&bstr); + return _bstr_t(bstr,false); +} + +inline DWORD _com_error::HelpContext() const throw() { + DWORD dwHelpContext = 0; + if(m_perrinfo!=NULL) m_perrinfo->GetHelpContext(&dwHelpContext); + return dwHelpContext; +} + +inline _bstr_t _com_error::HelpFile() const { + BSTR bstr = NULL; + if(m_perrinfo!=NULL) m_perrinfo->GetHelpFile(&bstr); + return _bstr_t(bstr,false); +} + +inline _bstr_t _com_error::Source() const { + BSTR bstr = NULL; + if(m_perrinfo!=NULL) m_perrinfo->GetSource(&bstr); + return _bstr_t(bstr,false); +} + +inline _GUID _com_error::GUID_() const throw() { + _GUID guid; + memset (&guid, 0, sizeof (_GUID)); + if(m_perrinfo!=NULL) m_perrinfo->GetGUID(&guid); + return guid; +} + +inline const TCHAR *_com_error::ErrorMessage() const throw() { + if(!m_pszMsg) { + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,NULL,m_hresult,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&m_pszMsg,0,NULL); + if(m_pszMsg!=NULL) { + int nLen = lstrlen(m_pszMsg); + if(nLen > 1 && m_pszMsg[nLen - 1]=='\n') { + m_pszMsg[nLen-1] = 0; + if(m_pszMsg[nLen - 2]=='\r') m_pszMsg[nLen-2] = 0; + } + } else { + m_pszMsg = (LPTSTR)LocalAlloc(0,32 *sizeof(TCHAR)); + if(m_pszMsg!=NULL) { + WORD wCode = WCode(); + if(wCode!=0) { + _COM_PRINTF_S_1(m_pszMsg,32,TEXT("IDispatch error #%d"),wCode); + } else { + _COM_PRINTF_S_1(m_pszMsg,32,TEXT("Unknown error 0x%0lX"),m_hresult); + } + } + } + } + return m_pszMsg; +} + +inline HRESULT _com_error::WCodeToHRESULT(WORD wCode) throw() { return wCode >= 0xFE00 ? WCODE_HRESULT_LAST : WCODE_HRESULT_FIRST + wCode; } +inline WORD _com_error::HRESULTToWCode(HRESULT hr) throw() { return (hr >= WCODE_HRESULT_FIRST && hr <= WCODE_HRESULT_LAST) ? WORD(hr - WCODE_HRESULT_FIRST) : 0; } + +inline void _com_error::Dtor() throw() { + if(m_perrinfo!=NULL) m_perrinfo->Release(); + if(m_pszMsg!=NULL) LocalFree((HLOCAL)m_pszMsg); +} + +inline void _com_error::Ctor(const _com_error &that) throw() { + m_hresult = that.m_hresult; + m_perrinfo = that.m_perrinfo; + m_pszMsg = NULL; + if(m_perrinfo!=NULL) m_perrinfo->AddRef(); +} + +typedef int __missing_type__; + +#if !defined(_COM_SMARTPTR) +#if !defined(_INC_COMIP) +#include +#endif +#define _COM_SMARTPTR _com_ptr_t +#define _COM_SMARTPTR_LEVEL2 _com_IIID +#endif +#if defined(_COM_SMARTPTR) +#if !defined(_COM_SMARTPTR_TYPEDEF) +#if defined(_COM_SMARTPTR_LEVEL2) +#define _COM_SMARTPTR_TYPEDEF(Interface,IID) UUID IIDArgForTypedef ## Interface = IID; typedef _COM_SMARTPTR< _COM_SMARTPTR_LEVEL2 > Interface ## Ptr +#else +#define _COM_SMARTPTR_TYPEDEF(Interface,IID) UUID IIDArgForTypedef ## Interface = IID; typedef _COM_SMARTPTR Interface ## Ptr +#endif +#endif +#endif + +#if !defined(_COM_NO_STANDARD_GUIDS_) +#if defined(__IFontDisp_INTERFACE_DEFINED__) +#if !defined(Font) + struct Font : IFontDisp {}; +#endif +_COM_SMARTPTR_TYPEDEF(Font, IID_IDispatch); + +#endif +#if defined(__IFontEventsDisp_INTERFACE_DEFINED__) +#if !defined(FontEvents) + struct FontEvents : IFontEventsDisp {}; +#endif +_COM_SMARTPTR_TYPEDEF(FontEvents, IID_IDispatch); +#endif +#if defined(__IPictureDisp_INTERFACE_DEFINED__) +#if !defined(Picture) + struct Picture : IPictureDisp {}; +#endif +_COM_SMARTPTR_TYPEDEF(Picture, IID_IDispatch); +#endif + +#include "comdefsp.h" +#endif +#endif + +#endif /* __cplusplus */ + +#endif diff --git a/reactos/include/crt/comdefsp.h b/reactos/include/crt/comdefsp.h new file mode 100644 index 00000000000..e024b4ffd36 --- /dev/null +++ b/reactos/include/crt/comdefsp.h @@ -0,0 +1,1316 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#if !defined(_INC_COMDEFSP) +#define _INC_COMDEFSP + +#include <_mingw.h> + +#if !defined(RC_INVOKED) && USE___UUIDOF != 0 + +#ifndef __cplusplus +#error Native compiler support only available in C++ compiler. +#endif + +#ifndef _COM_SMARTPTR_TYPEDEF +#error The header file comdefsp.h requires comdef.h to be included first. +#endif + +#if defined(__AsyncIAdviseSink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIAdviseSink,IID_AsyncIAdviseSink); +#endif +#if defined(__AsyncIAdviseSink2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIAdviseSink2,IID_AsyncIAdviseSink2); +#endif +#if defined(__AsyncIMultiQI_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIMultiQI,IID_AsyncIMultiQI); +#endif +#if defined(__AsyncIPipeByte_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIPipeByte,IID_AsyncIPipeByte); +#endif +#if defined(__AsyncIPipeDouble_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIPipeDouble,IID_AsyncIPipeDouble); +#endif +#if defined(__AsyncIPipeLong_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIPipeLong,IID_AsyncIPipeLong); +#endif +#if defined(__AsyncIUnknown_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(AsyncIUnknown,IID_AsyncIUnknown); +#endif +#if defined(__FolderItem_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(FolderItem,IID_FolderItem); +#endif +#if defined(__FolderItemVerb_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(FolderItemVerb,IID_FolderItemVerb); +#endif +#if defined(__FolderItemVerbs_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(FolderItemVerbs,IID_FolderItemVerbs); +#endif +#if defined(__FolderItems_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(FolderItems,IID_FolderItems); +#endif +#if defined(__IAccessible_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAccessible,IID_IAccessible); +#endif +#if defined(__IActiveScript_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScript,IID_IActiveScript); +#endif +#if defined(__IActiveScriptError_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptError,IID_IActiveScriptError); +#endif +#if defined(__IActiveScriptParse_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptParse,IID_IActiveScriptParse); +#endif +#if defined(__IActiveScriptParseProcedure_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptParseProcedure,IID_IActiveScriptParseProcedure); +#endif +#if defined(__IActiveScriptParseProcedureOld_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptParseProcedureOld,IID_IActiveScriptParseProcedureOld); +#endif +#if defined(__IActiveScriptSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptSite,IID_IActiveScriptSite); +#endif +#if defined(__IActiveScriptSiteInterruptPoll_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptSiteInterruptPoll,IID_IActiveScriptSiteInterruptPoll); +#endif +#if defined(__IActiveScriptSiteWindow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptSiteWindow,IID_IActiveScriptSiteWindow); +#endif +#if defined(__IActiveScriptStats_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IActiveScriptStats,IID_IActiveScriptStats); +#endif +#if defined(__IAddrExclusionControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAddrExclusionControl,IID_IAddrExclusionControl); +#endif +#if defined(__IAddrTrackingControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAddrTrackingControl,IID_IAddrTrackingControl); +#endif +#if defined(__IAdviseSink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAdviseSink,IID_IAdviseSink); +#endif +#if defined(__IAdviseSink2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAdviseSink2,IID_IAdviseSink2); +#endif +#if defined(__IAdviseSinkEx_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAdviseSinkEx,IID_IAdviseSinkEx); +#endif +#if defined(__IAsyncManager_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAsyncManager,IID_IAsyncManager); +#endif +#if defined(__IAsyncRpcChannelBuffer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAsyncRpcChannelBuffer,IID_IAsyncRpcChannelBuffer); +#endif +#if defined(__IAuthenticate_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IAuthenticate,IID_IAuthenticate); +#endif +#if defined(__IBindCtx_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBindCtx,IID_IBindCtx); +#endif +#if defined(__IBindEventHandler_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBindEventHandler,IID_IBindEventHandler); +#endif +#if defined(__IBindHost_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBindHost,IID_IBindHost); +#endif +#if defined(__IBindProtocol_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBindProtocol,IID_IBindProtocol); +#endif +#if defined(__IBindStatusCallback_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBindStatusCallback,IID_IBindStatusCallback); +#endif +#if defined(__IBinding_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBinding,IID_IBinding); +#endif +#if defined(__IBlockingLock_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IBlockingLock,IID_IBlockingLock); +#endif +#if defined(__ICSSFilter_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICSSFilter,IID_ICSSFilter); +#endif +#if defined(__ICSSFilterSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICSSFilterSite,IID_ICSSFilterSite); +#endif +#if defined(__ICallFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICallFactory,IID_ICallFactory); +#endif +#if defined(__ICancelMethodCalls_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICancelMethodCalls,IID_ICancelMethodCalls); +#endif +#if defined(__ICatInformation_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICatInformation,IID_ICatInformation); +#endif +#if defined(__ICatRegister_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICatRegister,IID_ICatRegister); +#endif +#if defined(__ICatalogFileInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICatalogFileInfo,IID_ICatalogFileInfo); +#endif +#if defined(__IChannelHook_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IChannelHook,IID_IChannelHook); +#endif +#if defined(__IChannelMgr_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IChannelMgr,IID_IChannelMgr); +#endif +#if defined(__IClassActivator_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IClassActivator,IID_IClassActivator); +#endif +#if defined(__IClassFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IClassFactory,IID_IClassFactory); +#endif +#if defined(__IClassFactory2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IClassFactory2,IID_IClassFactory2); +#endif +#if defined(__IClientSecurity_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IClientSecurity,IID_IClientSecurity); +#endif +#if defined(__ICodeInstall_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICodeInstall,IID_ICodeInstall); +#endif +#if defined(__IConnectionPoint_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IConnectionPoint,IID_IConnectionPoint); +#endif +#if defined(__IConnectionPointContainer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IConnectionPointContainer,IID_IConnectionPointContainer); +#endif +#if defined(__IContinue_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IContinue,IID_IContinue); +#endif +#if defined(__IContinueCallback_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IContinueCallback,IID_IContinueCallback); +#endif +#if defined(__ICreateErrorInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICreateErrorInfo,IID_ICreateErrorInfo); +#endif +#if defined(__ICreateTypeInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICreateTypeInfo,IID_ICreateTypeInfo); +#endif +#if defined(__ICreateTypeInfo2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICreateTypeInfo2,IID_ICreateTypeInfo2); +#endif +#if defined(__ICreateTypeLib_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICreateTypeLib,IID_ICreateTypeLib); +#endif +#if defined(__ICreateTypeLib2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICreateTypeLib2,IID_ICreateTypeLib2); +#endif +#if defined(__ICustomDoc_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ICustomDoc,IID_ICustomDoc); +#endif +#if defined(__IDataAdviseHolder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDataAdviseHolder,IID_IDataAdviseHolder); +#endif +#if defined(__IDataFilter_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDataFilter,IID_IDataFilter); +#endif +#if defined(__IDataObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDataObject,IID_IDataObject); +#endif +#if defined(__IDeskBand_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDeskBand,IID_IDeskBand); +#endif +#if defined(__IDirectWriterLock_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDirectWriterLock,IID_IDirectWriterLock); +#endif +#if defined(__IDispError_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDispError,IID_IDispError); +#endif +#if defined(__IDispatch_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDispatch,IID_IDispatch); +#endif +#if defined(__IDispatchEx_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDispatchEx,IID_IDispatchEx); +#endif +#if defined(__IDocHostShowUI_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDocHostShowUI,IID_IDocHostShowUI); +#endif +#if defined(__IDocHostUIHandler_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDocHostUIHandler,IID_IDocHostUIHandler); +#endif +#if defined(__IDockingWindow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDockingWindow,IID_IDockingWindow); +#endif +#if defined(__IDropSource_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDropSource,IID_IDropSource); +#endif +#if defined(__IDropTarget_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDropTarget,IID_IDropTarget); +#endif +#if defined(__IDummyHICONIncluder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IDummyHICONIncluder,IID_IDummyHICONIncluder); +#endif +#if defined(__IEncodingFilterFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEncodingFilterFactory,IID_IEncodingFilterFactory); +#endif +#if defined(__IEnumCATEGORYINFO_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumCATEGORYINFO,IID_IEnumCATEGORYINFO); +#endif +#if defined(__IEnumChannels_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumChannels,IID_IEnumChannels); +#endif +#if defined(__IEnumCodePage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumCodePage,IID_IEnumCodePage); +#endif +#if defined(__IEnumConnectionPoints_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumConnectionPoints,IID_IEnumConnectionPoints); +#endif +#if defined(__IEnumConnections_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumConnections,IID_IEnumConnections); +#endif +#if defined(__IEnumFORMATETC_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumFORMATETC,IID_IEnumFORMATETC); +#endif +#if defined(__IEnumGUID_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumGUID,IID_IEnumGUID); +#endif +#if defined(__IEnumHLITEM_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumHLITEM,IID_IEnumHLITEM); +#endif +#if defined(__IEnumIDList_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumIDList,IID_IEnumIDList); +#endif +#if defined(__IEnumMoniker_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumMoniker,IID_IEnumMoniker); +#endif +#if defined(__IEnumOLEVERB_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumOLEVERB,IID_IEnumOLEVERB); +#endif +#if defined(__IEnumOleDocumentViews_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumOleDocumentViews,IID_IEnumOleDocumentViews); +#endif +#if defined(__IEnumOleUndoUnits_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumOleUndoUnits,IID_IEnumOleUndoUnits); +#endif +#if defined(__IEnumRfc1766_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumRfc1766,IID_IEnumRfc1766); +#endif +#if defined(__IEnumSTATDATA_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumSTATDATA,IID_IEnumSTATDATA); +#endif +#if defined(__IEnumSTATPROPSETSTG_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumSTATPROPSETSTG,IID_IEnumSTATPROPSETSTG); +#endif +#if defined(__IEnumSTATPROPSTG_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumSTATPROPSTG,IID_IEnumSTATPROPSTG); +#endif +#if defined(__IEnumSTATSTG_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumSTATSTG,IID_IEnumSTATSTG); +#endif +#if defined(__IEnumSTATURL_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumSTATURL,IID_IEnumSTATURL); +#endif +#if defined(__IEnumString_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumString,IID_IEnumString); +#endif +#if defined(__IEnumUnknown_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumUnknown,IID_IEnumUnknown); +#endif +#if defined(__IEnumVARIANT_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IEnumVARIANT,IID_IEnumVARIANT); +#endif +#if defined(__IErrorInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IErrorInfo,IID_IErrorInfo); +#endif +#if defined(__IErrorLog_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IErrorLog,IID_IErrorLog); +#endif +#if defined(__IExtensionServices_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IExtensionServices,IID_IExtensionServices); +#endif +#if defined(__IExternalConnection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IExternalConnection,IID_IExternalConnection); +#endif +#if defined(__IFillLockBytes_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFillLockBytes,IID_IFillLockBytes); +#endif +#if defined(__IFilter_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFilter,IID_IFilter); +#endif +#if defined(__IFolderViewOC_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFolderViewOC,IID_IFolderViewOC); +#endif +#if defined(__IFont_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFont,IID_IFont); +#endif +#if defined(__IFontDisp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFontDisp,IID_IFontDisp); +#endif +#if defined(__IFontEventsDisp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IFontEventsDisp,IID_IFontEventsDisp); +#endif +#if defined(__IForegroundTransfer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IForegroundTransfer,IID_IForegroundTransfer); +#endif +#if defined(__IGlobalInterfaceTable_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IGlobalInterfaceTable,IID_IGlobalInterfaceTable); +#endif +#if defined(__IHTMLAnchorElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLAnchorElement,IID_IHTMLAnchorElement); +#endif +#if defined(__IHTMLAreaElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLAreaElement,IID_IHTMLAreaElement); +#endif +#if defined(__IHTMLAreasCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLAreasCollection,IID_IHTMLAreasCollection); +#endif +#if defined(__IHTMLBGsound_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBGsound,IID_IHTMLBGsound); +#endif +#if defined(__IHTMLBRElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBRElement,IID_IHTMLBRElement); +#endif +#if defined(__IHTMLBaseElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBaseElement,IID_IHTMLBaseElement); +#endif +#if defined(__IHTMLBaseFontElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBaseFontElement,IID_IHTMLBaseFontElement); +#endif +#if defined(__IHTMLBlockElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBlockElement,IID_IHTMLBlockElement); +#endif +#if defined(__IHTMLBodyElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLBodyElement,IID_IHTMLBodyElement); +#endif +#if defined(__IHTMLButtonElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLButtonElement,IID_IHTMLButtonElement); +#endif +#if defined(__IHTMLCommentElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLCommentElement,IID_IHTMLCommentElement); +#endif +#if defined(__IHTMLControlElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLControlElement,IID_IHTMLControlElement); +#endif +#if defined(__IHTMLControlRange_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLControlRange,IID_IHTMLControlRange); +#endif +#if defined(__IHTMLDDElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDDElement,IID_IHTMLDDElement); +#endif +#if defined(__IHTMLDListElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDListElement,IID_IHTMLDListElement); +#endif +#if defined(__IHTMLDTElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDTElement,IID_IHTMLDTElement); +#endif +#if defined(__IHTMLDatabinding_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDatabinding,IID_IHTMLDatabinding); +#endif +#if defined(__IHTMLDialog_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDialog,IID_IHTMLDialog); +#endif +#if defined(__IHTMLDivElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDivElement,IID_IHTMLDivElement); +#endif +#if defined(__IHTMLDivPosition_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDivPosition,IID_IHTMLDivPosition); +#endif +#if defined(__IHTMLDocument_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDocument,IID_IHTMLDocument); +#endif +#if defined(__IHTMLDocument2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLDocument2,IID_IHTMLDocument2); +#endif +#if defined(__IHTMLElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLElement,IID_IHTMLElement); +#endif +#if defined(__IHTMLElementCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLElementCollection,IID_IHTMLElementCollection); +#endif +#if defined(__IHTMLEmbedElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLEmbedElement,IID_IHTMLEmbedElement); +#endif +#if defined(__IHTMLEventObj_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLEventObj,IID_IHTMLEventObj); +#endif +#if defined(__IHTMLFieldSetElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFieldSetElement,IID_IHTMLFieldSetElement); +#endif +#if defined(__IHTMLFiltersCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFiltersCollection,IID_IHTMLFiltersCollection); +#endif +#if defined(__IHTMLFontElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFontElement,IID_IHTMLFontElement); +#endif +#if defined(__IHTMLFontNamesCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFontNamesCollection,IID_IHTMLFontNamesCollection); +#endif +#if defined(__IHTMLFontSizesCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFontSizesCollection,IID_IHTMLFontSizesCollection); +#endif +#if defined(__IHTMLFormElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFormElement,IID_IHTMLFormElement); +#endif +#if defined(__IHTMLFrameBase_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFrameBase,IID_IHTMLFrameBase); +#endif +#if defined(__IHTMLFrameElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFrameElement,IID_IHTMLFrameElement); +#endif +#if defined(__IHTMLFrameSetElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFrameSetElement,IID_IHTMLFrameSetElement); +#endif +#if defined(__IHTMLFramesCollection2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLFramesCollection2,IID_IHTMLFramesCollection2); +#endif +#if defined(__IHTMLHRElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLHRElement,IID_IHTMLHRElement); +#endif +#if defined(__IHTMLHeaderElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLHeaderElement,IID_IHTMLHeaderElement); +#endif +#if defined(__IHTMLIFrameElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLIFrameElement,IID_IHTMLIFrameElement); +#endif +#if defined(__IHTMLImageElementFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLImageElementFactory,IID_IHTMLImageElementFactory); +#endif +#if defined(__IHTMLImgElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLImgElement,IID_IHTMLImgElement); +#endif +#if defined(__IHTMLInputButtonElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLInputButtonElement,IID_IHTMLInputButtonElement); +#endif +#if defined(__IHTMLInputFileElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLInputFileElement,IID_IHTMLInputFileElement); +#endif +#if defined(__IHTMLInputHiddenElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLInputHiddenElement,IID_IHTMLInputHiddenElement); +#endif +#if defined(__IHTMLInputImage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLInputImage,IID_IHTMLInputImage); +#endif +#if defined(__IHTMLInputTextElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLInputTextElement,IID_IHTMLInputTextElement); +#endif +#if defined(__IHTMLIsIndexElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLIsIndexElement,IID_IHTMLIsIndexElement); +#endif +#if defined(__IHTMLLIElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLLIElement,IID_IHTMLLIElement); +#endif +#if defined(__IHTMLLabelElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLLabelElement,IID_IHTMLLabelElement); +#endif +#if defined(__IHTMLLegendElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLLegendElement,IID_IHTMLLegendElement); +#endif +#if defined(__IHTMLLinkElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLLinkElement,IID_IHTMLLinkElement); +#endif +#if defined(__IHTMLListElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLListElement,IID_IHTMLListElement); +#endif +#if defined(__IHTMLLocation_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLLocation,IID_IHTMLLocation); +#endif +#if defined(__IHTMLMapElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLMapElement,IID_IHTMLMapElement); +#endif +#if defined(__IHTMLMarqueeElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLMarqueeElement,IID_IHTMLMarqueeElement); +#endif +#if defined(__IHTMLMetaElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLMetaElement,IID_IHTMLMetaElement); +#endif +#if defined(__IHTMLMimeTypesCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLMimeTypesCollection,IID_IHTMLMimeTypesCollection); +#endif +#if defined(__IHTMLNextIdElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLNextIdElement,IID_IHTMLNextIdElement); +#endif +#if defined(__IHTMLNoShowElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLNoShowElement,IID_IHTMLNoShowElement); +#endif +#if defined(__IHTMLOListElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOListElement,IID_IHTMLOListElement); +#endif +#if defined(__IHTMLObjectElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLObjectElement,IID_IHTMLObjectElement); +#endif +#if defined(__IHTMLOpsProfile_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOpsProfile,IID_IHTMLOpsProfile); +#endif +#if defined(__IHTMLOptionButtonElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOptionButtonElement,IID_IHTMLOptionButtonElement); +#endif +#if defined(__IHTMLOptionElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOptionElement,IID_IHTMLOptionElement); +#endif +#if defined(__IHTMLOptionElementFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOptionElementFactory,IID_IHTMLOptionElementFactory); +#endif +#if defined(__IHTMLOptionsHolder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLOptionsHolder,IID_IHTMLOptionsHolder); +#endif +#if defined(__IHTMLParaElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLParaElement,IID_IHTMLParaElement); +#endif +#if defined(__IHTMLPhraseElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLPhraseElement,IID_IHTMLPhraseElement); +#endif +#if defined(__IHTMLPluginsCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLPluginsCollection,IID_IHTMLPluginsCollection); +#endif +#if defined(__IHTMLRuleStyle_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLRuleStyle,IID_IHTMLRuleStyle); +#endif +#if defined(__IHTMLScreen_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLScreen,IID_IHTMLScreen); +#endif +#if defined(__IHTMLScriptElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLScriptElement,IID_IHTMLScriptElement); +#endif +#if defined(__IHTMLSelectElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLSelectElement,IID_IHTMLSelectElement); +#endif +#if defined(__IHTMLSelectionObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLSelectionObject,IID_IHTMLSelectionObject); +#endif +#if defined(__IHTMLSpanElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLSpanElement,IID_IHTMLSpanElement); +#endif +#if defined(__IHTMLSpanFlow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLSpanFlow,IID_IHTMLSpanFlow); +#endif +#if defined(__IHTMLStyle_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyle,IID_IHTMLStyle); +#endif +#if defined(__IHTMLStyleElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleElement,IID_IHTMLStyleElement); +#endif +#if defined(__IHTMLStyleFontFace_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleFontFace,IID_IHTMLStyleFontFace); +#endif +#if defined(__IHTMLStyleSheet_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleSheet,IID_IHTMLStyleSheet); +#endif +#if defined(__IHTMLStyleSheetRule_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleSheetRule,IID_IHTMLStyleSheetRule); +#endif +#if defined(__IHTMLStyleSheetRulesCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleSheetRulesCollection,IID_IHTMLStyleSheetRulesCollection); +#endif +#if defined(__IHTMLStyleSheetsCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLStyleSheetsCollection,IID_IHTMLStyleSheetsCollection); +#endif +#if defined(__IHTMLTable_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTable,IID_IHTMLTable); +#endif +#if defined(__IHTMLTableCaption_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTableCaption,IID_IHTMLTableCaption); +#endif +#if defined(__IHTMLTableCell_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTableCell,IID_IHTMLTableCell); +#endif +#if defined(__IHTMLTableCol_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTableCol,IID_IHTMLTableCol); +#endif +#if defined(__IHTMLTableRow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTableRow,IID_IHTMLTableRow); +#endif +#if defined(__IHTMLTableSection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTableSection,IID_IHTMLTableSection); +#endif +#if defined(__IHTMLTextAreaElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTextAreaElement,IID_IHTMLTextAreaElement); +#endif +#if defined(__IHTMLTextContainer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTextContainer,IID_IHTMLTextContainer); +#endif +#if defined(__IHTMLTextElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTextElement,IID_IHTMLTextElement); +#endif +#if defined(__IHTMLTitleElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTitleElement,IID_IHTMLTitleElement); +#endif +#if defined(__IHTMLTxtRange_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLTxtRange,IID_IHTMLTxtRange); +#endif +#if defined(__IHTMLUListElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLUListElement,IID_IHTMLUListElement); +#endif +#if defined(__IHTMLUnknownElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLUnknownElement,IID_IHTMLUnknownElement); +#endif +#if defined(__IHTMLWindow2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHTMLWindow2,IID_IHTMLWindow2); +#endif +#if defined(__IHlink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHlink,IID_IHlink); +#endif +#if defined(__IHlinkBrowseContext_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHlinkBrowseContext,IID_IHlinkBrowseContext); +#endif +#if defined(__IHlinkFrame_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHlinkFrame,IID_IHlinkFrame); +#endif +#if defined(__IHlinkSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHlinkSite,IID_IHlinkSite); +#endif +#if defined(__IHlinkTarget_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHlinkTarget,IID_IHlinkTarget); +#endif +#if defined(__IHttpNegotiate_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHttpNegotiate,IID_IHttpNegotiate); +#endif +#if defined(__IHttpNegotiate2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHttpNegotiate2,IID_IHttpNegotiate2); +#endif +#if defined(__IHttpSecurity_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IHttpSecurity,IID_IHttpSecurity); +#endif +#if defined(__IImageDecodeEventSink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IImageDecodeEventSink,IID_IImageDecodeEventSink); +#endif +#if defined(__IImageDecodeFilter_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IImageDecodeFilter,IID_IImageDecodeFilter); +#endif +#if defined(__IInternalUnknown_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternalUnknown,IID_IInternalUnknown); +#endif +#if defined(__IInternet_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternet,IID_IInternet); +#endif +#if defined(__IInternetBindInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetBindInfo,IID_IInternetBindInfo); +#endif +#if defined(__IInternetHostSecurityManager_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetHostSecurityManager,IID_IInternetHostSecurityManager); +#endif +#if defined(__IInternetPriority_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetPriority,IID_IInternetPriority); +#endif +#if defined(__IInternetProtocol_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetProtocol,IID_IInternetProtocol); +#endif +#if defined(__IInternetProtocolInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetProtocolInfo,IID_IInternetProtocolInfo); +#endif +#if defined(__IInternetProtocolRoot_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetProtocolRoot,IID_IInternetProtocolRoot); +#endif +#if defined(__IInternetProtocolSink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetProtocolSink,IID_IInternetProtocolSink); +#endif +#if defined(__IInternetProtocolSinkStackable_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetProtocolSinkStackable,IID_IInternetProtocolSinkStackable); +#endif +#if defined(__IInternetSecurityManager_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetSecurityManager,IID_IInternetSecurityManager); +#endif +#if defined(__IInternetSecurityMgrSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetSecurityMgrSite,IID_IInternetSecurityMgrSite); +#endif +#if defined(__IInternetSession_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetSession,IID_IInternetSession); +#endif +#if defined(__IInternetThreadSwitch_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetThreadSwitch,IID_IInternetThreadSwitch); +#endif +#if defined(__IInternetZoneManager_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IInternetZoneManager,IID_IInternetZoneManager); +#endif +#if defined(__ILayoutStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ILayoutStorage,IID_ILayoutStorage); +#endif +#if defined(__ILockBytes_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ILockBytes,IID_ILockBytes); +#endif +#if defined(__IMLangCodePages_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangCodePages,IID_IMLangCodePages); +#endif +#if defined(__IMLangConvertCharset_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangConvertCharset,IID_IMLangConvertCharset); +#endif +#if defined(__IMLangFontLink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangFontLink,IID_IMLangFontLink); +#endif +#if defined(__IMLangLineBreakConsole_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangLineBreakConsole,IID_IMLangLineBreakConsole); +#endif +#if defined(__IMLangString_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangString,IID_IMLangString); +#endif +#if defined(__IMLangStringAStr_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangStringAStr,IID_IMLangStringAStr); +#endif +#if defined(__IMLangStringBufA_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangStringBufA,IID_IMLangStringBufA); +#endif +#if defined(__IMLangStringBufW_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangStringBufW,IID_IMLangStringBufW); +#endif +#if defined(__IMLangStringWStr_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMLangStringWStr,IID_IMLangStringWStr); +#endif +#if defined(__IMalloc_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMalloc,IID_IMalloc); +#endif +#if defined(__IMallocSpy_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMallocSpy,IID_IMallocSpy); +#endif +#if defined(__IMapMIMEToCLSID_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMapMIMEToCLSID,IID_IMapMIMEToCLSID); +#endif +#if defined(__IMarshal_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMarshal,IID_IMarshal); +#endif +#if defined(__IMarshal2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMarshal2,IID_IMarshal2); +#endif +#if defined(__IMessageFilter_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMessageFilter,IID_IMessageFilter); +#endif +#if defined(__IMimeInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMimeInfo,IID_IMimeInfo); +#endif +#if defined(__IMoniker_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMoniker,IID_IMoniker); +#endif +#if defined(__IMonikerProp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMonikerProp,IID_IMonikerProp); +#endif +#if defined(__IMultiLanguage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMultiLanguage,IID_IMultiLanguage); +#endif +#if defined(__IMultiQI_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IMultiQI,IID_IMultiQI); +#endif +#if defined(__IObjectIdentity_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IObjectIdentity,IID_IObjectIdentity); +#endif +#if defined(__IObjectSafety_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IObjectSafety,IID_IObjectSafety); +#endif +#if defined(__IObjectWithSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IObjectWithSite,IID_IObjectWithSite); +#endif +#if defined(__IOleAdviseHolder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleAdviseHolder,IID_IOleAdviseHolder); +#endif +#if defined(__IOleCache_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleCache,IID_IOleCache); +#endif +#if defined(__IOleCache2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleCache2,IID_IOleCache2); +#endif +#if defined(__IOleCacheControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleCacheControl,IID_IOleCacheControl); +#endif +#if defined(__IOleClientSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleClientSite,IID_IOleClientSite); +#endif +#if defined(__IOleCommandTarget_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleCommandTarget,IID_IOleCommandTarget); +#endif +#if defined(__IOleContainer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleContainer,IID_IOleContainer); +#endif +#if defined(__IOleControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleControl,IID_IOleControl); +#endif +#if defined(__IOleControlSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleControlSite,IID_IOleControlSite); +#endif +#if defined(__IOleDocument_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleDocument,IID_IOleDocument); +#endif +#if defined(__IOleDocumentSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleDocumentSite,IID_IOleDocumentSite); +#endif +#if defined(__IOleDocumentView_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleDocumentView,IID_IOleDocumentView); +#endif +#if defined(__IOleInPlaceActiveObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceActiveObject,IID_IOleInPlaceActiveObject); +#endif +#if defined(__IOleInPlaceFrame_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceFrame,IID_IOleInPlaceFrame); +#endif +#if defined(__IOleInPlaceObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceObject,IID_IOleInPlaceObject); +#endif +#if defined(__IOleInPlaceObjectWindowless_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceObjectWindowless,IID_IOleInPlaceObjectWindowless); +#endif +#if defined(__IOleInPlaceSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceSite,IID_IOleInPlaceSite); +#endif +#if defined(__IOleInPlaceSiteEx_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceSiteEx,IID_IOleInPlaceSiteEx); +#endif +#if defined(__IOleInPlaceSiteWindowless_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceSiteWindowless,IID_IOleInPlaceSiteWindowless); +#endif +#if defined(__IOleInPlaceUIWindow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleInPlaceUIWindow,IID_IOleInPlaceUIWindow); +#endif +#if defined(__IOleItemContainer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleItemContainer,IID_IOleItemContainer); +#endif +#if defined(__IOleLink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleLink,IID_IOleLink); +#endif +#if defined(__IOleObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleObject,IID_IOleObject); +#endif +#if defined(__IOleParentUndoUnit_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleParentUndoUnit,IID_IOleParentUndoUnit); +#endif +#if defined(__IOleUndoManager_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleUndoManager,IID_IOleUndoManager); +#endif +#if defined(__IOleUndoUnit_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleUndoUnit,IID_IOleUndoUnit); +#endif +#if defined(__IOleWindow_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOleWindow,IID_IOleWindow); +#endif +#if defined(__IOmHistory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOmHistory,IID_IOmHistory); +#endif +#if defined(__IOmNavigator_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOmNavigator,IID_IOmNavigator); +#endif +#if defined(__IOplockStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IOplockStorage,IID_IOplockStorage); +#endif +#if defined(__IPSFactoryBuffer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPSFactoryBuffer,IID_IPSFactoryBuffer); +#endif +#if defined(__IParseDisplayName_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IParseDisplayName,IID_IParseDisplayName); +#endif +#if defined(__IPerPropertyBrowsing_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPerPropertyBrowsing,IID_IPerPropertyBrowsing); +#endif +#if defined(__IPersist_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersist,IID_IPersist); +#endif +#if defined(__IPersistFile_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistFile,IID_IPersistFile); +#endif +#if defined(__IPersistFolder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistFolder,IID_IPersistFolder); +#endif +#if defined(__IPersistFolder2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistFolder2,IID_IPersistFolder2); +#endif +#if defined(__IPersistHistory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistHistory,IID_IPersistHistory); +#endif +#if defined(__IPersistMemory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistMemory,IID_IPersistMemory); +#endif +#if defined(__IPersistMoniker_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistMoniker,IID_IPersistMoniker); +#endif +#if defined(__IPersistPropertyBag_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistPropertyBag,IID_IPersistPropertyBag); +#endif +#if defined(__IPersistPropertyBag2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistPropertyBag2,IID_IPersistPropertyBag2); +#endif +#if defined(__IPersistStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistStorage,IID_IPersistStorage); +#endif +#if defined(__IPersistStream_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistStream,IID_IPersistStream); +#endif +#if defined(__IPersistStreamInit_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPersistStreamInit,IID_IPersistStreamInit); +#endif +#if defined(__IPicture_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPicture,IID_IPicture); +#endif +#if defined(__IPictureDisp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPictureDisp,IID_IPictureDisp); +#endif +#if defined(__IPipeByte_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPipeByte,IID_IPipeByte); +#endif +#if defined(__IPipeDouble_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPipeDouble,IID_IPipeDouble); +#endif +#if defined(__IPipeLong_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPipeLong,IID_IPipeLong); +#endif +#if defined(__IPointerInactive_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPointerInactive,IID_IPointerInactive); +#endif +#if defined(__IPrint_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPrint,IID_IPrint); +#endif +#if defined(__IProgressNotify_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IProgressNotify,IID_IProgressNotify); +#endif +#if defined(__IPropertyBag_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyBag,IID_IPropertyBag); +#endif +#if defined(__IPropertyBag2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyBag2,IID_IPropertyBag2); +#endif +#if defined(__IPropertyNotifySink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyNotifySink,IID_IPropertyNotifySink); +#endif +#if defined(__IPropertyPage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyPage,IID_IPropertyPage); +#endif +#if defined(__IPropertyPage2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyPage2,IID_IPropertyPage2); +#endif +#if defined(__IPropertyPageSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyPageSite,IID_IPropertyPageSite); +#endif +#if defined(__IPropertySetStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertySetStorage,IID_IPropertySetStorage); +#endif +#if defined(__IPropertyStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IPropertyStorage,IID_IPropertyStorage); +#endif +#if defined(__IProvideClassInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IProvideClassInfo,IID_IProvideClassInfo); +#endif +#if defined(__IProvideClassInfo2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IProvideClassInfo2,IID_IProvideClassInfo2); +#endif +#if defined(__IProvideMultipleClassInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IProvideMultipleClassInfo,IID_IProvideMultipleClassInfo); +#endif +#if defined(__IQuickActivate_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IQuickActivate,IID_IQuickActivate); +#endif +#if defined(__IROTData_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IROTData,IID_IROTData); +#endif +#if defined(__IRecordInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRecordInfo,IID_IRecordInfo); +#endif +#if defined(__IReleaseMarshalBuffers_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IReleaseMarshalBuffers,IID_IReleaseMarshalBuffers); +#endif +#if defined(__IRootStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRootStorage,IID_IRootStorage); +#endif +#if defined(__IRpcChannelBuffer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcChannelBuffer,IID_IRpcChannelBuffer); +#endif +#if defined(__IRpcChannelBuffer2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcChannelBuffer2,IID_IRpcChannelBuffer2); +#endif +#if defined(__IRpcChannelBuffer3_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcChannelBuffer3,IID_IRpcChannelBuffer3); +#endif +#if defined(__IRpcHelper_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcHelper,IID_IRpcHelper); +#endif +#if defined(__IRpcOptions_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcOptions,IID_IRpcOptions); +#endif +#if defined(__IRpcProxyBuffer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcProxyBuffer,IID_IRpcProxyBuffer); +#endif +#if defined(__IRpcStubBuffer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcStubBuffer,IID_IRpcStubBuffer); +#endif +#if defined(__IRpcSyntaxNegotiate_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRpcSyntaxNegotiate,IID_IRpcSyntaxNegotiate); +#endif +#if defined(__IRunnableObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRunnableObject,IID_IRunnableObject); +#endif +#if defined(__IRunningObjectTable_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IRunningObjectTable,IID_IRunningObjectTable); +#endif +#if defined(__ISequentialStream_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISequentialStream,IID_ISequentialStream); +#endif +#if defined(__IServerSecurity_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IServerSecurity,IID_IServerSecurity); +#endif +#if defined(__IServiceProvider_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IServiceProvider,IID_IServiceProvider); +#endif +#if defined(__IShellBrowser_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellBrowser,IID_IShellBrowser); +#endif +#if defined(__IShellDispatch_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellDispatch,IID_IShellDispatch); +#endif +#if defined(__IShellExtInit_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellExtInit,IID_IShellExtInit); +#endif +#if defined(__IShellFolder_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellFolder,IID_IShellFolder); +#endif +#if defined(__IShellFolderViewDual_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellFolderViewDual,IID_IShellFolderViewDual); +#endif +#if defined(__IShellLinkA_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellLinkA,IID_IShellLinkA); +#endif +#if defined(__IShellLinkDual_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellLinkDual,IID_IShellLinkDual); +#endif +#if defined(__IShellLinkW_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellLinkW,IID_IShellLinkW); +#endif +#if defined(__IShellPropSheetExt_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellPropSheetExt,IID_IShellPropSheetExt); +#endif +#if defined(__IShellUIHelper_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellUIHelper,IID_IShellUIHelper); +#endif +#if defined(__IShellView_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellView,IID_IShellView); +#endif +#if defined(__IShellView2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellView2,IID_IShellView2); +#endif +#if defined(__IShellWindows_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IShellWindows,IID_IShellWindows); +#endif +#if defined(__ISimpleFrameSite_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISimpleFrameSite,IID_ISimpleFrameSite); +#endif +#if defined(__ISoftDistExt_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISoftDistExt,IID_ISoftDistExt); +#endif +#if defined(__ISpecifyPropertyPages_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISpecifyPropertyPages,IID_ISpecifyPropertyPages); +#endif +#if defined(__IStdMarshalInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IStdMarshalInfo,IID_IStdMarshalInfo); +#endif +#if defined(__IStorage_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IStorage,IID_IStorage); +#endif +#if defined(__IStream_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IStream,IID_IStream); +#endif +#if defined(__ISubscriptionMgr_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISubscriptionMgr,IID_ISubscriptionMgr); +#endif +#if defined(__ISupportErrorInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISupportErrorInfo,IID_ISupportErrorInfo); +#endif +#if defined(__ISurrogate_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISurrogate,IID_ISurrogate); +#endif +#if defined(__ISynchronize_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISynchronize,IID_ISynchronize); +#endif +#if defined(__ISynchronizeContainer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISynchronizeContainer,IID_ISynchronizeContainer); +#endif +#if defined(__ISynchronizeEvent_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISynchronizeEvent,IID_ISynchronizeEvent); +#endif +#if defined(__ISynchronizeHandle_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISynchronizeHandle,IID_ISynchronizeHandle); +#endif +#if defined(__ISynchronizeMutex_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ISynchronizeMutex,IID_ISynchronizeMutex); +#endif +#if defined(__IThumbnailExtractor_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IThumbnailExtractor,IID_IThumbnailExtractor); +#endif +#if defined(__ITimeAndNoticeControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITimeAndNoticeControl,IID_ITimeAndNoticeControl); +#endif +#if defined(__ITimer_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITimer,IID_ITimer); +#endif +#if defined(__ITimerService_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITimerService,IID_ITimerService); +#endif +#if defined(__ITimerSink_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITimerSink,IID_ITimerSink); +#endif +#if defined(__ITypeChangeEvents_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeChangeEvents,IID_ITypeChangeEvents); +#endif +#if defined(__ITypeComp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeComp,IID_ITypeComp); +#endif +#if defined(__ITypeFactory_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeFactory,IID_ITypeFactory); +#endif +#if defined(__ITypeInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeInfo,IID_ITypeInfo); +#endif +#if defined(__ITypeInfo2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeInfo2,IID_ITypeInfo2); +#endif +#if defined(__ITypeLib_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeLib,IID_ITypeLib); +#endif +#if defined(__ITypeLib2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeLib2,IID_ITypeLib2); +#endif +#if defined(__ITypeMarshal_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(ITypeMarshal,IID_ITypeMarshal); +#endif +#if defined(__IUnknown_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IUnknown,IID_IUnknown); +#endif +#if defined(__IUrlHistoryNotify_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IUrlHistoryNotify,IID_IUrlHistoryNotify); +#endif +#if defined(__IUrlHistoryStg_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IUrlHistoryStg,IID_IUrlHistoryStg); +#endif +#if defined(__IUrlHistoryStg2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IUrlHistoryStg2,IID_IUrlHistoryStg2); +#endif +#if defined(__IUrlMon_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IUrlMon,IID_IUrlMon); +#endif +#if defined(__IVariantChangeType_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IVariantChangeType,IID_IVariantChangeType); +#endif +#if defined(__IViewObject_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IViewObject,IID_IViewObject); +#endif +#if defined(__IViewObject2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IViewObject2,IID_IViewObject2); +#endif +#if defined(__IViewObjectEx_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IViewObjectEx,IID_IViewObjectEx); +#endif +#if defined(__IWaitMultiple_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWaitMultiple,IID_IWaitMultiple); +#endif +#if defined(__IWebBrowser_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWebBrowser,IID_IWebBrowser); +#endif +#if defined(__IWebBrowser2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWebBrowser2,IID_IWebBrowser2); +#endif +#if defined(__IWebBrowserApp_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWebBrowserApp,IID_IWebBrowserApp); +#endif +#if defined(__IWinInetHttpInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWinInetHttpInfo,IID_IWinInetHttpInfo); +#endif +#if defined(__IWinInetInfo_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWinInetInfo,IID_IWinInetInfo); +#endif +#if defined(__IWindowForBindingUI_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWindowForBindingUI,IID_IWindowForBindingUI); +#endif +#if defined(__IWrappedProtocol_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IWrappedProtocol,IID_IWrappedProtocol); +#endif +#if defined(__IXMLAttribute_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLAttribute,IID_IXMLAttribute); +#endif +#if defined(__IXMLDOMAttribute_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMAttribute,IID_IXMLDOMAttribute); +#endif +#if defined(__IXMLDOMCDATASection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMCDATASection,IID_IXMLDOMCDATASection); +#endif +#if defined(__IXMLDOMCharacterData_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMCharacterData,IID_IXMLDOMCharacterData); +#endif +#if defined(__IXMLDOMComment_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMComment,IID_IXMLDOMComment); +#endif +#if defined(__IXMLDOMDocument_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMDocument,IID_IXMLDOMDocument); +#endif +#if defined(__IXMLDOMDocumentFragment_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMDocumentFragment,IID_IXMLDOMDocumentFragment); +#endif +#if defined(__IXMLDOMDocumentType_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMDocumentType,IID_IXMLDOMDocumentType); +#endif +#if defined(__IXMLDOMElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMElement,IID_IXMLDOMElement); +#endif +#if defined(__IXMLDOMEntity_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMEntity,IID_IXMLDOMEntity); +#endif +#if defined(__IXMLDOMEntityReference_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMEntityReference,IID_IXMLDOMEntityReference); +#endif +#if defined(__IXMLDOMImplementation_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMImplementation,IID_IXMLDOMImplementation); +#endif +#if defined(__IXMLDOMNamedNodeMap_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMNamedNodeMap,IID_IXMLDOMNamedNodeMap); +#endif +#if defined(__IXMLDOMNode_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMNode,IID_IXMLDOMNode); +#endif +#if defined(__IXMLDOMNodeList_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMNodeList,IID_IXMLDOMNodeList); +#endif +#if defined(__IXMLDOMNotation_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMNotation,IID_IXMLDOMNotation); +#endif +#if defined(__IXMLDOMParseError_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMParseError,IID_IXMLDOMParseError); +#endif +#if defined(__IXMLDOMProcessingInstruction_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMProcessingInstruction,IID_IXMLDOMProcessingInstruction); +#endif +#if defined(__IXMLDOMText_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDOMText,IID_IXMLDOMText); +#endif +#if defined(__IXMLDSOControl_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDSOControl,IID_IXMLDSOControl); +#endif +#if defined(__IXMLDocument_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDocument,IID_IXMLDocument); +#endif +#if defined(__IXMLDocument2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLDocument2,IID_IXMLDocument2); +#endif +#if defined(__IXMLElement_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLElement,IID_IXMLElement); +#endif +#if defined(__IXMLElement2_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLElement2,IID_IXMLElement2); +#endif +#if defined(__IXMLElementCollection_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLElementCollection,IID_IXMLElementCollection); +#endif +#if defined(__IXMLError_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLError,IID_IXMLError); +#endif +#if defined(__IXMLHttpRequest_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXMLHttpRequest,IID_IXMLHttpRequest); +#endif +#if defined(__IXTLRuntime_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(IXTLRuntime,IID_IXTLRuntime); +#endif +#if defined(__OLEDBSimpleProvider_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(OLEDBSimpleProvider,IID_OLEDBSimpleProvider); +#endif +#if defined(__OLEDBSimpleProviderListener_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(OLEDBSimpleProviderListener,IID_OLEDBSimpleProviderListener); +#endif +#if defined(__XMLDOMDocumentEvents_INTERFACE_DEFINED__) +_COM_SMARTPTR_TYPEDEF(XMLDOMDocumentEvents,IID_XMLDOMDocumentEvents); +#endif + +#if defined(__DOMDocument_FWD_DEFINED__) +_COM_SMARTPTR_TYPEDEF(DOMDocument,IID_DOMDocument); +#endif +#if defined(__DOMFreeThreadedDocument_FWD_DEFINED__) +_COM_SMARTPTR_TYPEDEF(DOMFreeThreadedDocument,IID_DOMFreeThreadedDocument); +#endif +#if defined(__XMLDSOControl_FWD_DEFINED__) +_COM_SMARTPTR_TYPEDEF(XMLDSOControl,IID_XMLDSOControl); +#endif +#if defined(__XMLDocument_FWD_DEFINED__) +_COM_SMARTPTR_TYPEDEF(XMLDocument,IID_XMLDocument); +#endif +#if defined(__XMLHTTPRequest_FWD_DEFINED__) +_COM_SMARTPTR_TYPEDEF(XMLHTTPRequest,IID_XMLHTTPRequest); +#endif +#endif +#endif diff --git a/reactos/include/crt/comip.h b/reactos/include/crt/comip.h new file mode 100644 index 00000000000..1b26097c405 --- /dev/null +++ b/reactos/include/crt/comip.h @@ -0,0 +1,378 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_COMIP +#define _INC_COMIP + +#include <_mingw.h> + +#include +#include + +#include + +#ifdef __cplusplus + +#pragma push_macro("new") +#undef new + +#include + +class _com_error; + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +void WINAPI _com_issue_error(HRESULT); +struct IUnknown; + +template +class _com_IIID { +public: + typedef _Interface Interface; + static _Interface *GetInterfacePtr() throw() { return NULL; } + static _Interface& GetInterface() throw() { return *GetInterfacePtr(); } + static const IID& GetIID() throw() { return *_IID; } +}; + +template class _com_ptr_t { +public: + typedef _IIID ThisIIID; + typedef typename _IIID::Interface Interface; + static const IID& GetIID() throw() { return ThisIIID::GetIID(); } + template _com_ptr_t(const _com_ptr_t<_OtherIID> &p) : m_pInterface(NULL) { + HRESULT hr = _QueryInterface(p); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + template _com_ptr_t(_InterfaceType *p) : m_pInterface(NULL) { + HRESULT hr = _QueryInterface(p); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + template _com_ptr_t(LPSTR str) { new(this) _com_ptr_t(static_cast (str),NULL); } + template _com_ptr_t(LPWSTR str) { new(this) _com_ptr_t(static_cast (str),NULL); } + template explicit _com_ptr_t(_com_ptr_t *p) : m_pInterface(NULL) { + if(!p) { _com_issue_error(E_POINTER); } + else { + m_pInterface = p->m_pInterface; + AddRef(); + } + } + _com_ptr_t() throw() : m_pInterface(NULL) { } + _com_ptr_t(int null) : m_pInterface(NULL) { + if(null!=0) { _com_issue_error(E_POINTER); } + } + +#ifdef _NATIVE_NULLPTR_SUPPORTED + _com_ptr_t(decltype(nullptr)) : m_pInterface(NULL) {} +#endif + + _com_ptr_t(const _com_ptr_t &cp) throw() : m_pInterface(cp.m_pInterface) { _AddRef(); } + template _com_ptr_t(Interface *pInterface) throw() : m_pInterface(pInterface) { _AddRef(); } + _com_ptr_t(Interface *pInterface,bool fAddRef) throw() : m_pInterface(pInterface) { + if(fAddRef) _AddRef(); + } + _com_ptr_t(const _variant_t& varSrc) : m_pInterface(NULL) { + HRESULT hr = QueryStdInterfaces(varSrc); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + explicit _com_ptr_t(const CLSID &clsid,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) : m_pInterface(NULL) { + HRESULT hr = CreateInstance(clsid,pOuter,dwClsContext); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + explicit _com_ptr_t(LPCWSTR str,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) : m_pInterface(NULL) { + HRESULT hr = CreateInstance(str,pOuter,dwClsContext); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + explicit _com_ptr_t(LPCSTR str,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) : m_pInterface(NULL) { + HRESULT hr = CreateInstance(str,pOuter,dwClsContext); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + } + template _com_ptr_t &operator=(const _com_ptr_t<_OtherIID> &p) { + HRESULT hr = _QueryInterface(p); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + return *this; + } + template _com_ptr_t &operator=(_InterfaceType *p) { + HRESULT hr = _QueryInterface(p); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + return *this; + } + template _com_ptr_t &operator=(Interface *pInterface) throw() { + if(m_pInterface!=pInterface) { + Interface *pOldInterface = m_pInterface; + m_pInterface = pInterface; + _AddRef(); + if(pOldInterface!=NULL) pOldInterface->Release(); + } + return *this; + } + _com_ptr_t &operator=(const _com_ptr_t &cp) throw() { return operator=(cp.m_pInterface); } + _com_ptr_t &operator=(int null) { + if(null!=0) { _com_issue_error(E_POINTER); } + return operator=(reinterpret_cast(NULL)); + } + _com_ptr_t &operator=(const _variant_t& varSrc) { + HRESULT hr = QueryStdInterfaces(varSrc); + if(FAILED(hr) && (hr!=E_NOINTERFACE)) { _com_issue_error(hr); } + return *this; + } + ~_com_ptr_t() throw() { _Release(); } + void Attach(Interface *pInterface) throw() { + _Release(); + m_pInterface = pInterface; + } + void Attach(Interface *pInterface,bool fAddRef) throw() { + _Release(); + m_pInterface = pInterface; + if(fAddRef) { + if(!pInterface) { _com_issue_error(E_POINTER); } + else pInterface->AddRef(); + } + } + Interface *Detach() throw() { + Interface *const old = m_pInterface; + m_pInterface = NULL; + return old; + } + operator Interface*() const throw() { return m_pInterface; } + operator Interface&() const { + if(!m_pInterface) { _com_issue_error(E_POINTER); } + return *m_pInterface; + } + Interface& operator*() const { + if(!m_pInterface) { _com_issue_error(E_POINTER); } + return *m_pInterface; + } + Interface **operator&() throw() { + _Release(); + m_pInterface = NULL; + return &m_pInterface; + } + Interface *operator->() const { + if(!m_pInterface) { _com_issue_error(E_POINTER); } + return m_pInterface; + } + operator bool() const throw() { return m_pInterface!=NULL; } + template bool operator==(const _com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)==0; } + template bool operator==(_com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)==0; } + template bool operator==(_InterfaceType *p) { return _CompareUnknown(p)==0; } + template bool operator==(Interface *p) { return (m_pInterface==p) ? true : _CompareUnknown(p)==0; } + template bool operator==(const _com_ptr_t &p) throw() { return operator==(p.m_pInterface); } + template bool operator==(_com_ptr_t &p) throw() { return operator==(p.m_pInterface); } + bool operator==(int null) { + if(null!=0) { _com_issue_error(E_POINTER); } + return !m_pInterface; + } + template bool operator!=(const _com_ptr_t<_OtherIID> &p) { return !(operator==(p)); } + template bool operator!=(_com_ptr_t<_OtherIID> &p) { return !(operator==(p)); } + template bool operator!=(_InterfaceType *p) { return !(operator==(p)); } + bool operator!=(int null) { return !(operator==(null)); } + template bool operator<(const _com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)<0; } + template bool operator<(_com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)<0; } + template bool operator<(_InterfaceType *p) { return _CompareUnknown(p)<0; } + template bool operator>(const _com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)>0; } + template bool operator>(_com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)>0; } + template bool operator>(_InterfaceType *p) { return _CompareUnknown(p)>0; } + template bool operator<=(const _com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)<=0; } + template bool operator<=(_com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)<=0; } + template bool operator<=(_InterfaceType *p) { return _CompareUnknown(p)<=0; } + template bool operator>=(const _com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)>=0; } + template bool operator>=(_com_ptr_t<_OtherIID> &p) { return _CompareUnknown(p)>=0; } + template bool operator>=(_InterfaceType *p) { return _CompareUnknown(p)>=0; } + void Release() { + if(!m_pInterface) { _com_issue_error(E_POINTER); } + else { + m_pInterface->Release(); + m_pInterface = NULL; + } + } + void AddRef() { + if(!m_pInterface) { _com_issue_error(E_POINTER); } + else m_pInterface->AddRef(); + } + Interface *GetInterfacePtr() const throw() { return m_pInterface; } + Interface*& GetInterfacePtr() throw() { return m_pInterface; } + HRESULT CreateInstance(const CLSID &rclsid,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) throw() { + HRESULT hr; + _Release(); + if(dwClsContext & (CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)) { + IUnknown *pIUnknown; + hr = CoCreateInstance(rclsid,pOuter,dwClsContext,IID_IUnknown,reinterpret_cast(&pIUnknown)); + if(SUCCEEDED(hr)) { + hr = OleRun(pIUnknown); + if(SUCCEEDED(hr)) hr = pIUnknown->QueryInterface(GetIID(),reinterpret_cast(&m_pInterface)); + pIUnknown->Release(); + } + } else hr = CoCreateInstance(rclsid,pOuter,dwClsContext,GetIID(),reinterpret_cast(&m_pInterface)); + if(FAILED(hr)) m_pInterface = NULL; + return hr; + } + HRESULT CreateInstance(LPCWSTR clsidString,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) throw() { + if(!clsidString) return E_INVALIDARG; + CLSID clsid; + HRESULT hr; + if(clsidString[0]==L'{') hr = CLSIDFromString(const_cast (clsidString),&clsid); + else hr = CLSIDFromProgID(const_cast (clsidString),&clsid); + if(FAILED(hr)) return hr; + return CreateInstance(clsid,pOuter,dwClsContext); + } + HRESULT CreateInstance(LPCSTR clsidStringA,IUnknown *pOuter = NULL,DWORD dwClsContext = CLSCTX_ALL) throw() { + if(!clsidStringA) return E_INVALIDARG; + int size = lstrlenA(clsidStringA) + 1; + int destSize = MultiByteToWideChar(CP_ACP,0,clsidStringA,size,NULL,0); + if(destSize==0) return HRESULT_FROM_WIN32(GetLastError()); + LPWSTR clsidStringW; + clsidStringW = static_cast(_malloca(destSize*sizeof(WCHAR))); + if(!clsidStringW) return E_OUTOFMEMORY; + if(MultiByteToWideChar(CP_ACP,0,clsidStringA,size,clsidStringW,destSize)==0) { + _freea(clsidStringW); + return HRESULT_FROM_WIN32(GetLastError()); + } + HRESULT hr=CreateInstance(clsidStringW,pOuter,dwClsContext); + _freea(clsidStringW); + return hr; + } + HRESULT GetActiveObject(const CLSID &rclsid) throw() { + _Release(); + IUnknown *pIUnknown; + HRESULT hr = ::GetActiveObject(rclsid,NULL,&pIUnknown); + if(SUCCEEDED(hr)) { + hr = pIUnknown->QueryInterface(GetIID(),reinterpret_cast(&m_pInterface)); + pIUnknown->Release(); + } + if(FAILED(hr)) m_pInterface = NULL; + return hr; + } + HRESULT GetActiveObject(LPCWSTR clsidString) throw() { + if(!clsidString) return E_INVALIDARG; + CLSID clsid; + HRESULT hr; + if(clsidString[0]=='{') hr = CLSIDFromString(const_cast (clsidString),&clsid); + else hr = CLSIDFromProgID(const_cast (clsidString),&clsid); + if(FAILED(hr)) return hr; + return GetActiveObject(clsid); + } + HRESULT GetActiveObject(LPCSTR clsidStringA) throw() { + if(!clsidStringA) return E_INVALIDARG; + int size = lstrlenA(clsidStringA) + 1; + int destSize = MultiByteToWideChar(CP_ACP,0,clsidStringA,size,NULL,0); + LPWSTR clsidStringW; + try { + clsidStringW = static_cast(_alloca(destSize*sizeof(WCHAR))); + } catch (...) { + clsidStringW = NULL; + } + if(!clsidStringW) return E_OUTOFMEMORY; + if(MultiByteToWideChar(CP_ACP,0,clsidStringA,size,clsidStringW,destSize)==0) return HRESULT_FROM_WIN32(GetLastError()); + return GetActiveObject(clsidStringW); + } + template HRESULT QueryInterface(const IID& iid,_InterfaceType*& p) throw () { + if(m_pInterface!=NULL) return m_pInterface->QueryInterface(iid,reinterpret_cast(&p)); + return E_POINTER; + } + template HRESULT QueryInterface(const IID& iid,_InterfaceType **p) throw() { return QueryInterface(iid,*p); } +private: + Interface *m_pInterface; + void _Release() throw() { + if(m_pInterface!=NULL) m_pInterface->Release(); + } + void _AddRef() throw() { + if(m_pInterface!=NULL) m_pInterface->AddRef(); + } + template HRESULT _QueryInterface(_InterfacePtr p) throw() { + HRESULT hr; + if(p!=NULL) { + Interface *pInterface; + hr = p->QueryInterface(GetIID(),reinterpret_cast(&pInterface)); + Attach(SUCCEEDED(hr)? pInterface: NULL); + } else { + operator=(static_cast(NULL)); + hr = E_NOINTERFACE; + } + return hr; + } + template int _CompareUnknown(_InterfacePtr p) { + IUnknown *pu1,*pu2; + if(m_pInterface!=NULL) { + HRESULT hr = m_pInterface->QueryInterface(IID_IUnknown,reinterpret_cast(&pu1)); + if(FAILED(hr)) { + _com_issue_error(hr); + pu1 = NULL; + } else pu1->Release(); + } else pu1 = NULL; + if(p!=NULL) { + HRESULT hr = p->QueryInterface(IID_IUnknown,reinterpret_cast(&pu2)); + if(FAILED(hr)) { + _com_issue_error(hr); + pu2 = NULL; + } else pu2->Release(); + } else pu2 = NULL; + return pu1 - pu2; + } + HRESULT QueryStdInterfaces(const _variant_t& varSrc) throw() { + if(V_VT(&varSrc)==VT_DISPATCH) return _QueryInterface(V_DISPATCH(&varSrc)); + if(V_VT(&varSrc)==VT_UNKNOWN) return _QueryInterface(V_UNKNOWN(&varSrc)); + VARIANT varDest; + VariantInit(&varDest); + HRESULT hr = VariantChangeType(&varDest,const_cast(static_cast(&varSrc)),0,VT_DISPATCH); + if(SUCCEEDED(hr)) hr = _QueryInterface(V_DISPATCH(&varSrc)); + if(hr==E_NOINTERFACE) { + VariantInit(&varDest); + hr = VariantChangeType(&varDest,const_cast(static_cast(&varSrc)),0,VT_UNKNOWN); + if(SUCCEEDED(hr)) hr = _QueryInterface(V_UNKNOWN(&varSrc)); + } + VariantClear(&varDest); + return hr; + } +}; + +template bool operator==(int null,_com_ptr_t<_InterfaceType> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return !p; +} + +template bool operator==(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p==i; } + +template bool operator!=(int null,_com_ptr_t<_Interface> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return p!=NULL; +} + +template bool operator!=(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p!=i; } + +template bool operator<(int null,_com_ptr_t<_Interface> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return p>NULL; +} + +template bool operator<(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p>i; } + +template bool operator>(int null,_com_ptr_t<_Interface> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return p bool operator>(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p bool operator<=(int null,_com_ptr_t<_Interface> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return p>=NULL; +} + +template bool operator<=(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p>=i; } + +template bool operator>=(int null,_com_ptr_t<_Interface> &p) { + if(null!=0) { _com_issue_error(E_POINTER); } + return p<=NULL; +} + +template bool operator>=(_Interface *i,_com_ptr_t<_InterfacePtr> &p) { return p<=i; } + +#pragma pop_macro("new") + +#endif /* __cplusplus */ + +#endif /* _INC_COMIP */ diff --git a/reactos/include/crt/comutil.h b/reactos/include/crt/comutil.h new file mode 100644 index 00000000000..9c6083004c5 --- /dev/null +++ b/reactos/include/crt/comutil.h @@ -0,0 +1,1212 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_COMUTIL +#define _INC_COMUTIL + +#include + +#ifndef _COM_ASSERT +#define _COM_ASSERT(x) ((void)0) +#endif + +#define _COM_MEMCPY_S(dest,destsize,src,count) memcpy(dest,src,count) + +/* Use of wsprintf might be impossible, if strsafe.h is included. */ +#ifndef __STDC_SECURE_LIB__ +#define _COM_PRINTF_S_1(dest,destsize,format,arg1) wsprintf(dest,format,arg1) +#elif defined(UNICODE) +#define _COM_PRINTF_S_1(dest,destsize,format,arg1) swprintf_s(dest,destsize,format,arg1) +#else +#define _COM_PRINTF_S_1(dest,destsize,format,arg1) sprintf_s(dest,destsize,format,arg1) +#endif + +#ifdef __cplusplus + +#pragma push_macro("new") +#undef new + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +class _com_error; + +void WINAPI _com_issue_error(HRESULT); + +class _bstr_t; +class _variant_t; + +namespace _com_util { + inline void CheckError(HRESULT hr) { + if(FAILED(hr)) { _com_issue_error(hr); } + } +} + +namespace _com_util { + BSTR WINAPI ConvertStringToBSTR(const char *pSrc); + char *WINAPI ConvertBSTRToString(BSTR pSrc); +} + +class _bstr_t { +public: + _bstr_t() throw(); + _bstr_t(const _bstr_t &s) throw(); + _bstr_t(const char *s); + _bstr_t(const wchar_t *s); + _bstr_t(const _variant_t &var); + _bstr_t(BSTR bstr,bool fCopy); + ~_bstr_t() throw(); + _bstr_t &operator=(const _bstr_t &s) throw(); + _bstr_t &operator=(const char *s); + _bstr_t &operator=(const wchar_t *s); + _bstr_t &operator=(const _variant_t &var); + _bstr_t &operator+=(const _bstr_t &s); + _bstr_t operator+(const _bstr_t &s) const; + friend _bstr_t operator+(const char *s1,const _bstr_t &s2); + friend _bstr_t operator+(const wchar_t *s1,const _bstr_t &s2); + operator const wchar_t *() const throw(); + operator wchar_t *() const throw(); + operator const char *() const; + operator char *() const; + bool operator!() const throw(); + bool operator==(const _bstr_t &str) const throw(); + bool operator!=(const _bstr_t &str) const throw(); + bool operator<(const _bstr_t &str) const throw(); + bool operator>(const _bstr_t &str) const throw(); + bool operator<=(const _bstr_t &str) const throw(); + bool operator>=(const _bstr_t &str) const throw(); + BSTR copy(bool fCopy = true) const; + unsigned int length() const throw(); + void Assign(BSTR s); + BSTR &GetBSTR(); + BSTR *GetAddress(); + void Attach(BSTR s); + BSTR Detach(); +private: + class Data_t { + public: + Data_t(const char *s); + Data_t(const wchar_t *s); + Data_t(BSTR bstr,bool fCopy); + Data_t(const _bstr_t &s1,const _bstr_t &s2); + unsigned long AddRef() throw(); + unsigned long Release() throw(); + unsigned long RefCount() const throw(); + operator const wchar_t *() const throw(); + operator const char *() const; + const wchar_t *GetWString() const throw(); + wchar_t *&GetWString() throw(); + const char *GetString() const; + BSTR Copy() const; + void Assign(BSTR s); + void Attach(BSTR s) throw(); + unsigned int Length() const throw(); + int Compare(const Data_t &str) const throw(); + void *operator new(size_t sz); + private: + BSTR m_wstr; + mutable char *m_str; + unsigned long m_RefCount; + Data_t() throw(); + Data_t(const Data_t &s) throw(); + ~Data_t() throw(); + void _Free() throw(); + }; +private: + Data_t *m_Data; +private: + void _AddRef() throw(); + void _Free() throw(); + int _Compare(const _bstr_t &str) const throw(); +}; + +inline _bstr_t::_bstr_t() throw() : m_Data(NULL) { } + +inline _bstr_t::_bstr_t(const _bstr_t &s) throw() : m_Data(s.m_Data) { _AddRef(); } + +inline _bstr_t::_bstr_t(const char *s) : m_Data(new Data_t(s)) { + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } +} + +inline _bstr_t::_bstr_t(const wchar_t *s) : m_Data(new Data_t(s)) { + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } +} + +inline _bstr_t::_bstr_t(BSTR bstr,bool fCopy) : m_Data(new Data_t(bstr,fCopy)) { + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } +} + +inline _bstr_t::~_bstr_t() throw() { _Free(); } + +inline _bstr_t &_bstr_t::operator=(const _bstr_t &s) throw() { + if(this!=&s) { + _Free(); + m_Data = s.m_Data; + _AddRef(); + } + return *this; +} + +inline _bstr_t &_bstr_t::operator=(const char *s) { + _COM_ASSERT(!s || static_cast(*this)!=s); + if(!s || static_cast(*this)!=s) { + _Free(); + m_Data = new Data_t(s); + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } + } + return *this; +} + +inline _bstr_t &_bstr_t::operator=(const wchar_t *s) { + _COM_ASSERT(!s || static_cast(*this)!=s); + if(!s || static_cast(*this)!=s) { + _Free(); + m_Data = new Data_t(s); + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } + } + return *this; +} + +inline _bstr_t &_bstr_t::operator+=(const _bstr_t &s) { + Data_t *newData = new Data_t(*this,s); + if(!newData) { _com_issue_error(E_OUTOFMEMORY); } + else { + _Free(); + m_Data = newData; + } + return *this; +} + +inline _bstr_t _bstr_t::operator+(const _bstr_t &s) const { + _bstr_t b = *this; + b += s; + return b; +} + +inline _bstr_t operator+(const char *s1,const _bstr_t &s2) { + _bstr_t b = s1; + b += s2; + return b; +} + +inline _bstr_t operator+(const wchar_t *s1,const _bstr_t &s2) { + _bstr_t b = s1; + b += s2; + return b; +} + +inline _bstr_t::operator const wchar_t *() const throw() { return (m_Data!=NULL) ? m_Data->GetWString() : NULL; } +inline _bstr_t::operator wchar_t *() const throw() { return const_cast((m_Data!=NULL) ? m_Data->GetWString() : NULL); } +inline _bstr_t::operator const char *() const { return (m_Data!=NULL) ? m_Data->GetString() : NULL; } +inline _bstr_t::operator char *() const { return const_cast((m_Data!=NULL) ? m_Data->GetString() : NULL); } +inline bool _bstr_t::operator!() const throw() { return (m_Data!=NULL) ? !m_Data->GetWString() : true; } +inline bool _bstr_t::operator==(const _bstr_t &str) const throw() { return _Compare(str)==0; } +inline bool _bstr_t::operator!=(const _bstr_t &str) const throw() { return _Compare(str)!=0; } +inline bool _bstr_t::operator<(const _bstr_t &str) const throw() { return _Compare(str)<0; } +inline bool _bstr_t::operator>(const _bstr_t &str) const throw() { return _Compare(str)>0; } +inline bool _bstr_t::operator<=(const _bstr_t &str) const throw() { return _Compare(str)<=0; } +inline bool _bstr_t::operator>=(const _bstr_t &str) const throw() { return _Compare(str)>=0; } +inline BSTR _bstr_t::copy(bool fCopy) const { return (m_Data!=NULL) ? (fCopy ? m_Data->Copy() : m_Data->GetWString()) : NULL; } +inline unsigned int _bstr_t::length() const throw() { return (m_Data!=NULL) ? m_Data->Length() : 0; } +inline void _bstr_t::Assign(BSTR s) { + _COM_ASSERT(!s || !m_Data || m_Data->GetWString()!=s); + if(!s || !m_Data || m_Data->GetWString()!=s) { + _Free(); + m_Data = new Data_t(s,TRUE); + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } + } +} + +inline BSTR &_bstr_t::GetBSTR() { + if(!m_Data) { + m_Data = new Data_t(0,FALSE); + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } + } + return m_Data->GetWString(); +} + +inline BSTR *_bstr_t::GetAddress() { + Attach(0); + return &m_Data->GetWString(); +} + +inline void _bstr_t::Attach(BSTR s) { + _Free(); + m_Data = new Data_t(s,FALSE); + if(!m_Data) { _com_issue_error(E_OUTOFMEMORY); } +} + +inline BSTR _bstr_t::Detach() { + _COM_ASSERT(m_Data!=NULL && m_Data->RefCount()==1); + if(m_Data!=NULL && m_Data->RefCount()==1) { + BSTR b = m_Data->GetWString(); + m_Data->GetWString() = NULL; + _Free(); + return b; + } else { + _com_issue_error(E_POINTER); + return NULL; + } +} + +inline void _bstr_t::_AddRef() throw() { + if(m_Data!=NULL) m_Data->AddRef(); +} + +inline void _bstr_t::_Free() throw() { + if(m_Data!=NULL) { + m_Data->Release(); + m_Data = NULL; + } +} + +inline int _bstr_t::_Compare(const _bstr_t &str) const throw() { + if(m_Data==str.m_Data) return 0; + if(!m_Data) return -1; + if(!str.m_Data) return 1; + return m_Data->Compare(*str.m_Data); +} + +inline _bstr_t::Data_t::Data_t(const char *s) : m_str(NULL),m_RefCount(1) { + m_wstr = _com_util::ConvertStringToBSTR(s); +} + +inline _bstr_t::Data_t::Data_t(const wchar_t *s) : m_str(NULL),m_RefCount(1) { + m_wstr = ::SysAllocString(s); + if(!m_wstr && s!=NULL) { _com_issue_error(E_OUTOFMEMORY); } +} + +inline _bstr_t::Data_t::Data_t(BSTR bstr,bool fCopy) : m_str(NULL),m_RefCount(1) { + if(fCopy && bstr!=NULL) { + m_wstr = ::SysAllocStringByteLen(reinterpret_cast(bstr),::SysStringByteLen(bstr)); + if(!m_wstr) { _com_issue_error(E_OUTOFMEMORY); } + } else m_wstr = bstr; +} + +inline _bstr_t::Data_t::Data_t(const _bstr_t &s1,const _bstr_t &s2) : m_str(NULL),m_RefCount(1) { + const unsigned int l1 = s1.length(); + const unsigned int l2 = s2.length(); + m_wstr = ::SysAllocStringByteLen(NULL,(l1 + l2) *sizeof(wchar_t)); + if(!m_wstr) { + _com_issue_error(E_OUTOFMEMORY); + return; + } + const wchar_t *wstr1 = static_cast(s1); + if(wstr1!=NULL) { + _COM_MEMCPY_S(m_wstr,(l1 + l2 + 1) *sizeof(wchar_t),wstr1,(l1 + 1) *sizeof(wchar_t)); + } + const wchar_t *wstr2 = static_cast(s2); + if(wstr2!=NULL) { + _COM_MEMCPY_S(m_wstr + l1,(l2 + 1) *sizeof(wchar_t),wstr2,(l2 + 1) *sizeof(wchar_t)); + } +} + +inline unsigned long _bstr_t::Data_t::AddRef() throw() { + InterlockedIncrement(reinterpret_cast(&m_RefCount)); + return m_RefCount; +} + +inline unsigned long _bstr_t::Data_t::Release() throw() { + unsigned long cRef = InterlockedDecrement(reinterpret_cast(&m_RefCount)); + if(cRef==0) delete this; + return cRef; +} + +inline unsigned long _bstr_t::Data_t::RefCount() const throw() { return m_RefCount; } +inline _bstr_t::Data_t::operator const wchar_t *() const throw() { return m_wstr; } +inline _bstr_t::Data_t::operator const char *() const { return GetString(); } +inline const wchar_t *_bstr_t::Data_t::GetWString() const throw() { return m_wstr; } +inline wchar_t *&_bstr_t::Data_t::GetWString() throw() { return m_wstr; } +inline const char *_bstr_t::Data_t::GetString() const { + if(!m_str) m_str = _com_util::ConvertBSTRToString(m_wstr); + return m_str; +} +inline BSTR _bstr_t::Data_t::Copy() const { + if(m_wstr!=NULL) { + BSTR bstr = ::SysAllocStringByteLen(reinterpret_cast(m_wstr),::SysStringByteLen(m_wstr)); + if(!bstr) { _com_issue_error(E_OUTOFMEMORY); } + return bstr; + } + return NULL; +} +inline void _bstr_t::Data_t::Assign(BSTR s) { + _Free(); + if(s!=NULL) { + m_wstr = ::SysAllocStringByteLen(reinterpret_cast(s),::SysStringByteLen(s)); + m_str = 0; + } +} +inline void _bstr_t::Data_t::Attach(BSTR s) throw() { + _Free(); + m_wstr = s; + m_str = 0; + m_RefCount = 1; +} +inline unsigned int _bstr_t::Data_t::Length() const throw() { return m_wstr ? ::SysStringLen(m_wstr) : 0; } +inline int _bstr_t::Data_t::Compare(const _bstr_t::Data_t &str) const throw() { + if(!m_wstr) return str.m_wstr ? -1 : 0; + if(!str.m_wstr) return 1; + const unsigned int l1 = ::SysStringLen(m_wstr); + const unsigned int l2 = ::SysStringLen(str.m_wstr); + unsigned int len = l1; + if(len>l2) len = l2; + BSTR bstr1 = m_wstr; + BSTR bstr2 = str.m_wstr; + while (len-->0) { + if(*bstr1++!=*bstr2++) return bstr1[-1] - bstr2[-1]; + } + return (l1(&varSrc))); +} +inline _variant_t::_variant_t(const VARIANT *pSrc) { + if(!pSrc) { _com_issue_error(E_POINTER); } + else { + ::VariantInit(this); + _com_util::CheckError(::VariantCopy(this,const_cast(pSrc))); + } +} +inline _variant_t::_variant_t(const _variant_t &varSrc) { + ::VariantInit(this); + _com_util::CheckError(::VariantCopy(this,const_cast(static_cast(&varSrc)))); +} +inline _variant_t::_variant_t(VARIANT &varSrc,bool fCopy) { + if(fCopy) { + ::VariantInit(this); + _com_util::CheckError(::VariantCopy(this,&varSrc)); + } else { + _COM_MEMCPY_S(this,sizeof(varSrc),&varSrc,sizeof(varSrc)); + V_VT(&varSrc) = VT_EMPTY; + } +} +inline _variant_t::_variant_t(short sSrc,VARTYPE vtSrc) { + if((vtSrc!=VT_I2) && (vtSrc!=VT_BOOL)) { + _com_issue_error(E_INVALIDARG); + return; + } + if(vtSrc==VT_BOOL) { + V_VT(this) = VT_BOOL; + V_BOOL(this) = (sSrc ? VARIANT_TRUE : VARIANT_FALSE); + } else { + V_VT(this) = VT_I2; + V_I2(this) = sSrc; + } +} +inline _variant_t::_variant_t(long lSrc,VARTYPE vtSrc) { + if((vtSrc!=VT_I4) && (vtSrc!=VT_ERROR) && (vtSrc!=VT_BOOL)) { + _com_issue_error(E_INVALIDARG); + return; + } + if(vtSrc==VT_ERROR) { + V_VT(this) = VT_ERROR; + V_ERROR(this) = lSrc; + } else if(vtSrc==VT_BOOL) { + V_VT(this) = VT_BOOL; + V_BOOL(this) = (lSrc ? VARIANT_TRUE : VARIANT_FALSE); + } else { + V_VT(this) = VT_I4; + V_I4(this) = lSrc; + } +} +inline _variant_t::_variant_t(float fltSrc) throw() { + V_VT(this) = VT_R4; + V_R4(this) = fltSrc; +} + +inline _variant_t::_variant_t(double dblSrc,VARTYPE vtSrc) { + if((vtSrc!=VT_R8) && (vtSrc!=VT_DATE)) { + _com_issue_error(E_INVALIDARG); + return; + } + if(vtSrc==VT_DATE) { + V_VT(this) = VT_DATE; + V_DATE(this) = dblSrc; + } else { + V_VT(this) = VT_R8; + V_R8(this) = dblSrc; + } +} +inline _variant_t::_variant_t(const CY &cySrc) throw() { + V_VT(this) = VT_CY; + V_CY(this) = cySrc; +} +inline _variant_t::_variant_t(const _bstr_t &bstrSrc) { + V_VT(this) = VT_BSTR; + BSTR bstr = static_cast(bstrSrc); + if(!bstr) V_BSTR(this) = NULL; + else { + V_BSTR(this) = ::SysAllocStringByteLen(reinterpret_cast(bstr),::SysStringByteLen(bstr)); + if(!(V_BSTR(this))) { _com_issue_error(E_OUTOFMEMORY); } + } +} +inline _variant_t::_variant_t(const wchar_t *pSrc) { + V_VT(this) = VT_BSTR; + V_BSTR(this) = ::SysAllocString(pSrc); + if(!(V_BSTR(this)) && pSrc!=NULL) { _com_issue_error(E_OUTOFMEMORY); } +} +inline _variant_t::_variant_t(const char *pSrc) { + V_VT(this) = VT_BSTR; + V_BSTR(this) = _com_util::ConvertStringToBSTR(pSrc); +} +inline _variant_t::_variant_t(IDispatch *pSrc,bool fAddRef) throw() { + V_VT(this) = VT_DISPATCH; + V_DISPATCH(this) = pSrc; + if(fAddRef && V_DISPATCH(this)!=NULL) V_DISPATCH(this)->AddRef(); +} +inline _variant_t::_variant_t(bool boolSrc) throw() { + V_VT(this) = VT_BOOL; + V_BOOL(this) = (boolSrc ? VARIANT_TRUE : VARIANT_FALSE); +} +inline _variant_t::_variant_t(IUnknown *pSrc,bool fAddRef) throw() { + V_VT(this) = VT_UNKNOWN; + V_UNKNOWN(this) = pSrc; + if(fAddRef && V_UNKNOWN(this)!=NULL) V_UNKNOWN(this)->AddRef(); +} +inline _variant_t::_variant_t(const DECIMAL &decSrc) throw() { + V_DECIMAL(this) = decSrc; + V_VT(this) = VT_DECIMAL; +} +inline _variant_t::_variant_t(BYTE bSrc) throw() { + V_VT(this) = VT_UI1; + V_UI1(this) = bSrc; +} +inline _variant_t::_variant_t(char cSrc) throw() { + V_VT(this) = VT_I1; + V_I1(this) = cSrc; +} +inline _variant_t::_variant_t(unsigned short usSrc) throw() { + V_VT(this) = VT_UI2; + V_UI2(this) = usSrc; +} +inline _variant_t::_variant_t(unsigned long ulSrc) throw() { + V_VT(this) = VT_UI4; + V_UI4(this) = ulSrc; +} +inline _variant_t::_variant_t(int iSrc) throw() { + V_VT(this) = VT_INT; + V_INT(this) = iSrc; +} +inline _variant_t::_variant_t(unsigned int uiSrc) throw() { + V_VT(this) = VT_UINT; + V_UINT(this) = uiSrc; +} +__MINGW_EXTENSION inline _variant_t::_variant_t(__int64 i8Src) throw() { + V_VT(this) = VT_I8; + V_I8(this) = i8Src; +} +__MINGW_EXTENSION inline _variant_t::_variant_t(unsigned __int64 ui8Src) throw() { + V_VT(this) = VT_UI8; + V_UI8(this) = ui8Src; +} +inline _variant_t::operator short() const { + if(V_VT(this)==VT_I2) return V_I2(this); + _variant_t varDest; + varDest.ChangeType(VT_I2,this); + return V_I2(&varDest); +} +inline _variant_t::operator long() const { + if(V_VT(this)==VT_I4) return V_I4(this); + _variant_t varDest; + varDest.ChangeType(VT_I4,this); + return V_I4(&varDest); +} + +inline _variant_t::operator float() const { + if(V_VT(this)==VT_R4) return V_R4(this); + _variant_t varDest; + varDest.ChangeType(VT_R4,this); + return V_R4(&varDest); +} + +inline _variant_t::operator double() const { + if(V_VT(this)==VT_R8) return V_R8(this); + _variant_t varDest; + varDest.ChangeType(VT_R8,this); + return V_R8(&varDest); +} + +inline _variant_t::operator CY() const { + if(V_VT(this)==VT_CY) return V_CY(this); + _variant_t varDest; + varDest.ChangeType(VT_CY,this); + return V_CY(&varDest); +} + +inline _variant_t::operator _bstr_t() const { + if(V_VT(this)==VT_BSTR) return V_BSTR(this); + _variant_t varDest; + varDest.ChangeType(VT_BSTR,this); + return V_BSTR(&varDest); +} + +inline _variant_t::operator IDispatch*() const { + if(V_VT(this)==VT_DISPATCH) { + if(V_DISPATCH(this)!=NULL) V_DISPATCH(this)->AddRef(); + return V_DISPATCH(this); + } + _variant_t varDest; + varDest.ChangeType(VT_DISPATCH,this); + if(V_DISPATCH(&varDest)!=NULL) V_DISPATCH(&varDest)->AddRef(); + return V_DISPATCH(&varDest); +} +inline _variant_t::operator bool() const { + if(V_VT(this)==VT_BOOL) return V_BOOL(this) ? true : false; + _variant_t varDest; + varDest.ChangeType(VT_BOOL,this); + return (V_BOOL(&varDest)==VARIANT_TRUE) ? true : false; +} + +inline _variant_t::operator IUnknown*() const { + if(V_VT(this)==VT_UNKNOWN) { + if(V_UNKNOWN(this)!=NULL) V_UNKNOWN(this)->AddRef(); + return V_UNKNOWN(this); + } + _variant_t varDest; + varDest.ChangeType(VT_UNKNOWN,this); + if(V_UNKNOWN(&varDest)!=NULL) V_UNKNOWN(&varDest)->AddRef(); + return V_UNKNOWN(&varDest); +} +inline _variant_t::operator DECIMAL() const { + if(V_VT(this)==VT_DECIMAL) return V_DECIMAL(this); + _variant_t varDest; + varDest.ChangeType(VT_DECIMAL,this); + return V_DECIMAL(&varDest); +} +inline _variant_t::operator BYTE() const { + if(V_VT(this)==VT_UI1) return V_UI1(this); + _variant_t varDest; + varDest.ChangeType(VT_UI1,this); + return V_UI1(&varDest); +} +inline _variant_t::operator VARIANT() const throw() { return *(VARIANT*) this; } +inline _variant_t::operator char() const { + if(V_VT(this)==VT_I1) return V_I1(this); + _variant_t varDest; + varDest.ChangeType(VT_I1,this); + return V_I1(&varDest); +} + +inline _variant_t::operator unsigned short() const { + if(V_VT(this)==VT_UI2) return V_UI2(this); + _variant_t varDest; + varDest.ChangeType(VT_UI2,this); + return V_UI2(&varDest); +} + +inline _variant_t::operator unsigned long() const { + if(V_VT(this)==VT_UI4) return V_UI4(this); + _variant_t varDest; + varDest.ChangeType(VT_UI4,this); + return V_UI4(&varDest); +} +inline _variant_t::operator int() const { + if(V_VT(this)==VT_INT) return V_INT(this); + _variant_t varDest; + varDest.ChangeType(VT_INT,this); + return V_INT(&varDest); +} +inline _variant_t::operator unsigned int() const { + if(V_VT(this)==VT_UINT) return V_UINT(this); + _variant_t varDest; + varDest.ChangeType(VT_UINT,this); + return V_UINT(&varDest); +} +__MINGW_EXTENSION inline _variant_t::operator __int64() const { + if(V_VT(this)==VT_I8) return V_I8(this); + _variant_t varDest; + varDest.ChangeType(VT_I8,this); + return V_I8(&varDest); +} +__MINGW_EXTENSION inline _variant_t::operator unsigned __int64() const { + if(V_VT(this)==VT_UI8) return V_UI8(this); + _variant_t varDest; + varDest.ChangeType(VT_UI8,this); + return V_UI8(&varDest); +} +inline _variant_t &_variant_t::operator=(const VARIANT &varSrc) { + _com_util::CheckError(::VariantCopy(this,const_cast(&varSrc))); + return *this; +} +inline _variant_t &_variant_t::operator=(const VARIANT *pSrc) { + if(!pSrc) { _com_issue_error(E_POINTER); } + else { _com_util::CheckError(::VariantCopy(this,const_cast(pSrc))); } + return *this; +} +inline _variant_t &_variant_t::operator=(const _variant_t &varSrc) { + _com_util::CheckError(::VariantCopy(this,const_cast(static_cast(&varSrc)))); + return *this; +} +inline _variant_t &_variant_t::operator=(short sSrc) { + if(V_VT(this)==VT_I2) V_I2(this) = sSrc; + else if(V_VT(this)==VT_BOOL) V_BOOL(this) = (sSrc ? VARIANT_TRUE : VARIANT_FALSE); + else { + Clear(); + V_VT(this) = VT_I2; + V_I2(this) = sSrc; + } + return *this; +} +inline _variant_t &_variant_t::operator=(long lSrc) { + if(V_VT(this)==VT_I4) V_I4(this) = lSrc; + else if(V_VT(this)==VT_ERROR) V_ERROR(this) = lSrc; + else if(V_VT(this)==VT_BOOL) V_BOOL(this) = (lSrc ? VARIANT_TRUE : VARIANT_FALSE); + else { + Clear(); + V_VT(this) = VT_I4; + V_I4(this) = lSrc; + } + return *this; +} +inline _variant_t &_variant_t::operator=(float fltSrc) { + if(V_VT(this)!=VT_R4) { + Clear(); + V_VT(this) = VT_R4; + } + V_R4(this) = fltSrc; + return *this; +} + +inline _variant_t &_variant_t::operator=(double dblSrc) +{ + if(V_VT(this)==VT_R8) { + V_R8(this) = dblSrc; + } + else if(V_VT(this)==VT_DATE) { + V_DATE(this) = dblSrc; + } + else { + + Clear(); + + V_VT(this) = VT_R8; + V_R8(this) = dblSrc; + } + + return *this; +} + +inline _variant_t &_variant_t::operator=(const CY &cySrc) +{ + if(V_VT(this)!=VT_CY) { + + Clear(); + + V_VT(this) = VT_CY; + } + + V_CY(this) = cySrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(const _bstr_t &bstrSrc) +{ + _COM_ASSERT(V_VT(this)!=VT_BSTR || !((BSTR) bstrSrc) || V_BSTR(this)!=(BSTR) bstrSrc); + + Clear(); + + V_VT(this) = VT_BSTR; + + if(!bstrSrc) { + V_BSTR(this) = NULL; + } + else { + BSTR bstr = static_cast(bstrSrc); + V_BSTR(this) = ::SysAllocStringByteLen(reinterpret_cast(bstr),::SysStringByteLen(bstr)); + + if(!(V_BSTR(this))) { + _com_issue_error(E_OUTOFMEMORY); + } + } + + return *this; +} + +inline _variant_t &_variant_t::operator=(const wchar_t *pSrc) +{ + _COM_ASSERT(V_VT(this)!=VT_BSTR || !pSrc || V_BSTR(this)!=pSrc); + + Clear(); + + V_VT(this) = VT_BSTR; + + if(!pSrc) { + V_BSTR(this) = NULL; + } + else { + V_BSTR(this) = ::SysAllocString(pSrc); + + if(!(V_BSTR(this))) { + _com_issue_error(E_OUTOFMEMORY); + } + } + + return *this; +} + +inline _variant_t &_variant_t::operator=(const char *pSrc) +{ + _COM_ASSERT(V_VT(this)!=(VT_I1 | VT_BYREF) || !pSrc || V_I1REF(this)!=pSrc); + + Clear(); + + V_VT(this) = VT_BSTR; + V_BSTR(this) = _com_util::ConvertStringToBSTR(pSrc); + + return *this; +} + +inline _variant_t &_variant_t::operator=(IDispatch *pSrc) +{ + _COM_ASSERT(V_VT(this)!=VT_DISPATCH || pSrc==0 || V_DISPATCH(this)!=pSrc); + + Clear(); + + V_VT(this) = VT_DISPATCH; + V_DISPATCH(this) = pSrc; + + if(V_DISPATCH(this)!=NULL) { + + V_DISPATCH(this)->AddRef(); + } + + return *this; +} + +inline _variant_t &_variant_t::operator=(bool boolSrc) +{ + if(V_VT(this)!=VT_BOOL) { + + Clear(); + + V_VT(this) = VT_BOOL; + } + + V_BOOL(this) = (boolSrc ? VARIANT_TRUE : VARIANT_FALSE); + + return *this; +} + +inline _variant_t &_variant_t::operator=(IUnknown *pSrc) +{ + _COM_ASSERT(V_VT(this)!=VT_UNKNOWN || !pSrc || V_UNKNOWN(this)!=pSrc); + + Clear(); + + V_VT(this) = VT_UNKNOWN; + V_UNKNOWN(this) = pSrc; + + if(V_UNKNOWN(this)!=NULL) { + + V_UNKNOWN(this)->AddRef(); + } + + return *this; +} + +inline _variant_t &_variant_t::operator=(const DECIMAL &decSrc) +{ + if(V_VT(this)!=VT_DECIMAL) { + + Clear(); + } + + V_DECIMAL(this) = decSrc; + V_VT(this) = VT_DECIMAL; + + return *this; +} + +inline _variant_t &_variant_t::operator=(BYTE bSrc) +{ + if(V_VT(this)!=VT_UI1) { + + Clear(); + + V_VT(this) = VT_UI1; + } + + V_UI1(this) = bSrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(char cSrc) +{ + if(V_VT(this)!=VT_I1) { + + Clear(); + + V_VT(this) = VT_I1; + } + + V_I1(this) = cSrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(unsigned short usSrc) +{ + if(V_VT(this)!=VT_UI2) { + + Clear(); + + V_VT(this) = VT_UI2; + } + + V_UI2(this) = usSrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(unsigned long ulSrc) +{ + if(V_VT(this)!=VT_UI4) { + + Clear(); + + V_VT(this) = VT_UI4; + } + + V_UI4(this) = ulSrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(int iSrc) +{ + if(V_VT(this)!=VT_INT) { + + Clear(); + + V_VT(this) = VT_INT; + } + + V_INT(this) = iSrc; + + return *this; +} + +inline _variant_t &_variant_t::operator=(unsigned int uiSrc) +{ + if(V_VT(this)!=VT_UINT) { + + Clear(); + + V_VT(this) = VT_UINT; + } + + V_UINT(this) = uiSrc; + + return *this; +} + +__MINGW_EXTENSION inline _variant_t &_variant_t::operator=(__int64 i8Src) { + if(V_VT(this)!=VT_I8) { + + Clear(); + + V_VT(this) = VT_I8; + } + + V_I8(this) = i8Src; + + return *this; +} + +__MINGW_EXTENSION inline _variant_t &_variant_t::operator=(unsigned __int64 ui8Src) { + if(V_VT(this)!=VT_UI8) { + + Clear(); + + V_VT(this) = VT_UI8; + } + + V_UI8(this) = ui8Src; + + return *this; +} + +inline bool _variant_t::operator==(const VARIANT &varSrc) const throw() { + return *this==&varSrc; +} + +inline bool _variant_t::operator==(const VARIANT *pSrc) const throw() +{ + if(!pSrc) { + return false; + } + + if(this==pSrc) { + return true; + } + + if(V_VT(this)!=V_VT(pSrc)) { + return false; + } + + switch (V_VT(this)) { +case VT_EMPTY: +case VT_NULL: + return true; + +case VT_I2: + return V_I2(this)==V_I2(pSrc); + +case VT_I4: + return V_I4(this)==V_I4(pSrc); + +case VT_R4: + return V_R4(this)==V_R4(pSrc); + +case VT_R8: + return V_R8(this)==V_R8(pSrc); + +case VT_CY: + return memcmp(&(V_CY(this)),&(V_CY(pSrc)),sizeof(CY))==0; + +case VT_DATE: + return V_DATE(this)==V_DATE(pSrc); + +case VT_BSTR: + return (::SysStringByteLen(V_BSTR(this))==::SysStringByteLen(V_BSTR(pSrc))) && + (memcmp(V_BSTR(this),V_BSTR(pSrc),::SysStringByteLen(V_BSTR(this)))==0); + +case VT_DISPATCH: + return V_DISPATCH(this)==V_DISPATCH(pSrc); + +case VT_ERROR: + return V_ERROR(this)==V_ERROR(pSrc); + +case VT_BOOL: + return V_BOOL(this)==V_BOOL(pSrc); + +case VT_UNKNOWN: + return V_UNKNOWN(this)==V_UNKNOWN(pSrc); + +case VT_DECIMAL: + return memcmp(&(V_DECIMAL(this)),&(V_DECIMAL(pSrc)),sizeof(DECIMAL))==0; + +case VT_UI1: + return V_UI1(this)==V_UI1(pSrc); + +case VT_I1: + return V_I1(this)==V_I1(pSrc); + +case VT_UI2: + return V_UI2(this)==V_UI2(pSrc); + +case VT_UI4: + return V_UI4(this)==V_UI4(pSrc); + +case VT_INT: + return V_INT(this)==V_INT(pSrc); + +case VT_UINT: + return V_UINT(this)==V_UINT(pSrc); + +case VT_I8: + return V_I8(this)==V_I8(pSrc); + +case VT_UI8: + return V_UI8(this)==V_UI8(pSrc); + +default: + _com_issue_error(E_INVALIDARG); + + } + + return false; +} + +inline bool _variant_t::operator!=(const VARIANT &varSrc) const throw() +{ + return !(*this==&varSrc); +} + +inline bool _variant_t::operator!=(const VARIANT *pSrc) const throw() +{ + return !(*this==pSrc); +} + +inline void _variant_t::Clear() +{ + _com_util::CheckError(::VariantClear(this)); +} + +inline void _variant_t::Attach(VARIANT &varSrc) +{ + + Clear(); + + _COM_MEMCPY_S(this,sizeof(varSrc),&varSrc,sizeof(varSrc)); + V_VT(&varSrc) = VT_EMPTY; +} + +inline VARIANT _variant_t::Detach() +{ + VARIANT varResult = *this; + V_VT(this) = VT_EMPTY; + + return varResult; +} + +inline VARIANT &_variant_t::GetVARIANT() throw() +{ + return *(VARIANT*) this; +} + +inline VARIANT *_variant_t::GetAddress() { + Clear(); + return (VARIANT*) this; +} +inline void _variant_t::ChangeType(VARTYPE vartype,const _variant_t *pSrc) { + if(!pSrc) pSrc = this; + if((this!=pSrc) || (vartype!=V_VT(this))) { + _com_util::CheckError(::VariantChangeType(static_cast(this),const_cast(static_cast(pSrc)),0,vartype)); + } +} +inline void _variant_t::SetString(const char *pSrc) { operator=(pSrc); } +inline _variant_t::~_variant_t() throw() { ::VariantClear(this); } +inline _bstr_t::_bstr_t(const _variant_t &var) : m_Data(NULL) { + if(V_VT(&var)==VT_BSTR) { + *this = V_BSTR(&var); + return; + } + _variant_t varDest; + varDest.ChangeType(VT_BSTR,&var); + *this = V_BSTR(&varDest); +} +inline _bstr_t &_bstr_t::operator=(const _variant_t &var) { + if(V_VT(&var)==VT_BSTR) { + *this = V_BSTR(&var); + return *this; + } + _variant_t varDest; + varDest.ChangeType(VT_BSTR,&var); + *this = V_BSTR(&varDest); + return *this; +} + +extern _variant_t vtMissing; + +#ifndef _USE_RAW +#define bstr_t _bstr_t +#define variant_t _variant_t +#endif + +#pragma pop_macro("new") + +#endif /* __cplusplus */ + +#endif diff --git a/reactos/lib/sdk/CMakeLists.txt b/reactos/lib/sdk/CMakeLists.txt index ef3b4678875..2f85da70108 100644 --- a/reactos/lib/sdk/CMakeLists.txt +++ b/reactos/lib/sdk/CMakeLists.txt @@ -1,4 +1,5 @@ +add_subdirectory(comsupp) add_subdirectory(crt) add_subdirectory(delayimp) add_subdirectory(dxguid) diff --git a/reactos/lib/sdk/comsupp/CMakeLists.txt b/reactos/lib/sdk/comsupp/CMakeLists.txt new file mode 100644 index 00000000000..051498293ea --- /dev/null +++ b/reactos/lib/sdk/comsupp/CMakeLists.txt @@ -0,0 +1,5 @@ + +set_cpp() + +add_library(comsupp comsupp.cpp) +add_dependencies(comsupp psdk) diff --git a/reactos/lib/sdk/comsupp/comsupp.cpp b/reactos/lib/sdk/comsupp/comsupp.cpp new file mode 100644 index 00000000000..de1938cdf3b --- /dev/null +++ b/reactos/lib/sdk/comsupp/comsupp.cpp @@ -0,0 +1,47 @@ +/* + * PROJECT: ReactOS crt library + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Compiler support for COM + * PROGRAMMER: Thomas Faber + */ + +#include +#include + +/* comdef.h */ +typedef void WINAPI COM_ERROR_HANDLER(HRESULT, IErrorInfo *); +static COM_ERROR_HANDLER *com_error_handler; + +void WINAPI _com_raise_error(HRESULT hr, IErrorInfo *perrinfo) +{ + throw _com_error(hr, perrinfo); +} + +void WINAPI _set_com_error_handler(COM_ERROR_HANDLER *phandler) +{ + com_error_handler = phandler; +} + +void WINAPI _com_issue_error(HRESULT hr) +{ + com_error_handler(hr, NULL); +} + +void WINAPI _com_issue_errorex(HRESULT hr, IUnknown *punk, REFIID riid) +{ + void *pv; + IErrorInfo *perrinfo = NULL; + + if (SUCCEEDED(punk->QueryInterface(riid, &pv))) + { + ISupportErrorInfo *pserrinfo = static_cast(pv); + if (pserrinfo->InterfaceSupportsErrorInfo(riid) == S_OK) + (void)GetErrorInfo(0, &perrinfo); + pserrinfo->Release(); + } + + com_error_handler(hr, perrinfo); +} + +/* comutil.h */ +_variant_t vtMissing(DISP_E_PARAMNOTFOUND, VT_ERROR); From 94bb4b7aaf0b33fb4503bf0853fae67f97823efe Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 26 Jan 2013 15:06:49 +0000 Subject: [PATCH 54/71] [EXPLORER] - Use set_cpp instead of hand-coding all the parameters - Use comutil.h and link with comsupp unconditionally, since we now have them - Use STLPort-compatible filebuf constructor for TCHAR iostreams - Fix a few MSVC and GCC 4.7 errors/warnings svn path=/trunk/; revision=58224 --- reactos/base/shell/explorer/CMakeLists.txt | 22 ++++--------------- .../base/shell/explorer/desktop/desktop.cpp | 5 +++-- reactos/base/shell/explorer/desktop/desktop.h | 3 ++- reactos/base/shell/explorer/explorer.cpp | 2 +- .../base/shell/explorer/shell/webchild.cpp | 13 ----------- .../base/shell/explorer/taskbar/startmenu.cpp | 2 +- .../shell/explorer/utility/treedroptarget.h | 3 ++- reactos/base/shell/explorer/utility/utility.h | 2 +- .../base/shell/explorer/utility/xmlstorage.h | 12 ++++++++-- reactos/include/crt/comutil.h | 2 +- 10 files changed, 25 insertions(+), 41 deletions(-) diff --git a/reactos/base/shell/explorer/CMakeLists.txt b/reactos/base/shell/explorer/CMakeLists.txt index 75c86f8fca2..395ea5c5e79 100644 --- a/reactos/base/shell/explorer/CMakeLists.txt +++ b/reactos/base/shell/explorer/CMakeLists.txt @@ -1,15 +1,11 @@ add_subdirectory(notifyhook) -#NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers -#I'm not willing to do it if explorer_new is hanging around. -#jgardou -#set_cpp() +set_cpp() add_definitions( -DWIN32 - -D__WINDRES__ - -DUNICODE -D_UNICODE) + -D__WINDRES__) #add_pch(explorer precomp.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -51,20 +47,10 @@ list(APPEND SOURCE utility/shellbrowserimpl.cpp) # utility/shelltests.cpp add_executable(explorer ${SOURCE}) -set_subsystem(explorer windows) -set_entrypoint(explorer wWinMainCRTStartup) - -target_link_libraries(explorer - -lsupc++ - -lstdc++ - -lgcc - -lmingwex - -lmingw32 - wine - uuid) +target_link_libraries(explorer comsupp wine uuid) +set_module_type(explorer win32gui UNICODE) add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) -set_image_base(explorer 0x00400000) add_dependencies(explorer psdk) add_cd_file(TARGET explorer DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all) diff --git a/reactos/base/shell/explorer/desktop/desktop.cpp b/reactos/base/shell/explorer/desktop/desktop.cpp index c00308ff00a..94733c3e8b0 100644 --- a/reactos/base/shell/explorer/desktop/desktop.cpp +++ b/reactos/base/shell/explorer/desktop/desktop.cpp @@ -235,8 +235,9 @@ void Desktops::ToggleMinimize() if (minimized.empty()) { EnumWindows(MinimizeDesktopEnumFct, (LPARAM)&minimized); } else { - for(list::const_reverse_iterator it=minimized.rbegin(); - it!=minimized.rend(); ++it) { + const list& cminimized = minimized; + for(list::const_reverse_iterator it=cminimized.rbegin(); + it!=cminimized.rend(); ++it) { ShowWindowAsync(it->first, it->second&WS_MAXIMIZE? SW_MAXIMIZE: SW_RESTORE); Sleep(20); } diff --git a/reactos/base/shell/explorer/desktop/desktop.h b/reactos/base/shell/explorer/desktop/desktop.h index 2fffb4cd9f0..060fb05b24d 100644 --- a/reactos/base/shell/explorer/desktop/desktop.h +++ b/reactos/base/shell/explorer/desktop/desktop.h @@ -141,7 +141,8 @@ public: /* [out][in] */ DWORD __RPC_FAR *pdwEffect) { TVHITTESTINFO hit; - hit.pt = (POINT&)pt; + hit.pt.x = pt.x; + hit.pt.y = pt.y; ScreenToClient(m_hTargetWnd, &hit.pt); hit.flags = TVHT_ONITEM; diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp index 7a84b7edd2f..d402398f860 100644 --- a/reactos/base/shell/explorer/explorer.cpp +++ b/reactos/base/shell/explorer/explorer.cpp @@ -32,7 +32,7 @@ #include "resource.h" -//#include // for setlocale() +#include // for setlocale() #include diff --git a/reactos/base/shell/explorer/shell/webchild.cpp b/reactos/base/shell/explorer/shell/webchild.cpp index 036805963d9..446c3441f8f 100644 --- a/reactos/base/shell/explorer/shell/webchild.cpp +++ b/reactos/base/shell/explorer/shell/webchild.cpp @@ -33,20 +33,7 @@ #include "webchild.h" -#ifdef _MSC_VER - -#if _MSC_VER>=1300 // vtMissing for VS.Net #include -#pragma comment(lib, "comsupp") -#endif - -#else - -#ifdef __MINGW32__ // MinGW is lacking vtMissing (as of 07.02.2004) -static Variant vtMissing; -#endif - -#endif //#include diff --git a/reactos/base/shell/explorer/taskbar/startmenu.cpp b/reactos/base/shell/explorer/taskbar/startmenu.cpp index 5ec7f5db1f0..194d4544520 100644 --- a/reactos/base/shell/explorer/taskbar/startmenu.cpp +++ b/reactos/base/shell/explorer/taskbar/startmenu.cpp @@ -1874,7 +1874,7 @@ void StartMenuRoot::CloseStartMenu(int id) bool StartMenuRoot::IsStartMenuVisible() const { - return IsWindowVisible(_hwnd); + return IsWindowVisible(_hwnd) != FALSE; } void StartMenuRoot::ProcessKey(int vk) diff --git a/reactos/base/shell/explorer/utility/treedroptarget.h b/reactos/base/shell/explorer/utility/treedroptarget.h index 2e263ee4169..ca558a67ead 100644 --- a/reactos/base/shell/explorer/utility/treedroptarget.h +++ b/reactos/base/shell/explorer/utility/treedroptarget.h @@ -61,7 +61,8 @@ public: /* [out][in] */ DWORD __RPC_FAR *pdwEffect) { TVHITTESTINFO hit; - hit.pt = (POINT&)pt; + hit.pt.x = pt.x; + hit.pt.y = pt.y; ScreenToClient(m_hTargetWnd, &hit.pt); hit.flags = TVHT_ONITEM; HTREEITEM hItem = TreeView_HitTest(m_hTargetWnd,&hit); diff --git a/reactos/base/shell/explorer/utility/utility.h b/reactos/base/shell/explorer/utility/utility.h index 262505d73f3..07931b6dcb4 100644 --- a/reactos/base/shell/explorer/utility/utility.h +++ b/reactos/base/shell/explorer/utility/utility.h @@ -53,7 +53,7 @@ //#include // for alloca() #include //#include // for _MAX_DIR, ... -//#include // for sprintf() +#include // for sprintf() //#include #ifdef __cplusplus diff --git a/reactos/base/shell/explorer/utility/xmlstorage.h b/reactos/base/shell/explorer/utility/xmlstorage.h index 992acbf324b..7e8eb69101c 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.h +++ b/reactos/base/shell/explorer/utility/xmlstorage.h @@ -548,11 +548,15 @@ struct tifstream : public std::istream, FileHolder #ifdef __GNUC__ _buf(_pfile, std::ios::in) #else - _buf(_pfile) + _buf() #endif { if (!_pfile) setstate(badbit); +#ifdef _MSC_VER + else + _buf.open(fileno(_pfile)); +#endif } protected: @@ -570,11 +574,15 @@ struct tofstream : public std::ostream, FileHolder #ifdef __GNUC__ _buf(_pfile, std::ios::out) #else - _buf(_pfile) + _buf() #endif { if (!_pfile) setstate(badbit); +#ifdef _MSC_VER + else + _buf.open(fileno(_pfile)); +#endif } ~tofstream() diff --git a/reactos/include/crt/comutil.h b/reactos/include/crt/comutil.h index 9c6083004c5..036428fab98 100644 --- a/reactos/include/crt/comutil.h +++ b/reactos/include/crt/comutil.h @@ -15,7 +15,7 @@ #define _COM_MEMCPY_S(dest,destsize,src,count) memcpy(dest,src,count) /* Use of wsprintf might be impossible, if strsafe.h is included. */ -#ifndef __STDC_SECURE_LIB__ +#if !defined(__STDC_SECURE_LIB__) || defined(__REACTOS__) #define _COM_PRINTF_S_1(dest,destsize,format,arg1) wsprintf(dest,format,arg1) #elif defined(UNICODE) #define _COM_PRINTF_S_1(dest,destsize,format,arg1) swprintf_s(dest,destsize,format,arg1) From 6e0c97bcbedb753c8f271140c7f3d75e71f1d10d Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 26 Jan 2013 17:29:18 +0000 Subject: [PATCH 55/71] [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeOpenObjectAuditAlarm(). Won't change anything right now since it calls a stub. svn path=/trunk/; revision=58226 --- reactos/ntoskrnl/io/iomgr/file.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c index 73ac71e295b..b2daf039cf5 100644 --- a/reactos/ntoskrnl/io/iomgr/file.c +++ b/reactos/ntoskrnl/io/iomgr/file.c @@ -196,6 +196,7 @@ IopParseDevice(IN PVOID ParseObject, ACCESS_MASK DesiredAccess, GrantedAccess; BOOLEAN AccessGranted, LockHeld = FALSE; PPRIVILEGE_SET Privileges = NULL; + UNICODE_STRING FileString; IOTRACE(IO_FILE_DEBUG, "ParseObject: %p. RemainingName: %wZ\n", ParseObject, RemainingName); @@ -309,7 +310,20 @@ IopParseDevice(IN PVOID ParseObject, OpenPacket->Override= TRUE; } - /* FIXME: Do Audit/Alarm for open operation */ + FileString.Length = 8; + FileString.MaximumLength = 8; + FileString.Buffer = L"File"; + + /* Do Audit/Alarm for open operation */ + SeOpenObjectAuditAlarm(&FileString, + OriginalDeviceObject, + CompleteName, + OriginalDeviceObject->SecurityDescriptor, + AccessState, + FALSE, + AccessGranted, + UserMode, + &AccessState->GenerateOnClose); } else { From 25c6b6c6312c59515c351360e9042a748d9d380c Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 26 Jan 2013 18:21:39 +0000 Subject: [PATCH 56/71] [STLPORT] - Add basic_fstream(FILE *) constructor to make up for the completely broken basic_fstream(int) one [EXPLORER] - Fix accordingly. Also fix totally broken initialization order in t[io]fstream svn path=/trunk/; revision=58227 --- .../base/shell/explorer/utility/xmlstorage.h | 66 ++++++++----------- reactos/include/c++/stlport/stl/_fstream.h | 9 +++ .../stlport/src/details/fstream_stdio.cpp | 35 ++++++++++ 3 files changed, 72 insertions(+), 38 deletions(-) diff --git a/reactos/base/shell/explorer/utility/xmlstorage.h b/reactos/base/shell/explorer/utility/xmlstorage.h index 7e8eb69101c..ea70d8fdd09 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.h +++ b/reactos/base/shell/explorer/utility/xmlstorage.h @@ -516,25 +516,41 @@ extern XS_String DecodeXMLString(const std::string& str); /// base class for XMLStorage::tifstream and XMLStorage::tofstream struct FileHolder { - FileHolder(LPCTSTR path, LPCTSTR mode) +protected: + FileHolder() { -//@@ _MS_VER: temporarily needed for the ReactOS build environment -#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // secure CRT functions using VS 2005 - if (_tfopen_s(&_pfile, path, mode) != 0) - _pfile = NULL; -#else - _pfile = _tfopen(path, mode); -#endif } ~FileHolder() { if (_pfile) fclose(_pfile); + delete _buf; } -protected: - FILE* _pfile; + FILE_FILEBUF* init_buf(LPCTSTR path, std::ios_base::openmode mode) + { + PCTSTR modestr = mode == std::ios::in ? TEXT("rb") : TEXT("wb"); +//@@ _MS_VER: temporarily needed for the ReactOS build environment +#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // secure CRT functions using VS 2005 + if (_tfopen_s(&_pfile, path, modestr) != 0) + _pfile = NULL; +#else + _pfile = _tfopen(path, modestr); +#endif + +#ifdef __GNUC__ + _buf = new FILE_FILEBUF(_pfile, mode); +#else + _buf = new FILE_FILEBUF; + if (_pfile) + _buf->open(_pfile, mode); +#endif + return _buf; + } + + FILE* _pfile; + FILE_FILEBUF* _buf; }; /// input file stream with ANSI/UNICODE file names @@ -543,24 +559,11 @@ struct tifstream : public std::istream, FileHolder typedef std::istream super; tifstream(LPCTSTR path) - : super(&_buf), - FileHolder(path, TEXT("rb")), // binary mode is important for XMLReader::read_buffer() with MinGW libraries -#ifdef __GNUC__ - _buf(_pfile, std::ios::in) -#else - _buf() -#endif + : super(init_buf(path, std::ios::in)) { if (!_pfile) setstate(badbit); -#ifdef _MSC_VER - else - _buf.open(fileno(_pfile)); -#endif } - -protected: - FILE_FILEBUF _buf; }; /// output file stream with ANSI/UNICODE file names @@ -569,29 +572,16 @@ struct tofstream : public std::ostream, FileHolder typedef std::ostream super; tofstream(LPCTSTR path) - : super(&_buf), - FileHolder(path, TEXT("wb")), -#ifdef __GNUC__ - _buf(_pfile, std::ios::out) -#else - _buf() -#endif + : super(init_buf(path, std::ios::out)) { if (!_pfile) setstate(badbit); -#ifdef _MSC_VER - else - _buf.open(fileno(_pfile)); -#endif } ~tofstream() { flush(); } - -protected: - FILE_FILEBUF _buf; }; #else // FILE_FILEBUF diff --git a/reactos/include/c++/stlport/stl/_fstream.h b/reactos/include/c++/stlport/stl/_fstream.h index 1945e411884..1249e956e26 100644 --- a/reactos/include/c++/stlport/stl/_fstream.h +++ b/reactos/include/c++/stlport/stl/_fstream.h @@ -59,6 +59,9 @@ public: // Opening and closing files. bool _M_open(const char*, ios_base::openmode, long __protection); bool _M_open(const char*, ios_base::openmode); bool _M_open(int __id, ios_base::openmode = ios_base::__default_mode); +#if defined (_STLP_USE_STDIO_IO) + bool _M_open(FILE *file, ios_base::openmode = ios_base::__default_mode); +#endif /* _STLP_USE_STDIO_IO */ #if defined (_STLP_USE_WIN32_IO) bool _M_open(_STLP_fd __id, ios_base::openmode = ios_base::__default_mode); #endif /* _STLP_USE_WIN32_IO */ @@ -182,6 +185,12 @@ public: // Opening and closing files. return this->_M_open(__id, _Init_mode); } +# if defined (_STLP_USE_STDIO_IO) + _Self* open(FILE *file, ios_base::openmode _Init_mode = ios_base::__default_mode) { + return _M_base._M_open(file, _Init_mode) ? this : 0; + } +# endif /* _STLP_USE_STDIO_IO */ + # if defined (_STLP_USE_WIN32_IO) _Self* open(_STLP_fd __id, ios_base::openmode _Init_mode = ios_base::__default_mode) { return _M_base._M_open(__id, _Init_mode) ? this : 0; diff --git a/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp b/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp index 8392ffdebc9..ea37a2e5d93 100644 --- a/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp +++ b/reactos/lib/3rdparty/stlport/src/details/fstream_stdio.cpp @@ -300,6 +300,41 @@ bool _Filebuf_base::_M_open( int file_no, ios_base::openmode ) return true; } +bool _Filebuf_base::_M_open(FILE *file, ios_base::openmode openmode) +{ + _STLP_fd file_no; + + if (_M_is_open) + return false; + + _M_file = file; + + if (_M_file) { + file_no = fileno(_M_file); + } else { + return false; + } + + // unset buffering immediately + setbuf(_M_file, 0); + + _M_is_open = true; + + if (openmode & ios_base::ate) { + if (FSEEK(_M_file, 0, SEEK_END) != 0) + _M_is_open = false; + } + + _M_file_id = file_no; + _M_should_close = _M_is_open; + _M_openmode = openmode; + + if (_M_is_open) + _M_regular_file = _STLP_PRIV __is_regular_file(_M_file_id); + + return (_M_is_open != 0); +} + bool _Filebuf_base::_M_close() { if (!_M_is_open) From 073f350f87ee57889f8d3ad23febf900f926374b Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 26 Jan 2013 18:34:33 +0000 Subject: [PATCH 57/71] [INCLUDE] - Actually put in the C++ headers what our CRT implements, instead of some random mix of libstdc++ and who knows what. This means the header contents are somewhat outdated and non-standard, but that's preferable to unusable - Fix a forward declaration in math.h svn path=/trunk/; revision=58228 --- reactos/include/c++/exception | 64 +++++++++++---------------- reactos/include/c++/new | 26 ++++++----- reactos/include/c++/typeinfo | 81 +++++++++++++++++++++-------------- reactos/include/crt/math.h | 2 +- 4 files changed, 87 insertions(+), 86 deletions(-) diff --git a/reactos/include/c++/exception b/reactos/include/c++/exception index f2bd94f661c..76af754457d 100644 --- a/reactos/include/c++/exception +++ b/reactos/include/c++/exception @@ -5,56 +5,42 @@ extern "C++" { -namespace std +class exception { - /** - * @defgroup exceptions Exceptions - * @ingroup diagnostics - * - * Classes and functions for reporting errors via exception classes. - * @{ - */ +public: + exception() throw(); + exception(const char * const &) throw(); + exception(const char * const &, int) throw(); - /** - * @brief Base class for all library exceptions. - * - * This is the base class for all exceptions thrown by the standard - * library, and by certain language expressions. You are free to derive - * your own %exception classes, or use a different hierarchy, or to - * throw non-class data (e.g., fundamental types). - */ - class exception - { - public: - exception() throw() { } virtual ~exception() throw(); - /** Returns a C-style character string describing the general cause - * of the current error. */ - virtual const char* what() const throw(); - }; + virtual const char *what() const throw(); +private: + const char *_name; + int _do_free; +}; - /** If an %exception is thrown which is not listed in a function's - * %exception specification, one of these may be thrown. */ - class bad_exception : public exception - { - public: - bad_exception() throw() { } +class bad_exception : public exception +{ +public: + bad_exception(const char *name = "bad exception") throw() + : exception(name) { } - virtual ~bad_exception() throw(); + virtual ~bad_exception() throw() { } +}; - virtual const char* what() const throw(); - }; +namespace std +{ + using ::exception; + using ::bad_exception; - typedef void (*unexpected_handler) (); + typedef void (*unexpected_handler) (); - unexpected_handler set_unexpected(unexpected_handler) throw(); + unexpected_handler set_unexpected(unexpected_handler) throw(); - __MINGW_ATTRIB_NORETURN void unexpected(); + __MINGW_ATTRIB_NORETURN void unexpected(); - bool uncaught_exception() throw(); - - // @} group exceptions + bool uncaught_exception() throw(); } // namespace std typedef void (*terminate_handler) (); diff --git a/reactos/include/c++/new b/reactos/include/c++/new index 29617fdb15d..821410e31d4 100644 --- a/reactos/include/c++/new +++ b/reactos/include/c++/new @@ -8,24 +8,22 @@ extern "C++" { -namespace std +class bad_alloc : public exception { - class bad_alloc : public exception - { - public: - bad_alloc() throw() { } +public: + bad_alloc(const char *name = "bad alloc") throw() + : exception(name) { } - // This declaration is not useless: - // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118 - virtual ~bad_alloc() throw(); + virtual ~bad_alloc() throw() { } +}; - // See comment in eh_exception.cc. - virtual const char* what() const throw(); - }; +namespace std +{ + using ::bad_alloc; - struct nothrow_t { }; + struct nothrow_t { }; - extern const nothrow_t nothrow; + extern const nothrow_t nothrow; } // namespace std typedef void (*new_handler)(); @@ -43,7 +41,7 @@ inline void operator delete (void* ptr, void* voidptr2) throw() { } void operator delete[] (void* ptr) throw (); void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw(); inline void operator delete[] (void* ptr, void* voidptr2) throw() { } -//@} + } // extern "C++" #endif diff --git a/reactos/include/c++/typeinfo b/reactos/include/c++/typeinfo index b364733e4e9..43dbb26e906 100644 --- a/reactos/include/c++/typeinfo +++ b/reactos/include/c++/typeinfo @@ -7,41 +7,58 @@ extern "C++" { -namespace std +class type_info { +public: + virtual ~type_info(); + + int before(const type_info &) const; + const char *name() const; + const char *raw_name() const; + + int operator==(const type_info &) const; + int operator!=(const type_info &) const; +private: + char *_name; + char _mangled[32]; + + type_info(const type_info &); + type_info &operator=(const type_info &); +}; + +class bad_cast : public exception { +public: + bad_cast(const char *name = "bad cast") throw() + : exception(name) { } + bad_cast(const char * const *) throw(); + bad_cast(const char * const &) throw(); - class type_info { - public: - virtual ~type_info(); - bool before (const type_info& arg) const - { return __name < __arg.__name; } - bool operator==(const type_info& __arg) const - { return __name == __arg.__name; } - bool operator!=(const type_info& __arg) const - { return !operator==(__arg); } - const char* name() const; - protected: - const char* __name; - private: - type_info (const type_info& rhs); - type_info& operator= (const type_info& rhs); - }; + virtual ~bad_cast() throw() { } +}; - class bad_cast : public exception - { - public: - bad_cast() throw() { } - virtual ~bad_cast() throw(); - virtual const char* what() const throw(); - }; - - class bad_typeid : public exception - { - public: - bad_typeid () throw() { } - virtual ~bad_typeid() throw(); - virtual const char* what() const throw(); - }; +class bad_typeid : public exception +{ +public: + bad_typeid(const char *name = "bad typeid") throw() + : exception(name) { } + + virtual ~bad_typeid() throw() { } +}; + +class __non_rtti_object : public bad_typeid +{ +public: + __non_rtti_object(const char *name) throw() + : bad_typeid(name) { } + + virtual ~__non_rtti_object() throw() { } +}; + +namespace std +{ + using ::type_info; + using ::bad_cast; + using ::bad_typeid; } // namespace std } // extern "C++" diff --git a/reactos/include/crt/math.h b/reactos/include/crt/math.h index 072293d6dea..3b0a5420477 100644 --- a/reactos/include/crt/math.h +++ b/reactos/include/crt/math.h @@ -8,7 +8,7 @@ #include "crtdefs.h" -struct exception; +struct _exception; #pragma pack(push,_CRT_PACKING) From e6f8602d9d20c7a25a957c3068be481f2ea567a9 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 26 Jan 2013 19:33:54 +0000 Subject: [PATCH 58/71] [NTOSKRNL] Implement SeFastTraverseCheck(). For more information, see: - http://msdn.microsoft.com/en-us/library/windows/desktop/aa374872(v=vs.85).aspx - http://msdn.microsoft.com/en-us/library/windows/desktop/aa446683(v=vs.85).aspx svn path=/trunk/; revision=58230 --- reactos/ntoskrnl/include/internal/se.h | 7 +++ reactos/ntoskrnl/se/semgr.c | 67 ++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/reactos/ntoskrnl/include/internal/se.h b/reactos/ntoskrnl/include/internal/se.h index 13f18e23f11..b045d428138 100644 --- a/reactos/ntoskrnl/include/internal/se.h +++ b/reactos/ntoskrnl/include/internal/se.h @@ -490,6 +490,13 @@ VOID NTAPI SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); +BOOLEAN +NTAPI +SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PACCESS_STATE AccessState, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode); + #endif /* EOF */ diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c index 855f528e7f9..51e889ffbaf 100644 --- a/reactos/ntoskrnl/se/semgr.c +++ b/reactos/ntoskrnl/se/semgr.c @@ -820,6 +820,73 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, return ret; } +/* + * @implemented + */ +BOOLEAN +NTAPI +SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PACCESS_STATE AccessState, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode) +{ + PACL Dacl; + ULONG AceIndex; + PKNOWN_ACE Ace; + + PAGED_CODE(); + + NT_ASSERT(AccessMode != KernelMode); + + if (SecurityDescriptor == NULL) + return FALSE; + + /* Get DACL */ + Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); + /* If no DACL, grant access */ + if (Dacl == NULL) + return TRUE; + + /* No ACE -> Deny */ + if (!Dacl->AceCount) + return FALSE; + + /* Can't perform the check on restricted token */ + if (AccessState->Flags & TOKEN_IS_RESTRICTED) + return FALSE; + + /* Browse the ACEs */ + for (AceIndex = 0, Ace = (PKNOWN_ACE)((ULONG_PTR)Dacl + sizeof(ACL)); + AceIndex < Dacl->AceCount; + AceIndex++, Ace = (PKNOWN_ACE)((ULONG_PTR)Ace + Ace->Header.AceSize)) + { + if (Ace->Header.AceFlags & INHERIT_ONLY_ACE) + continue; + + /* If access-allowed ACE */ + if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE) + { + /* Check if all accesses are granted */ + if (!(Ace->Mask & DesiredAccess)) + continue; + + /* Check SID and grant access if matching */ + if (RtlEqualSid(SeWorldSid, &(Ace->SidStart))) + return TRUE; + } + /* If access-denied ACE */ + else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE) + { + /* Here, only check if it denies all the access wanted and deny if so */ + if (Ace->Mask & DesiredAccess) + return FALSE; + } + } + + /* Faulty, deny */ + return FALSE; +} + /* SYSTEM CALLS ***************************************************************/ /* From 705173ebd5393165d1b1a4d6b1609b6e0db0bb91 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 26 Jan 2013 19:37:01 +0000 Subject: [PATCH 59/71] [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeFastTraverseCheck for traverse access check svn path=/trunk/; revision=58231 --- reactos/ntoskrnl/io/iomgr/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c index b2daf039cf5..14d3c0c8587 100644 --- a/reactos/ntoskrnl/io/iomgr/file.c +++ b/reactos/ntoskrnl/io/iomgr/file.c @@ -335,8 +335,11 @@ IopParseDevice(IN PVOID ParseObject, /* Check if this is a restricted token */ if (!(AccessState->Flags & TOKEN_IS_RESTRICTED)) { - /* FIXME: Do the FAST traverse check */ - AccessGranted = FALSE; + /* Do the FAST traverse check */ + AccessGranted = SeFastTraverseCheck(OriginalDeviceObject->SecurityDescriptor, + AccessState, + FILE_TRAVERSE, + UserMode); } else { From 4ad0f2245b09f9c2cc192ecaa45773d570a17b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 26 Jan 2013 23:14:05 +0000 Subject: [PATCH 60/71] [SERVICES] Fix acquiring/releasing driver-loading and unloading privilege (see r57754) by using the RtlAdjustPrivilege API instead of using the standard user-mode Win32 API (thus get rid of calling LSA when calling LookupPrivilegeValueW). svn path=/trunk/; revision=58233 --- reactos/base/system/services/driver.c | 98 +++++++------------------ reactos/base/system/services/services.h | 1 + 2 files changed, 29 insertions(+), 70 deletions(-) diff --git a/reactos/base/system/services/driver.c b/reactos/base/system/services/driver.c index b8023dcedb9..8526b663211 100644 --- a/reactos/base/system/services/driver.c +++ b/reactos/base/system/services/driver.c @@ -16,57 +16,13 @@ /* FUNCTIONS ****************************************************************/ -static DWORD EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) -{ - DWORD dwRet = ERROR_SUCCESS; - HANDLE hToken = NULL; - - if (OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES, - &hToken)) - { - TOKEN_PRIVILEGES tp; - - tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); - - if (LookupPrivilegeValueW(NULL, - lpszPrivilegeName, - &tp.Privileges[0].Luid)) - { - if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL)) - { - if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) - dwRet = ERROR_NOT_ALL_ASSIGNED; - } - else - { - dwRet = GetLastError(); - } - } - else - { - dwRet = GetLastError(); - } - - CloseHandle(hToken); - } - else - { - dwRet = GetLastError(); - } - - return dwRet; -} - - DWORD ScmLoadDriver(PSERVICE lpService) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ @@ -87,38 +43,38 @@ ScmLoadDriver(PSERVICE lpService) DPRINT(" Path: %wZ\n", &DriverPath); /* Acquire driver-loading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("SERVICES: Cannot acquire driver-loading privilege, error = %lu\n", dwError); + DPRINT1("SERVICES: Cannot acquire driver-loading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtLoadDriver(&DriverPath); /* Release driver-loading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: HeapFree(GetProcessHeap(), 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } DWORD ScmUnloadDriver(PSERVICE lpService) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ @@ -136,29 +92,31 @@ ScmUnloadDriver(PSERVICE lpService) RtlInitUnicodeString(&DriverPath, pszDriverPath); + DPRINT(" Path: %wZ\n", &DriverPath); + /* Acquire driver-unloading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("SERVICES: Cannot acquire driver-unloading privilege, error = %lu\n", dwError); + DPRINT1("SERVICES: Cannot acquire driver-unloading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtUnloadDriver(&DriverPath); /* Release driver-unloading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: HeapFree(GetProcessHeap(), 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h index 076ea38cbd8..8e13a3e342a 100644 --- a/reactos/base/system/services/services.h +++ b/reactos/base/system/services/services.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include From 3f7404e73b7fce569425b61c0ca69862679e8704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 26 Jan 2013 23:43:28 +0000 Subject: [PATCH 61/71] [SMSS] Load the Win32k driver from the path mentioned in the Kmode value of the registry, not via a hardcoded value. svn path=/trunk/; revision=58235 --- reactos/base/system/smss/smsubsys.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/reactos/base/system/smss/smsubsys.c b/reactos/base/system/smss/smsubsys.c index 0ddc0c2dd9e..73db95e488c 100644 --- a/reactos/base/system/smss/smsubsys.c +++ b/reactos/base/system/smss/smsubsys.c @@ -515,7 +515,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, { NTSTATUS Status = STATUS_SUCCESS, Status2; PSMP_REGISTRY_VALUE RegEntry; - UNICODE_STRING DestinationString, NtPath; + UNICODE_STRING NtPath; PLIST_ENTRY NextEntry; LARGE_INTEGER Timeout; PVOID State; @@ -539,7 +539,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, { /* Get the entry and check if this is the special Win32k entry */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (!_wcsicmp(RegEntry->Name.Buffer, L"Kmode")) + if (_wcsicmp(RegEntry->Name.Buffer, L"Kmode") == 0) { /* Translate it */ if (!RtlDosPathNameToNtPathName_U(RegEntry->Value.Buffer, @@ -571,11 +571,9 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, AttachedSessionId = *MuSessionId; /* Start Win32k.sys on this session */ - RtlInitUnicodeString(&DestinationString, - L"\\SystemRoot\\System32\\win32k.sys"); Status = NtSetSystemInformation(SystemExtendServiceTableInformation, - &DestinationString, - sizeof(DestinationString)); + &NtPath, + sizeof(NtPath)); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPath.Buffer); SmpReleasePrivilege(State); if (!NT_SUCCESS(Status)) @@ -597,15 +595,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (_wcsicmp(RegEntry->Name.Buffer, L"debug")) - { - /* Load the required subsystem */ - Status = SmpExecuteCommand(&RegEntry->Value, - *MuSessionId, - ProcessId, - SMP_SUBSYSTEM_FLAG); - } - else + if (_wcsicmp(RegEntry->Name.Buffer, L"debug") == 0) { /* Load the internal debug system */ Status = SmpExecuteCommand(&RegEntry->Value, @@ -613,6 +603,14 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, ProcessId, SMP_DEBUG_FLAG | SMP_SUBSYSTEM_FLAG); } + else + { + /* Load the required subsystem */ + Status = SmpExecuteCommand(&RegEntry->Value, + *MuSessionId, + ProcessId, + SMP_SUBSYSTEM_FLAG); + } if (!NT_SUCCESS(Status)) { DbgPrint("SMSS: Subsystem execute failed (%WZ)\n", &RegEntry->Value); From 7ef6decbcf48420aec79f523ffad3d9f20b77f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 26 Jan 2013 23:56:07 +0000 Subject: [PATCH 62/71] [SMSS] Clarify a bit the code. No logical changes. svn path=/trunk/; revision=58236 --- reactos/base/system/smss/sminit.c | 36 +++++++++++++++-------------- reactos/base/system/smss/smsubsys.c | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/reactos/base/system/smss/sminit.c b/reactos/base/system/smss/sminit.c index 2e11fa652a9..2e0e006edee 100644 --- a/reactos/base/system/smss/sminit.c +++ b/reactos/base/system/smss/sminit.c @@ -463,15 +463,17 @@ SmpConfigureKnownDlls(IN PWSTR ValueName, IN PVOID EntryContext) { /* Check which value is being set */ - if (_wcsicmp(ValueName, L"DllDirectory")) + if (_wcsicmp(ValueName, L"DllDirectory") == 0) + { + /* This is the directory, initialize it */ + DPRINT("KnownDll Path: %S\n", ValueData); + return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength); + } + else { /* Add to the linked list -- this is a file */ return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); } - - /* This is the directory, initialize it */ - DPRINT("KnownDll Path: %S\n", ValueData); - return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength); } NTSTATUS @@ -499,7 +501,7 @@ SmpConfigureEnvironment(IN PWSTR ValueName, } /* Check if the path is being set, and wait for the second instantiation */ - if (!(_wcsicmp(ValueName, L"Path")) && (++SmpCalledConfigEnv == 2)) + if ((_wcsicmp(ValueName, L"Path") == 0) && (++SmpCalledConfigEnv == 2)) { /* Allocate the path buffer */ SmpDefaultLibPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -528,12 +530,12 @@ SmpConfigureSubSystems(IN PWSTR ValueName, PSMP_REGISTRY_VALUE RegEntry; PWCHAR SubsystemName; - /* Is this a required or optional subsystem */ - if ((_wcsicmp(ValueName, L"Required")) && - (_wcsicmp(ValueName, L"Optional"))) + /* Is this a required or optional subsystem? */ + if ((_wcsicmp(ValueName, L"Required") != 0) && + (_wcsicmp(ValueName, L"Optional") != 0)) { /* It isn't, is this the PSI flag? */ - if ((_wcsicmp(ValueName, L"PosixSingleInstance")) || + if ((_wcsicmp(ValueName, L"PosixSingleInstance") != 0) || (ValueType != REG_DWORD)) { /* It isn't, must be a subsystem entry, add it to the list */ @@ -567,18 +569,18 @@ SmpConfigureSubSystems(IN PWSTR ValueName, RemoveEntryList(&RegEntry->Entry); /* Figure out which list to put it in */ - if (_wcsicmp(ValueName, L"Required")) - { - /* Put it into the optional list */ - DPRINT("Optional\n"); - InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry); - } - else + if (_wcsicmp(ValueName, L"Required") == 0) { /* Put it into the required list */ DPRINT("Required\n"); InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry); } + else + { + /* Put it into the optional list */ + DPRINT("Optional\n"); + InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry); + } } /* Move to the next name */ diff --git a/reactos/base/system/smss/smsubsys.c b/reactos/base/system/smss/smsubsys.c index 73db95e488c..50775375ac3 100644 --- a/reactos/base/system/smss/smsubsys.c +++ b/reactos/base/system/smss/smsubsys.c @@ -595,7 +595,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (_wcsicmp(RegEntry->Name.Buffer, L"debug") == 0) + if (_wcsicmp(RegEntry->Name.Buffer, L"Debug") == 0) { /* Load the internal debug system */ Status = SmpExecuteCommand(&RegEntry->Value, From 20acbf7dfa7f93dbc0e169cccdb7044d0df59e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 27 Jan 2013 00:07:58 +0000 Subject: [PATCH 63/71] [BOOTDATA-SMLIB] "SubSystems" name letter-case consistency modification. svn path=/trunk/; revision=58237 --- reactos/boot/bootdata/hivesys_amd64.inf | 14 +++++++------- reactos/boot/bootdata/hivesys_arm.inf | 14 +++++++------- reactos/boot/bootdata/hivesys_i386.inf | 14 +++++++------- reactos/lib/smlib/lookupss.c | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/reactos/boot/bootdata/hivesys_amd64.inf b/reactos/boot/bootdata/hivesys_amd64.inf index d82e474ae8f..bddeb617007 100644 --- a/reactos/boot/bootdata/hivesys_amd64.inf +++ b/reactos/boot/bootdata/hivesys_amd64.inf @@ -1236,13 +1236,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wldap32",0x00 ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" diff --git a/reactos/boot/bootdata/hivesys_arm.inf b/reactos/boot/bootdata/hivesys_arm.inf index 3fe79869cdd..94636862085 100644 --- a/reactos/boot/bootdata/hivesys_arm.inf +++ b/reactos/boot/bootdata/hivesys_arm.inf @@ -788,13 +788,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wldap32",0x00 ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf index d82e474ae8f..bddeb617007 100644 --- a/reactos/boot/bootdata/hivesys_i386.inf +++ b/reactos/boot/bootdata/hivesys_i386.inf @@ -1236,13 +1236,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wldap32",0x00 ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" diff --git a/reactos/lib/smlib/lookupss.c b/reactos/lib/smlib/lookupss.c index 8a3e6b6223c..e1e892f93ab 100644 --- a/reactos/lib/smlib/lookupss.c +++ b/reactos/lib/smlib/lookupss.c @@ -15,12 +15,12 @@ * * DESCRIPTION * Read from the registry key - * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems + * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems * the value which name is Name. * * ARGUMENTS * Name: name of the program to run, that is a value's name in - * the SM registry key Subsystems; + * the SM registry key SubSystems; * Data: what the registry gave back for Name; * DataLength: how much Data the registry returns; * DataType: what is Data? From 0b3f274e0eecc3f12c49a07014ac8a33f47662bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 27 Jan 2013 00:19:43 +0000 Subject: [PATCH 64/71] [SMSS] - Uniformize the error messages and also, SmpParseCommand is SmpParseCommandLine in fact. - Remove an unneeded cast since Flags is already ULONG. svn path=/trunk/; revision=58238 --- reactos/base/system/smss/pagefile.c | 2 +- reactos/base/system/smss/smss.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/base/system/smss/pagefile.c b/reactos/base/system/smss/pagefile.c index 115d93949b9..c94707287ea 100644 --- a/reactos/base/system/smss/pagefile.c +++ b/reactos/base/system/smss/pagefile.c @@ -109,7 +109,7 @@ SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken) if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT1("SMSS:PFILE: SmpParseCommandLine(%wZ) failed with status %X \n", + DPRINT1("SMSS:PFILE: SmpParseCommandLine( %wZ ) failed - Status == %lx\n", PageFileToken, Status); return Status; } diff --git a/reactos/base/system/smss/smss.c b/reactos/base/system/smss/smss.c index 2f24138b1d5..83c9cb41896 100644 --- a/reactos/base/system/smss/smss.c +++ b/reactos/base/system/smss/smss.c @@ -235,7 +235,7 @@ SmpExecuteCommand(IN PUNICODE_STRING CommandLine, if (!NT_SUCCESS(Status)) { /* Fail if we couldn't do that */ - DPRINT1("SMSS: SmpParseCommand( %wZ ) failed - Status == %lx\n", + DPRINT1("SMSS: SmpParseCommandLine( %wZ ) failed - Status == %lx\n", CommandLine, Status); return Status; } @@ -312,7 +312,7 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, /* Parse the initial command line */ Status = SmpParseCommandLine(InitialCommand, - (PULONG)&Flags, + &Flags, &ImageFileName, &ImageFileDirectory, &Arguments); @@ -327,7 +327,7 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, /* And fail if any other reason is also true */ if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS: SmpParseCommand( %wZ ) failed - Status == %lx\n", + DPRINT1("SMSS: SmpParseCommandLine( %wZ ) failed - Status == %lx\n", InitialCommand, Status); return Status; } From f7a609c7fcbcc13f57e6b992e70f20149d582e6f Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 27 Jan 2013 09:50:20 +0000 Subject: [PATCH 65/71] [NTOSKRNL] In ObpCheckTraverseAccess() first try to perform a fast traverse check before doing the entire access check. svn path=/trunk/; revision=58239 --- reactos/ntoskrnl/ob/obsecure.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/reactos/ntoskrnl/ob/obsecure.c b/reactos/ntoskrnl/ob/obsecure.c index 3982258fcd6..fbc3c8e2ebb 100644 --- a/reactos/ntoskrnl/ob/obsecure.c +++ b/reactos/ntoskrnl/ob/obsecure.c @@ -301,6 +301,20 @@ ObpCheckTraverseAccess(IN PVOID Object, return FALSE; } + /* First try to perform a fast traverse check + * If it fails, then the entire access check will + * have to be done. + */ + Result = SeFastTraverseCheck(SecurityDescriptor, + AccessState, + FILE_WRITE_DATA, + AccessMode); + if (Result) + { + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + return TRUE; + } + /* Lock the security context */ SeLockSubjectContext(&AccessState->SubjectSecurityContext); From 50b1d52ba9adfa052c45cecce4f3ad27da8845f4 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 27 Jan 2013 11:39:09 +0000 Subject: [PATCH 66/71] [KSPROXY] - Fix some MSVC and GCC 4.7 warnings svn path=/trunk/; revision=58240 --- reactos/dll/directx/ksproxy/allocator.cpp | 2 +- reactos/dll/directx/ksproxy/output_pin.cpp | 2 +- reactos/dll/directx/ksproxy/proxy.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/directx/ksproxy/allocator.cpp b/reactos/dll/directx/ksproxy/allocator.cpp index 8229bd2f56e..22db5540cc9 100644 --- a/reactos/dll/directx/ksproxy/allocator.cpp +++ b/reactos/dll/directx/ksproxy/allocator.cpp @@ -583,7 +583,7 @@ CKsAllocator::FreeMediaSamples() { IMediaSample * Sample = m_FreeList.top(); m_FreeList.pop(); - delete Sample; + Sample->Release(); } m_FreeSamples = false; diff --git a/reactos/dll/directx/ksproxy/output_pin.cpp b/reactos/dll/directx/ksproxy/output_pin.cpp index ac9078bac03..a272542be52 100644 --- a/reactos/dll/directx/ksproxy/output_pin.cpp +++ b/reactos/dll/directx/ksproxy/output_pin.cpp @@ -1681,7 +1681,7 @@ COutputPin::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) if (GetSupportedSets(&pGuid, &NumGuids)) { // load all proxy plugins - if (FAILED(LoadProxyPlugins(pGuid, NumGuids))); + if (FAILED(LoadProxyPlugins(pGuid, NumGuids))) { #ifdef KSPROXY_TRACE OutputDebugStringW(L"COutputPin::Connect LoadProxyPlugins failed\n"); diff --git a/reactos/dll/directx/ksproxy/proxy.cpp b/reactos/dll/directx/ksproxy/proxy.cpp index 175eff205ca..177be29a174 100644 --- a/reactos/dll/directx/ksproxy/proxy.cpp +++ b/reactos/dll/directx/ksproxy/proxy.cpp @@ -208,7 +208,6 @@ protected: CKsProxy::CKsProxy() : m_Ref(0), m_pGraph(0), - m_ReferenceClock((IReferenceClock*)this), m_FilterState(State_Stopped), m_hDevice(0), m_Plugins(), @@ -216,6 +215,7 @@ CKsProxy::CKsProxy() : m_Ref(0), m_DevicePath(0), m_hClock(0) { + m_ReferenceClock = this; InitializeCriticalSection(&m_Lock); } From 9fd0632528b5127d280def0c2fc94cc91d334fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 27 Jan 2013 13:55:04 +0000 Subject: [PATCH 67/71] [SMSS] Revert my change of loading the win32k kernel-mode subsystem driver by reading the Kmode value and use instead a hardcoded value, per request of Alex. I'm wondering why Windows wouldn't allow you to use a personalized value there and forces you to use win32k with this name, placed in \SystemRoot\System32 directory and not in an other place. svn path=/trunk/; revision=58241 --- reactos/base/system/smss/smsubsys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/reactos/base/system/smss/smsubsys.c b/reactos/base/system/smss/smsubsys.c index 50775375ac3..e18435e4e46 100644 --- a/reactos/base/system/smss/smsubsys.c +++ b/reactos/base/system/smss/smsubsys.c @@ -515,7 +515,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, { NTSTATUS Status = STATUS_SUCCESS, Status2; PSMP_REGISTRY_VALUE RegEntry; - UNICODE_STRING NtPath; + UNICODE_STRING DestinationString, NtPath; PLIST_ENTRY NextEntry; LARGE_INTEGER Timeout; PVOID State; @@ -570,10 +570,15 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, } AttachedSessionId = *MuSessionId; - /* Start Win32k.sys on this session */ + /* + * Start Win32k.sys on this session. Use a hardcoded value + * instead of the Kmode one... + */ + RtlInitUnicodeString(&DestinationString, + L"\\SystemRoot\\System32\\win32k.sys"); Status = NtSetSystemInformation(SystemExtendServiceTableInformation, - &NtPath, - sizeof(NtPath)); + &DestinationString, + sizeof(DestinationString)); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPath.Buffer); SmpReleasePrivilege(State); if (!NT_SUCCESS(Status)) From a12df330473fff99f215372f4c8bd941cc9c3341 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 27 Jan 2013 16:08:54 +0000 Subject: [PATCH 68/71] [BUGCODES] Add the bug code for IoCancelFileOpen() svn path=/trunk/; revision=58242 --- reactos/include/reactos/mc/bugcodes.mc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reactos/include/reactos/mc/bugcodes.mc b/reactos/include/reactos/mc/bugcodes.mc index 6c52496a5f6..2215606124f 100644 --- a/reactos/include/reactos/mc/bugcodes.mc +++ b/reactos/include/reactos/mc/bugcodes.mc @@ -1469,6 +1469,14 @@ Language=English POWER_FAILURE_SIMULATE . +MessageId=0xE8 +Severity=Success +Facility=System +SymbolicName=INVALID_CANCEL_OF_FILE_OPEN +Language=English +Invalid cancel of a open file. It already has handle. +. + MessageId=0xE9 Severity=Success Facility=System From fc5c683b7b6f4f352920ec9826f4334a081f0c14 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 27 Jan 2013 16:11:55 +0000 Subject: [PATCH 69/71] [NTOSKRNL] Implement IopAllocateIrpMustSucceed() which is designed to *normally* always return an IRP. Even in low memory situations (if you wait enough). svn path=/trunk/; revision=58243 --- reactos/ntoskrnl/include/internal/io.h | 6 +++++ reactos/ntoskrnl/io/iomgr/irp.c | 34 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h index 24129c9cd3a..2402df5e5fb 100644 --- a/reactos/ntoskrnl/include/internal/io.h +++ b/reactos/ntoskrnl/include/internal/io.h @@ -903,6 +903,12 @@ IopAbortInterruptedIrp( IN PIRP Irp ); +PIRP +NTAPI +IopAllocateIrpMustSucceed( + IN CCHAR StackSize +); + // // Shutdown routines // diff --git a/reactos/ntoskrnl/io/iomgr/irp.c b/reactos/ntoskrnl/io/iomgr/irp.c index f3a4bda81eb..ee6e3aa7fdd 100644 --- a/reactos/ntoskrnl/io/iomgr/irp.c +++ b/reactos/ntoskrnl/io/iomgr/irp.c @@ -625,6 +625,40 @@ IoAllocateIrp(IN CCHAR StackSize, return Irp; } +/* + * @implemented + */ +PIRP +NTAPI +IopAllocateIrpMustSucceed(IN CCHAR StackSize) +{ + LONG i; + PIRP Irp; + LARGE_INTEGER Sleep; + + /* Try to get an IRP */ + Irp = IoAllocateIrp(StackSize, FALSE); + if (Irp) + return Irp; + + /* If we fail, start looping till we may get one */ + i = LONG_MAX; + do { + i--; + + /* First, sleep for 10ms */ + Sleep.QuadPart = -10 * 1000 * 10;; + KeDelayExecutionThread(KernelMode, FALSE, &Sleep); + + /* Then, retry allocation */ + Irp = IoAllocateIrp(StackSize, FALSE); + if (Irp) + return Irp; + } while (i > 0); + + return Irp; +} + /* * @implemented */ From 48c45bbe684fd62191ece5fe9ffa6c9ffba19b4b Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 27 Jan 2013 16:18:00 +0000 Subject: [PATCH 70/71] [NTOSKRNL] Implement IoCancelFileOpen(). You can read: http://www.osronline.com/showThread.cfm?link=20807 Even though the proposed implementation is closer to W2K implementation than to W2K3 implementation In W2K3, no IRP is issued with major close. svn path=/trunk/; revision=58244 --- reactos/ntoskrnl/io/iomgr/file.c | 54 ++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c index 14d3c0c8587..b09cb78e84b 100644 --- a/reactos/ntoskrnl/io/iomgr/file.c +++ b/reactos/ntoskrnl/io/iomgr/file.c @@ -2488,14 +2488,64 @@ IoSetShareAccess(IN ACCESS_MASK DesiredAccess, } /* - * @unimplemented + * @implemented */ VOID NTAPI IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, IN PFILE_OBJECT FileObject) { - UNIMPLEMENTED; + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + + /* Check if handles were already created for the + * open file. If so, that's over. + */ + if (FileObject->Flags & FO_HANDLE_CREATED) + KeBugCheckEx(INVALID_CANCEL_OF_FILE_OPEN, + (ULONG_PTR)FileObject, + (ULONG_PTR)DeviceObject, 0, 0); + + /* Reset the events */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + KeClearEvent(&FileObject->Event); + + /* Allocate the IRP we'll use */ + Irp = IopAllocateIrpMustSucceed(DeviceObject->StackSize); + /* Properly set it */ + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserEvent = &Event; + Irp->UserIosb = &Irp->IoStatus; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; + + Stack = IoGetNextIrpStackLocation(Irp); + Stack->MajorFunction = IRP_MJ_CLEANUP; + Stack->FileObject = FileObject; + + // FIXME: Put on top of IRPs list of the thread + + /* Call the driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, UserRequest, + KernelMode, FALSE, NULL); + } + + // FIXME: Remove from IRPs list + + /* Free the IRP */ + IoFreeIrp(Irp); + + /* Clear the event */ + KeClearEvent(&FileObject->Event); + /* And finally, mark the open operation as canceled */ + FileObject->Flags |= FO_FILE_OPEN_CANCELLED; } /* From 55be9e4adc344e67362be871e671e07178d75b3b Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 27 Jan 2013 16:38:24 +0000 Subject: [PATCH 71/71] [NTOSKRNL] Properly queue the IRP in IoCancelFileOpen() svn path=/trunk/; revision=58245 --- reactos/ntoskrnl/io/iomgr/file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c index b09cb78e84b..37a60796291 100644 --- a/reactos/ntoskrnl/io/iomgr/file.c +++ b/reactos/ntoskrnl/io/iomgr/file.c @@ -2497,6 +2497,7 @@ IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, { PIRP Irp; KEVENT Event; + KIRQL OldIrql; NTSTATUS Status; PIO_STACK_LOCATION Stack; @@ -2527,7 +2528,8 @@ IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, Stack->MajorFunction = IRP_MJ_CLEANUP; Stack->FileObject = FileObject; - // FIXME: Put on top of IRPs list of the thread + /* Put on top of IRPs list of the thread */ + IopQueueIrpToThread(Irp); /* Call the driver */ Status = IoCallDriver(DeviceObject, Irp); @@ -2537,7 +2539,10 @@ IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, KernelMode, FALSE, NULL); } - // FIXME: Remove from IRPs list + /* Remove from IRPs list */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopUnQueueIrpFromThread(Irp); + KeLowerIrql(OldIrql); /* Free the IRP */ IoFreeIrp(Irp);