Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 03/03: [VCDCLI] Implement a tool that allows managing vcdrom class driver. It allows you managing virtual drives, mounting images, ejecting images, and so on.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=581f32b8c207c4c366b69… commit 581f32b8c207c4c366b690ccc9e05f2d97fecf45 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 3 18:13:25 2017 +0100 [VCDCLI] Implement a tool that allows managing vcdrom class driver. It allows you managing virtual drives, mounting images, ejecting images, and so on. It will load the driver when required. It's less features complete that the MS GUI implementation. I'll implement them later on, it can be quickly done. What's missing: UDF/Joliet suppr and persistent mounts --- .../rosapps/applications/cmdutils/CMakeLists.txt | 1 + .../applications/cmdutils/vcdcli/CMakeLists.txt | 6 + .../rosapps/applications/cmdutils/vcdcli/vcdcli.c | 558 +++++++++++++++++++++ .../rosapps/applications/cmdutils/vcdcli/vcdcli.rc | 5 + 4 files changed, 570 insertions(+) diff --git a/modules/rosapps/applications/cmdutils/CMakeLists.txt b/modules/rosapps/applications/cmdutils/CMakeLists.txt index 8a47be4e68..843b2c5be5 100644 --- a/modules/rosapps/applications/cmdutils/CMakeLists.txt +++ b/modules/rosapps/applications/cmdutils/CMakeLists.txt @@ -5,5 +5,6 @@ add_subdirectory(gflags) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) +add_subdirectory(vcdcli) add_subdirectory(winspool_print) add_subdirectory(y) diff --git a/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt b/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt new file mode 100644 index 0000000000..528bfb6d47 --- /dev/null +++ b/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt @@ -0,0 +1,6 @@ + +include_directories(${REACTOS_SOURCE_DIR}/modules/rosapps/drivers/vcdrom) +add_executable(vcdcli vcdcli vcdcli.rc) +set_module_type(vcdcli win32cui UNICODE) +add_importlibs(vcdcli advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET vcdcli DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c new file mode 100644 index 0000000000..315dc958bc --- /dev/null +++ b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c @@ -0,0 +1,558 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c + * PURPOSE: Virtual CD-ROM management application + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winsvc.h> +#include <ndk/rtltypes.h> +#include <ndk/rtlfuncs.h> +#include <tchar.h> +#include <stdio.h> + +#include <vcdioctl.h> + +#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM +#define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) + +void +PrintUsage(int type) +{ + if (type == 0) + { + _ftprintf(stdout, _T("vcdcli usage:\n")); + _ftprintf(stdout, _T("\tlist [/a]: list all the virtual drives\n")); + _ftprintf(stdout, _T("\tcreate: create a virtual drive\n")); + _ftprintf(stdout, _T("\tmount X path: mount path image on X virtual drive\n")); + _ftprintf(stdout, _T("\tremount X: remount image on X virtual drive\n")); + _ftprintf(stdout, _T("\tremount X: remount image on X virtual drive\n")); + _ftprintf(stdout, _T("\teject X: eject image on X virtual drive\n")); + _ftprintf(stdout, _T("\tremove X: remove virtual drive X\n")); + } + else if (type == 1) + { + _ftprintf(stdout, _T("mount usage:\n")); + _ftprintf(stdout, _T("\tmount <drive letter> <path.iso>\n")); + _ftprintf(stdout, _T("\tMount the ISO image given in <path.iso> on the previously created virtual drive <drive letter>\n")); + _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); + } + else if (type == 2) + { + _ftprintf(stdout, _T("remount usage:\n")); + _ftprintf(stdout, _T("\tremount <drive letter>\n")); + _ftprintf(stdout, _T("\tRemount the ISO image that was previously mounted on the virtual drive <drive letter>\n")); + _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); + } + else if (type == 3) + { + _ftprintf(stdout, _T("eject usage:\n")); + _ftprintf(stdout, _T("\teject <drive letter>\n")); + _ftprintf(stdout, _T("\tEjects the ISO image that is mounted on the virtual drive <drive letter>\n")); + _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); + } + else if (type == 4) + { + _ftprintf(stdout, _T("remove usage:\n")); + _ftprintf(stdout, _T("\tremove <drive letter>\n")); + _ftprintf(stdout, _T("\tRemoves the virtual drive <drive letter> making it no longer usable\n")); + _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); + } +} + +HANDLE +OpenLetter(WCHAR Letter) +{ + TCHAR Device[255]; + + /* Make name */ + _stprintf(Device, _T("\\\\.\\%c:"), Letter); + + /* And open */ + return CreateFile(Device, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); +} + +BOOLEAN +StartDriver(VOID) +{ + SC_HANDLE hMgr, hSvc; + + /* Open the SC manager */ + hMgr = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (hMgr == NULL) + { + _ftprintf(stderr, _T("Failed opening service manager: %x\n"), GetLastError()); + return FALSE; + } + + /* Open the service matching our driver */ + hSvc = OpenService(hMgr, _T("Vcdrom"), SERVICE_START); + if (hSvc == NULL) + { + _ftprintf(stderr, _T("Failed opening service: %x\n"), GetLastError()); + CloseServiceHandle(hMgr); + return FALSE; + } + + /* Start it */ + /* FIXME: improve */ + StartService(hSvc, 0, NULL); + + /* Cleanup */ + CloseServiceHandle(hSvc); + CloseServiceHandle(hMgr); + + /* Always return true when service exists + * We don't care whether it was running or not + * We just need it + */ + return TRUE; +} + +HANDLE +OpenMaster(VOID) +{ + /* We'll always talk to master first, so we start it here */ + if (!StartDriver()) + { + return INVALID_HANDLE_VALUE; + } + + /* And then, open it */ + return CreateFile(_T("\\\\.\\\\VirtualCdRom"), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); +} + +BOOLEAN +IsLetterOwned(WCHAR Letter) +{ + HANDLE hDev; + BOOLEAN Res; + DRIVES_LIST Drives; + DWORD i, BytesRead; + + /* We've to deal with driver */ + hDev = OpenMaster(); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD: %x\n"), GetLastError()); + return FALSE; + } + + /* Get the list of the managed drives */ + Res = DeviceIoControl(hDev, IOCTL_VCDROM_ENUMERATE_DRIVES, NULL, 0, &Drives, sizeof(Drives), &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to enumerate drives: %x\n"), GetLastError()); + CloseHandle(hDev); + return FALSE; + } + + /* Don't leak ;-) */ + CloseHandle(hDev); + + /* Do we find our letter in the list? */ + for (i = 0; i < Drives.Count; ++i) + { + if (Drives.Drives[i] == Letter) + { + break; + } + } + + /* No? Fail */ + if (i == Drives.Count) + { + _ftprintf(stderr, _T("%c is not a drive owned by VCD\n"), Letter); + return FALSE; + } + + /* Otherwise, that's fine! */ + return TRUE; +} + +FORCEINLINE +DWORD +Min(DWORD a, DWORD b) +{ + return (a > b ? b : a); +} + +int +__cdecl +_tmain(int argc, const TCHAR *argv[]) +{ + HANDLE hDev; + BOOLEAN Res; + DWORD BytesRead; + + /* We need a command, at least */ + if (argc < 2) + { + PrintUsage(0); + return 1; + } + + /* List will display all the managed drives */ + if (_tcscmp(argv[1], _T("list")) == 0) + { + DWORD i; + BOOLEAN All; + DRIVES_LIST Drives; + + /* Open the driver for query */ + hDev = OpenMaster(); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD: %x\n"), GetLastError()); + return 1; + } + + /* Query the virtual drives */ + Res = DeviceIoControl(hDev, IOCTL_VCDROM_ENUMERATE_DRIVES, NULL, 0, &Drives, sizeof(Drives), &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to create VCD: %x\n"), GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* Done with master */ + CloseHandle(hDev); + + /* No drives? Display a pretty message */ + if (Drives.Count == 0) + { + _ftprintf(stdout, _T("No virtual drives\n")); + } + else + { + /* Do we have to display all the information? That's '/a' */ + All = FALSE; + if (argc > 2) + { + if (_tcscmp(argv[2], _T("/a")) == 0) + { + All = TRUE; + } + } + + if (All) + { + _ftprintf(stdout, _T("Managed drives:\n")); + /* For each virtual drive... */ + for (i = 0; i < Drives.Count; ++i) + { + HANDLE hLet; + IMAGE_PATH Image; + + /* Display its letter */ + _ftprintf(stdout, _T("%c: "), Drives.Drives[i]); + + /* And open it to query more data */ + hLet = OpenLetter(Drives.Drives[i]); + if (hLet != INVALID_HANDLE_VALUE) + { + /* Get the image path along with mount status */ + Res = DeviceIoControl(hLet, IOCTL_VCDROM_GET_IMAGE_PATH, NULL, 0, &Image, sizeof(Image), &BytesRead, NULL); + /* If it succeed */ + if (Res) + { + UNICODE_STRING Path; + + /* Display image if any, otherwise display "no image" */ + if (Image.Length != 0) + { + Path.Length = Image.Length; + Path.MaximumLength = Image.Length; + Path.Buffer = Image.Path; + } + else + { + Path.Length = sizeof(L"no image") - sizeof(UNICODE_NULL); + Path.MaximumLength = sizeof(L"no image"); + Path.Buffer = L"no image"; + } + + /* Print everything including mount status */ + _ftprintf(stdout, _T("%wZ, %s"), &Path, (Image.Mounted == 0 ? _T("not mounted") : _T("mounted"))); + } + + /* Close drive and move to the next one */ + CloseHandle(hLet); + } + + /* EOL! */ + _ftprintf(stdout, _T("\n")); + } + } + else + { + /* Basic display, just display drives on a single line */ + _ftprintf(stdout, _T("Virtual drives:\n")); + for (i = 0; i < Drives.Count; ++i) + { + _ftprintf(stdout, _T("%c: "), Drives.Drives[i]); + } + _ftprintf(stdout, _T("\n")); + } + } + } + else if (_tcscmp(argv[1], _T("create")) == 0) + { + WCHAR Letter; + + /* Open driver */ + hDev = OpenMaster(); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD: %x\n"), GetLastError()); + return 1; + } + + /* Issue the IOCTL */ + Res = DeviceIoControl(hDev, IOCTL_VCDROM_CREATE_DRIVE, NULL, 0, &Letter, sizeof(WCHAR), &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to create drive: %x\n"), GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* And display the create drive letter to the user */ + _ftprintf(stdout, _T("The virtual drive '%c' has been created\n"), Letter); + + CloseHandle(hDev); + } + else if (_tcscmp(argv[1], _T("mount")) == 0) + { + HANDLE hFile; + WCHAR Letter; + UNICODE_STRING NtPathName; + MOUNT_PARAMETERS MountParams; + + /* We need two args */ + if (argc < 4) + { + PrintUsage(1); + return 1; + } + + /* First, check letter is OK */ + if (!_istalpha(argv[2][0]) || argv[2][1] != 0) + { + PrintUsage(1); + return 1; + } + + /* Now, check the ISO image is OK and reachable by the user */ + hFile = CreateFile(argv[3], FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open file: %s\n"), GetLastError()); + return 1; + } + + /* Validate the drive is owned by vcdrom */ + Letter = _totupper(argv[2][0]); + if (!IsLetterOwned(Letter)) + { + CloseHandle(hFile); + return 1; + } + + /* Get NT path for the driver */ + if (!RtlDosPathNameToNtPathName_U(argv[3], &NtPathName, NULL, NULL)) + { + _ftprintf(stderr, _T("Failed to convert path\n")); + CloseHandle(hFile); + return 1; + } + + /* Copy it in the parameter structure */ + _tcsncpy(MountParams.Path, NtPathName.Buffer, 255); + MountParams.Length = Min(NtPathName.Length, 255 * sizeof(WCHAR)); + MountParams.Flags = 0; /* FIXME */ + + /* No longer needed */ + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + + /* Open the drive */ + hDev = OpenLetter(Letter); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD %c: %x\n"), Letter, GetLastError()); + CloseHandle(hFile); + return 1; + } + + /* We have to release image now, the driver will attempt to open it */ + CloseHandle(hFile); + + /* Issue the mount IOCTL */ + Res = DeviceIoControl(hDev, IOCTL_VCDROM_MOUNT_IMAGE, &MountParams, sizeof(MountParams), NULL, 0, &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to mount %s on %c: %x\n"), argv[3], Letter, GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* Pretty print in case of a success */ + _ftprintf(stdout, _T("%s mounted on %c\n"), argv[3], Letter); + + CloseHandle(hDev); + } + else if (_tcscmp(argv[1], _T("remount")) == 0) + { + WCHAR Letter; + + /* We need an arg */ + if (argc < 3) + { + PrintUsage(2); + return 1; + } + + /* First, check letter is OK */ + if (!_istalpha(argv[2][0]) || argv[2][1] != 0) + { + PrintUsage(2); + return 1; + } + + /* Validate the drive is owned by vcdrom */ + Letter = _totupper(argv[2][0]); + if (!IsLetterOwned(Letter)) + { + return 1; + } + + /* Open the drive */ + hDev = OpenLetter(Letter); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD %c: %x\n"), Letter, GetLastError()); + return 1; + } + + /* Issue the remount IOCTL */ + Res = DeviceIoControl(hDev, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to remount media on %c: %x\n"), Letter, GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* Pretty print in case of a success */ + _ftprintf(stdout, _T("Media remounted on %c\n"), Letter); + + CloseHandle(hDev); + } + else if (_tcscmp(argv[1], _T("eject")) == 0) + { + WCHAR Letter; + + /* We need an arg */ + if (argc < 3) + { + PrintUsage(3); + return 1; + } + + /* First, check letter is OK */ + if (!_istalpha(argv[2][0]) || argv[2][1] != 0) + { + PrintUsage(3); + return 1; + } + + /* Validate the drive is owned by vcdrom */ + Letter = _totupper(argv[2][0]); + if (!IsLetterOwned(Letter)) + { + return 1; + } + + /* Open the drive */ + hDev = OpenLetter(Letter); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD %c: %x\n"), Letter, GetLastError()); + return 1; + } + + /* Issue the eject IOCTL */ + Res = DeviceIoControl(hDev, IOCTL_CDROM_EJECT_MEDIA, NULL, 0, NULL, 0, &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to eject media on %c: %x\n"), Letter, GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* Pretty print in case of a success */ + _ftprintf(stdout, _T("Media ejected on %c\n"), Letter); + + CloseHandle(hDev); + } + else if (_tcscmp(argv[1], _T("remove")) == 0) + { + WCHAR Letter; + + /* We need an arg */ + if (argc < 3) + { + PrintUsage(4); + return 1; + } + + /* First, check letter is OK */ + if (!_istalpha(argv[2][0]) || argv[2][1] != 0) + { + PrintUsage(4); + return 1; + } + + /* Validate the drive is owned by vcdrom */ + Letter = _totupper(argv[2][0]); + if (!IsLetterOwned(Letter)) + { + return 1; + } + + /* Open the drive */ + hDev = OpenLetter(Letter); + if (hDev == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed to open VCD %c: %x\n"), Letter, GetLastError()); + return 1; + } + + /* Issue the remove IOCTL */ + Res = DeviceIoControl(hDev, IOCTL_VCDROM_DELETE_DRIVE, NULL, 0, NULL, 0, &BytesRead, NULL); + if (!Res) + { + _ftprintf(stderr, _T("Failed to remove virtual drive %c: %x\n"), Letter, GetLastError()); + CloseHandle(hDev); + return 1; + } + + /* Pretty print in case of a success */ + _ftprintf(stdout, _T("Virtual drive %c removed\n"), Letter); + + CloseHandle(hDev); + } + else + { + PrintUsage(0); + } + + return 0; +} diff --git a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.rc b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.rc new file mode 100644 index 0000000000..f6a932310f --- /dev/null +++ b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Virtual CD-ROM Controler" +#define REACTOS_STR_INTERNAL_NAME "vcdcli" +#define REACTOS_STR_ORIGINAL_FILENAME "vcdcli.exe" +#include <reactos/version.rc>

7 years

[reactos] 02/03: [VCDROM] Implement the virtual CD-ROM class driver. It was provided by MS as a separate package to download for Windows (up to 7). That class driver allows creating virtual drives on which we can later mount ISOs images. It's rather basic, but does the job.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6906e184bb22720e4f498… commit 6906e184bb22720e4f498f576af96eb5b84980e2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 3 18:10:32 2017 +0100 [VCDROM] Implement the virtual CD-ROM class driver. It was provided by MS as a separate package to download for Windows (up to 7). That class driver allows creating virtual drives on which we can later mount ISOs images. It's rather basic, but does the job. To use it, you can use the GUI app from Microsoft (Virtual CD-ROM Control Panel) or the vcdcli in CLI. We're compatible :-). Note that it's not loaded at boot, you need to manually start it, to lower memory footprint. Both applications will handle this for you. --- modules/rosapps/drivers/CMakeLists.txt | 1 + modules/rosapps/drivers/vcdrom/CMakeLists.txt | 7 + modules/rosapps/drivers/vcdrom/vcdioctl.h | 29 + modules/rosapps/drivers/vcdrom/vcdrom.c | 1244 +++++++++++++++++++++++++ modules/rosapps/drivers/vcdrom/vcdrom.rc | 5 + modules/rosapps/drivers/vcdrom/vcdrom_reg.inf | 7 + 6 files changed, 1293 insertions(+) diff --git a/modules/rosapps/drivers/CMakeLists.txt b/modules/rosapps/drivers/CMakeLists.txt index 4ec7f692cd..61a8e43fcf 100644 --- a/modules/rosapps/drivers/CMakeLists.txt +++ b/modules/rosapps/drivers/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(green) +add_subdirectory(vcdrom) diff --git a/modules/rosapps/drivers/vcdrom/CMakeLists.txt b/modules/rosapps/drivers/vcdrom/CMakeLists.txt new file mode 100644 index 0000000000..01df5be03c --- /dev/null +++ b/modules/rosapps/drivers/vcdrom/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_library(vcdrom SHARED vcdrom.c vcdrom.rc) +set_module_type(vcdrom kernelmodedriver) +target_link_libraries(vcdrom ${PSEH_LIB}) +add_importlibs(vcdrom ntoskrnl hal) +add_cd_file(TARGET vcdrom DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(vcdrom_reg.inf) diff --git a/modules/rosapps/drivers/vcdrom/vcdioctl.h b/modules/rosapps/drivers/vcdrom/vcdioctl.h new file mode 100644 index 0000000000..1160016d92 --- /dev/null +++ b/modules/rosapps/drivers/vcdrom/vcdioctl.h @@ -0,0 +1,29 @@ +#define IOCTL_VCDROM_BASE 0x2 +#define IOCTL_VCDROM_CREATE_DRIVE CTL_CODE(IOCTL_VCDROM_BASE, 0xCC0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_VCDROM_DELETE_DRIVE CTL_CODE(IOCTL_VCDROM_BASE, 0xCC1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_VCDROM_MOUNT_IMAGE CTL_CODE(IOCTL_VCDROM_BASE, 0xCC2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_VCDROM_ENUMERATE_DRIVES CTL_CODE(IOCTL_VCDROM_BASE, 0xCC3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_VCDROM_GET_IMAGE_PATH CTL_CODE(IOCTL_VCDROM_BASE, 0xCC4, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _MOUNT_PARAMETERS +{ + WCHAR Path[255]; + USHORT Length; + ULONG Flags; +} MOUNT_PARAMETERS, *PMOUNT_PARAMETERS; + +#define MOUNT_FLAG_SUPP_UDF 0x1 +#define MOUNT_FLAG_SUPP_JOLIET 0x2 + +typedef struct _DRIVES_LIST +{ + USHORT Count; + WCHAR Drives[26]; +} DRIVES_LIST, *PDRIVES_LIST; + +typedef struct _IMAGE_PATH +{ + WCHAR Path[255]; + USHORT Length; + USHORT Mounted; +} IMAGE_PATH, *PIMAGE_PATH; diff --git a/modules/rosapps/drivers/vcdrom/vcdrom.c b/modules/rosapps/drivers/vcdrom/vcdrom.c new file mode 100644 index 0000000000..d37d91a0d0 --- /dev/null +++ b/modules/rosapps/drivers/vcdrom/vcdrom.c @@ -0,0 +1,1244 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: modules/rosapps/drivers/vcdrom/vcdrom.c + * PURPOSE: Virtual CD-ROM class driver + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <ntddk.h> +#include <ntifs.h> +#include <ntdddisk.h> +#include <ntddcdrm.h> +#include <pseh/pseh2.h> + +#define NDEBUG +#include <debug.h> + +#include "vcdioctl.h" + +typedef struct _DEVICE_EXTENSION +{ + PDEVICE_OBJECT DeviceObject; + /* File object to the ISO when opened */ + PFILE_OBJECT VolumeObject; + /* Size of the ISO */ + LARGE_INTEGER VolumeSize; + /* Mandatory change count for verify */ + ULONG ChangeCount; + /* Will contain the device name or the drive letter */ + UNICODE_STRING GlobalName; + /* Will contain the image path */ + UNICODE_STRING ImageName; + /* Flags on mount (supp. of UDF/Joliet) */ + ULONG Flags; + /* Faking CD structure */ + ULONG SectorSize; + ULONG SectorShift; +} DEVICE_EXTENSION, *PDEVICE_EXTENSION; + +/* Taken from CDFS */ +#define TOC_DATA_TRACK 0x04 +#define TOC_LAST_TRACK 0xaa + +/* Should cover most of our usages */ +#define DEFAULT_STRING_SIZE 50 + +/* Increment on device creation, protection by the mutex */ +FAST_MUTEX ViMutex; +ULONG ViDevicesCount; + +VOID +ViInitializeDeviceExtension(PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + /* Zero mandatory fields, the rest will be zeroed when needed */ + DeviceExtension->DeviceObject = DeviceObject; + DeviceExtension->VolumeObject = NULL; + DeviceExtension->ChangeCount = 0; + DeviceExtension->GlobalName.Buffer = NULL; + DeviceExtension->GlobalName.MaximumLength = 0; + DeviceExtension->GlobalName.Length = 0; + DeviceExtension->ImageName.Buffer = NULL; + DeviceExtension->ImageName.MaximumLength = 0; + DeviceExtension->ImageName.Length = 0; +} + +NTSTATUS +ViAllocateUnicodeString(USHORT BufferLength, PUNICODE_STRING UnicodeString) +{ + PVOID Buffer; + + /* Allocate the buffer */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferLength, ' dCV'); + /* Initialize */ + UnicodeString->Length = 0; + UnicodeString->MaximumLength = BufferLength; + UnicodeString->Buffer = Buffer; + + /* Return success if it went fine */ + if (Buffer != NULL) + { + return STATUS_SUCCESS; + } + + return STATUS_NO_MEMORY; +} + +VOID +ViFreeUnicodeString(PUNICODE_STRING UnicodeString) +{ + /* Only free if allocate, that allows using this + * on cleanup in short memory situations + */ + if (UnicodeString->Buffer != NULL) + { + ExFreePoolWithTag(UnicodeString->Buffer, 0); + UnicodeString->Buffer = NULL; + } + + /* Zero the rest */ + UnicodeString->Length = 0; + UnicodeString->MaximumLength = 0; +} + +NTSTATUS +ViSetIoStatus(NTSTATUS Status, ULONG_PTR Information, PIRP Irp) +{ + /* Only set what we got */ + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + + /* And return the status, so that caller can return with us */ + return Status; +} + +NTSTATUS +NTAPI +VcdHandle(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + /* Stub for CREATE, CLEANUP, CLOSE, always a succes */ + ViSetIoStatus(STATUS_SUCCESS, 0, Irp); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +ViDeleteDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status; + PDEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + /* Delete the drive letter */ + Status = IoDeleteSymbolicLink(&DeviceExtension->GlobalName); + ViFreeUnicodeString(&DeviceExtension->GlobalName); + + /* Close the ISO */ + if (DeviceExtension->VolumeObject != NULL) + { + ObDereferenceObject(DeviceExtension->VolumeObject); + DeviceExtension->VolumeObject = NULL; + } + + /* Free the ISO name */ + ViFreeUnicodeString(&DeviceExtension->ImageName); + + /* And delete the device */ + IoDeleteDevice(DeviceObject); + return ViSetIoStatus(Status, 0, Irp); +} + +VOID +NTAPI +VcdUnload(PDRIVER_OBJECT DriverObject) +{ + IRP FakeIrp; + PDEVICE_OBJECT DeviceObject; + + /* No device, nothing to free */ + DeviceObject = DriverObject->DeviceObject; + if (DeviceObject == NULL) + { + return; + } + + /* Delete any device we could have created */ + do + { + PDEVICE_OBJECT NextDevice; + + NextDevice = DeviceObject->NextDevice; + /* This is normally called on IoCtl, so fake + * the IRP so that status can be dummily set + */ + ViDeleteDevice(DeviceObject, &FakeIrp); + DeviceObject = NextDevice; + } while (DeviceObject != NULL); +} + +NTSTATUS +ViCreateDriveLetter(PDRIVER_OBJECT DriverObject, WCHAR Letter, WCHAR *EffectiveLetter, PDEVICE_OBJECT *DeviceObject) +{ + NTSTATUS Status; + HANDLE LinkHandle; + WCHAR DriveLetter[3], CurLetter; + PDEVICE_OBJECT LocalDeviceObject; + PDEVICE_EXTENSION DeviceExtension; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceCount, DeviceName; + + *DeviceObject = NULL; + + /* Allocate our buffers */ + ViAllocateUnicodeString(DEFAULT_STRING_SIZE, &DeviceCount); + ViAllocateUnicodeString(DEFAULT_STRING_SIZE, &DeviceName); + + /* For easier cleanup */ + _SEH2_TRY + { + /* Get our device number */ + ExAcquireFastMutex(&ViMutex); + Status = RtlIntegerToUnicodeString(ViDevicesCount, 10, &DeviceCount); + ++ViDevicesCount; + ExReleaseFastMutex(&ViMutex); + + /* Conversion to string failed, bail out */ + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + /* Create our device name */ + Status = RtlAppendUnicodeToString(&DeviceName, L"\\Device\\VirtualCdRom"); + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + Status = RtlAppendUnicodeStringToString(&DeviceName, &DeviceCount); + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + /* And create the device! */ + Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), &DeviceName, + FILE_DEVICE_CD_ROM, + FILE_READ_ONLY_DEVICE | FILE_FLOPPY_DISKETTE, + FALSE, &LocalDeviceObject); + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + /* Initialize our DE */ + ViInitializeDeviceExtension(LocalDeviceObject); + DeviceExtension = LocalDeviceObject->DeviceExtension; + ViAllocateUnicodeString(DEFAULT_STRING_SIZE, &DeviceExtension->GlobalName); + + /* Now, we'll try to find a free drive letter + * We always start from Z and go backward + */ + for (CurLetter = Letter; CurLetter >= 'A'; CurLetter--) + { + /* By default, no flags. These will be set + * on mount, by the caller + */ + DeviceExtension->Flags = 0; + + /* Create a drive letter name */ + DeviceExtension->GlobalName.Length = 0; + Status = RtlAppendUnicodeToString(&DeviceExtension->GlobalName, L"\\??\\"); + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + DriveLetter[0] = CurLetter; + DriveLetter[1] = L':'; + DriveLetter[2] = UNICODE_NULL; + Status = RtlAppendUnicodeToString(&DeviceExtension->GlobalName, DriveLetter); + if (!NT_SUCCESS(Status)) + { + _SEH2_LEAVE; + } + + /* And try to open it */ + InitializeObjectAttributes(&ObjectAttributes, &DeviceExtension->GlobalName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, NULL); + Status = ZwOpenSymbolicLinkObject(&LinkHandle, GENERIC_READ, &ObjectAttributes); + /* It failed; good news, that letter is free, jump on it! */ + if (!NT_SUCCESS(Status)) + { + /* Create a symbolic link to our device */ + Status = IoCreateSymbolicLink(&DeviceExtension->GlobalName, &DeviceName); + /* If created... */ + if (NT_SUCCESS(Status)) + { + /* Return the drive letter to the caller */ + *EffectiveLetter = CurLetter; + ClearFlag(LocalDeviceObject->Flags, DO_DEVICE_INITIALIZING); + /* No caching! */ + SetFlag(LocalDeviceObject->Flags, DO_DIRECT_IO); + + /* And return the DO */ + *DeviceObject = LocalDeviceObject; + break; + } + } + /* This letter is taken, try another one */ + else + { + ZwClose(LinkHandle); + Status = STATUS_OBJECT_NAME_EXISTS; + } + } + + /* We're out of drive letters, so fail :-( */ + if (CurLetter == (L'A' - 1)) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + _SEH2_FINALLY + { + /* No longer need these */ + ViFreeUnicodeString(&DeviceName); + ViFreeUnicodeString(&DeviceCount); + + /* And delete in case of a failure */ + if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED && LocalDeviceObject != NULL) + { + IoDeleteDevice(LocalDeviceObject); + } + } + _SEH2_END; + + return Status; +} + +NTSTATUS +ViMountImage(PDEVICE_OBJECT DeviceObject, PUNICODE_STRING Image) +{ + NTSTATUS Status; + HANDLE ImgHandle; + IO_STATUS_BLOCK IoStatus; + ULONG Buffer[2], i, SectorShift; + PDEVICE_EXTENSION DeviceExtension; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_STANDARD_INFORMATION FileStdInfo; + + /* Try to open the image */ + InitializeObjectAttributes(&ObjectAttributes, Image, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwCreateFile(&ImgHandle, FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, + &IoStatus, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open image: %wZ\n", Image); + return Status; + } + + /* Query its information */ + Status = ZwQueryInformationFile(ImgHandle, &IoStatus, &FileStdInfo, + sizeof(FileStdInfo), FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query image information\n"); + ZwClose(ImgHandle); + return Status; + } + + /* Set image size */ + DeviceExtension = DeviceObject->DeviceExtension; + DeviceExtension->VolumeSize.QuadPart = FileStdInfo.EndOfFile.QuadPart; + + /* Read the first 8-bytes to determine our sector size */ + Status = ZwReadFile(ImgHandle, NULL, NULL, NULL, &IoStatus, Buffer, sizeof(Buffer), NULL, NULL); + if (!NT_SUCCESS(Status) || Buffer[1] == 0 || (Buffer[1] & 0x1FF) != 0) + { + DeviceExtension->SectorSize = 2048; + } + else + { + DeviceExtension->SectorSize = Buffer[1]; + } + + /* Now, compute the sector shift */ + if (DeviceExtension->SectorSize == 512) + { + DeviceExtension->SectorShift = 9; + } + else + { + for (i = 512, SectorShift = 9; i < DeviceExtension->SectorSize; i = i * 2, ++SectorShift); + if (i == DeviceExtension->SectorSize) + { + DeviceExtension->SectorShift = SectorShift; + } + else + { + DeviceExtension->SectorShift = 11; + } + } + + /* We're good, get the image file object to close the handle */ + Status = ObReferenceObjectByHandle(ImgHandle, 0, NULL, KernelMode, + (PVOID *)&DeviceExtension->VolumeObject, NULL); + if (!NT_SUCCESS(Status)) + { + ZwClose(ImgHandle); + DeviceExtension->VolumeObject = NULL; + return Status; + } + + ZwClose(ImgHandle); + /* Increase change count to force a verify */ + ++DeviceExtension->ChangeCount; + + /* And ask for a verify! */ + SetFlag(DeviceObject->Flags, DO_VERIFY_VOLUME); + + /* Free old string (if any) */ + ViFreeUnicodeString(&DeviceExtension->ImageName); + /* And save our new image name */ + ViAllocateUnicodeString(Image->MaximumLength, &DeviceExtension->ImageName); + RtlCopyUnicodeString(&DeviceExtension->ImageName, Image); + + return STATUS_SUCCESS; +} + +VOID +ViCreateDriveAndMountImage(PDRIVER_OBJECT DriverObject, WCHAR Letter, LPCWSTR ImagePath) +{ + UNICODE_STRING Image; + WCHAR EffectiveLetter; + PDEVICE_OBJECT DeviceObject; + + /* Create string from path */ + DeviceObject = NULL; + RtlInitUnicodeString(&Image, ImagePath); + + /* Create the drive letter (ignore output, it comes from registry, nothing to do */ + ViCreateDriveLetter(DriverObject, Letter, &EffectiveLetter, &DeviceObject); + /* And mount the image on the created drive */ + ViMountImage(DeviceObject, &Image); +} + +VOID +ViLoadImagesFromRegistry(PDRIVER_OBJECT DriverObject, LPCWSTR RegistryPath) +{ + WCHAR Letter[2]; + WCHAR PathBuffer[100], ResBuffer[100]; + + /* We'll browse the registry for + * DeviceX\IMAGE = {Path} + * When found, we create (or at least, attempt to) + * device X: and mount image Path + */ + Letter[0] = L'A'; + Letter[1] = UNICODE_NULL; + do + { + NTSTATUS Status; + UNICODE_STRING Path, ResString; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + + /* Our path is always Device + drive letter */ + RtlZeroMemory(PathBuffer, sizeof(PathBuffer)); + Path.Buffer = PathBuffer; + Path.Length = 0; + Path.MaximumLength = sizeof(PathBuffer); + RtlAppendUnicodeToString(&Path, L"Parameters\\Device"); + RtlAppendUnicodeToString(&Path, Letter); + + ResString.Buffer = ResBuffer; + ResString.Length = 0; + ResString.MaximumLength = sizeof(ResBuffer); + + RtlZeroMemory(&QueryTable[0], sizeof(QueryTable)); + QueryTable[0].Name = Path.Buffer; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_SUBKEY; + QueryTable[1].Name = L"IMAGE"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ResString; + + /* If query went fine, attempt to create and mount */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, RegistryPath, QueryTable, NULL, NULL); + if (NT_SUCCESS(Status)) + { + ViCreateDriveAndMountImage(DriverObject, Letter[0], ResString.Buffer); + } + + ++(Letter[0]); + } while (Letter[0] <= L'Z'); +} + +NTSTATUS +ViVerifyVolume(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + /* Force verify */ + SetFlag(DeviceObject->Flags, DO_VERIFY_VOLUME); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; + + IoSetHardErrorOrVerifyDevice(Irp, DeviceObject); + + return STATUS_VERIFY_REQUIRED; +} + +NTSTATUS +ViReadFile(PFILE_OBJECT File, PMDL Mdl, PLARGE_INTEGER Offset, PKEVENT Event, ULONG Length, PIO_STATUS_BLOCK IoStatusBlock) +{ + PIRP LowerIrp; + PIO_STACK_LOCATION Stack; + PDEVICE_OBJECT DeviceObject; + + /* Get the lower DO */ + DeviceObject = IoGetRelatedDeviceObject(File); + /* Allocate an IRP to deal with it */ + LowerIrp = IoAllocateIrp(DeviceObject->StackSize, 0); + if (LowerIrp == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize it */ + LowerIrp->RequestorMode = KernelMode; + /* Our status block */ + LowerIrp->UserIosb = IoStatusBlock; + LowerIrp->MdlAddress = Mdl; + /* We don't cache! */ + LowerIrp->Flags = IRP_NOCACHE | IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO; + /* Sync event for us to know when read is done */ + LowerIrp->UserEvent = Event; + LowerIrp->UserBuffer = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + /* The FO of our image */ + LowerIrp->Tail.Overlay.OriginalFileObject = File; + LowerIrp->Tail.Overlay.Thread = PsGetCurrentThread(); + + /* We basically perform a read operation, nothing complex here */ + Stack = IoGetNextIrpStackLocation(LowerIrp); + Stack->Parameters.Read.Length = Length; + Stack->MajorFunction = IRP_MJ_READ; + Stack->FileObject = File; + Stack->Parameters.Read.ByteOffset.QuadPart = Offset->QuadPart; + + /* And call lower driver */ + return IoCallDriver(DeviceObject, LowerIrp); +} + +NTSTATUS +NTAPI +VcdRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + + /* Catch any exception that could happen during read attempt */ + _SEH2_TRY + { + /* First of all, check if there's an image mounted */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + Status = ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + _SEH2_LEAVE; + } + + /* Check if volume has to be verified (or if we override, for instance + * FSD performing initial reads for mouting FS) + */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + Status = ViVerifyVolume(DeviceObject, Irp); + _SEH2_LEAVE; + } + + /* Check if we have enough room for output */ + if (Stack->Parameters.Read.Length > Irp->MdlAddress->ByteCount) + { + Status = ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, 0, Irp); + _SEH2_LEAVE; + } + + /* Initialize our event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Perform actual read */ + Status = ViReadFile(DeviceExtension->VolumeObject, Irp->MdlAddress, + &Stack->Parameters.Read.ByteOffset, &Event, + Stack->Parameters.Read.Length, &IoStatus); + if (!NT_SUCCESS(Status)) + { + Status = ViSetIoStatus(Status, 0, Irp); + _SEH2_LEAVE; + } + + /* Make sure we wait until its done */ + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + if (!NT_SUCCESS(Status)) + { + Status = ViSetIoStatus(Status, 0, Irp); + _SEH2_LEAVE; + } + + /* Look whether we're reading first bytes of the volume, if so, our + * "suppression" might be asked for + */ + if (Stack->Parameters.Read.ByteOffset.QuadPart / DeviceExtension->SectorSize < 0x20) + { + /* Check our output buffer is in a state where we can play with it */ + if ((Irp->MdlAddress->MdlFlags & (MDL_ALLOCATED_FIXED_SIZE | MDL_PAGES_LOCKED | MDL_MAPPED_TO_SYSTEM_VA)) == + (MDL_ALLOCATED_FIXED_SIZE | MDL_PAGES_LOCKED | MDL_MAPPED_TO_SYSTEM_VA)) + { + PUCHAR Buffer; + + /* Do we have to delete any UDF mark? */ + if (BooleanFlagOn(DeviceExtension->Flags, MOUNT_FLAG_SUPP_UDF)) + { + /* Kill any NSR0X mark from UDF */ + Buffer = (PUCHAR)((ULONG_PTR)Irp->MdlAddress->StartVa + Irp->MdlAddress->ByteOffset); + if (Buffer != NULL) + { + if (Buffer[0] == 0 && Buffer[1] == 'N' && Buffer[2] == 'S' && + Buffer[3] == 'R' && Buffer[4] == '0') + { + Buffer[5] = '0'; + } + } + } + + /* Do we have to delete any Joliet mark? */ + if (BooleanFlagOn(DeviceExtension->Flags, MOUNT_FLAG_SUPP_JOLIET)) + { + /* Kill the CD001 mark from Joliet */ + Buffer = (PUCHAR)((ULONG_PTR)Irp->MdlAddress->StartVa + Irp->MdlAddress->ByteOffset); + if (Buffer != NULL) + { + if (Buffer[0] == 2 && Buffer[1] == 'C' && Buffer[2] == 'D' && + Buffer[3] == '0' && Buffer[4] == '0' && Buffer[5] == '1') + { + Buffer[5] = '0'; + } + } + } + } + } + + /* Set status */ + Status = ViSetIoStatus(Status, Stack->Parameters.Read.Length, Irp); + } + _SEH2_FINALLY + { + /* And complete! */ + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } _SEH2_END; + + return Status; +} + +NTSTATUS +ViCreateDevice(PDRIVER_OBJECT DriverObject, PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + PDEVICE_OBJECT DeviceObject; + + Stack = IoGetCurrentIrpStackLocation(Irp); + + /* Make sure output buffer is big enough to receive the drive letter + * when we create the drive + */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(WCHAR)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(WCHAR), Irp); + } + + /* And start creation. We always start from bottom */ + Status = ViCreateDriveLetter(DriverObject, L'Z', Irp->AssociatedIrp.SystemBuffer, &DeviceObject); + return ViSetIoStatus(Status, sizeof(WCHAR), Irp); +} + +NTSTATUS +ViGetDriveGeometry(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PDISK_GEOMETRY DiskGeo; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + + /* No geometry if no image mounted */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + return ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + } + + /* No geometry if volume is to be verified */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + return ViVerifyVolume(DeviceObject, Irp); + } + + /* No geometry if too small output buffer */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DISK_GEOMETRY)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(DISK_GEOMETRY), Irp); + } + + /* Finally, set what we're asked for */ + DiskGeo = Irp->AssociatedIrp.SystemBuffer; + DiskGeo->MediaType = RemovableMedia; + DiskGeo->BytesPerSector = DeviceExtension->SectorSize; + DiskGeo->SectorsPerTrack = DeviceExtension->VolumeSize.QuadPart >> DeviceExtension->SectorShift; + DiskGeo->Cylinders.QuadPart = 1; + DiskGeo->TracksPerCylinder = 1; + + return ViSetIoStatus(STATUS_SUCCESS, sizeof(DISK_GEOMETRY), Irp); +} + +NTSTATUS +ViCheckVerify(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PULONG Buffer; + ULONG_PTR Information; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + + /* Nothing to verify if no mounted */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + return ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + } + + /* Do we have to verify? */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + return ViSetIoStatus(STATUS_VERIFY_REQUIRED, 0, Irp); + } + + /* If caller provided a buffer, that's to get the change count */ + Buffer = Irp->AssociatedIrp.SystemBuffer; + if (Buffer != NULL) + { + *Buffer = DeviceExtension->ChangeCount; + Information = sizeof(ULONG); + } + else + { + Information = 0; + } + + /* Done */ + return ViSetIoStatus(STATUS_SUCCESS, Information, Irp); +} + +NTSTATUS +ViIssueMountImage(PDEVICE_OBJECT DeviceObject, PUNICODE_STRING Image, PIRP Irp) +{ + NTSTATUS Status; + PDEVICE_EXTENSION DeviceExtension; + + /* We cannot mount an image if there's already one mounted */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject != NULL) + { + return ViSetIoStatus(STATUS_DEVICE_NOT_READY, 0, Irp); + } + + /* Perform the mount */ + Status = ViMountImage(DeviceObject, Image); + return ViSetIoStatus(Status, 0, Irp); +} + +ULONG +ViComputeAddress(ULONG Address) +{ + UCHAR Local[4]; + + /* Convert LBA to MSF */ + Local[0] = 0; + Local[1] = Address / 4500; + Local[2] = Address % 4500 / 75; + Local[3] = Address + 108 * Local[1] - 75 * Local[2]; + + return *(ULONG *)(&Local[0]); +} + +VOID +ViFillInTrackData(PTRACK_DATA TrackData, UCHAR Control, UCHAR Adr, UCHAR TrackNumber, ULONG Address) +{ + /* Fill in our track data with provided information */ + TrackData->Reserved = 0; + TrackData->Reserved1 = 0; + TrackData->Control = Control & 0xF; + TrackData->Adr = Adr; + TrackData->TrackNumber = TrackNumber; + *(ULONG *)(&TrackData->Address[0]) = ViComputeAddress(Address); +} + +NTSTATUS +ViReadToc(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PCDROM_TOC Toc; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + + /* No image mounted, no TOC */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + return ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + } + + /* No TOC if we have to verify */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + return ViVerifyVolume(DeviceObject, Irp); + } + + /* Check we have enough room for TOC */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(CDROM_TOC)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(CDROM_TOC), Irp); + } + + /* Start filling the TOC */ + Toc = Irp->AssociatedIrp.SystemBuffer; + Toc->Length[0] = 0; + Toc->Length[1] = 8; + Toc->FirstTrack = 1; + Toc->LastTrack = 1; + /* And fill our single (an ISO file always have a single track) track with 2sec gap */ + ViFillInTrackData(Toc->TrackData, TOC_DATA_TRACK, ADR_NO_MODE_INFORMATION, 1, 150); + /* And add last track termination */ + ViFillInTrackData(&Toc->TrackData[1], TOC_DATA_TRACK, ADR_NO_MODE_INFORMATION, TOC_LAST_TRACK, (DeviceExtension->VolumeSize.QuadPart >> DeviceExtension->SectorShift) + 150); + + return ViSetIoStatus(STATUS_SUCCESS, sizeof(CDROM_TOC), Irp); +} + +NTSTATUS +ViReadTocEx(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PCDROM_TOC Toc; + PIO_STACK_LOCATION Stack; + PCDROM_READ_TOC_EX TocEx; + PDEVICE_EXTENSION DeviceExtension; + + /* No image mounted, no TOC */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + return ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + } + + /* No TOC if we have to verify */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + return ViVerifyVolume(DeviceObject, Irp); + } + + /* We need an input buffer */ + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CDROM_READ_TOC_EX)) + { + return ViSetIoStatus(STATUS_INFO_LENGTH_MISMATCH, sizeof(CDROM_READ_TOC_EX), Irp); + } + + /* Validate output buffer is big enough */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < MAXIMUM_CDROM_SIZE) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, MAXIMUM_CDROM_SIZE, Irp); + } + + /* Validate the input buffer - see cdrom_new */ + TocEx = Irp->AssociatedIrp.SystemBuffer; + if ((TocEx->Reserved1 != 0) || (TocEx->Reserved2 != 0) || + (TocEx->Reserved3 != 0)) + { + return ViSetIoStatus(STATUS_INVALID_PARAMETER, 0, Irp); + } + + if (((TocEx->Format == CDROM_READ_TOC_EX_FORMAT_SESSION) || + (TocEx->Format == CDROM_READ_TOC_EX_FORMAT_PMA) || + (TocEx->Format == CDROM_READ_TOC_EX_FORMAT_ATIP)) && + TocEx->SessionTrack != 0) + { + return ViSetIoStatus(STATUS_INVALID_PARAMETER, 0, Irp); + } + + if ((TocEx->Format != CDROM_READ_TOC_EX_FORMAT_TOC) && + (TocEx->Format != CDROM_READ_TOC_EX_FORMAT_FULL_TOC) && + (TocEx->Format != CDROM_READ_TOC_EX_FORMAT_CDTEXT) && + (TocEx->Format != CDROM_READ_TOC_EX_FORMAT_SESSION) && + (TocEx->Format != CDROM_READ_TOC_EX_FORMAT_PMA) && + (TocEx->Format == CDROM_READ_TOC_EX_FORMAT_ATIP)) + { + return ViSetIoStatus(STATUS_INVALID_PARAMETER, 0, Irp); + } + + /* Start filling the TOC */ + Toc = Irp->AssociatedIrp.SystemBuffer; + Toc->Length[0] = 0; + Toc->Length[1] = 8; + Toc->FirstTrack = 1; + Toc->LastTrack = 1; + /* And fill our single (an ISO file always have a single track) track with 2sec gap */ + ViFillInTrackData(Toc->TrackData, TOC_DATA_TRACK, ADR_NO_MODE_INFORMATION, 1, 150); + /* And add last track termination */ + ViFillInTrackData(&Toc->TrackData[1], TOC_DATA_TRACK, ADR_NO_MODE_INFORMATION, TOC_LAST_TRACK, (DeviceExtension->VolumeSize.QuadPart >> DeviceExtension->SectorShift) + 150); + + return ViSetIoStatus(STATUS_SUCCESS, MAXIMUM_CDROM_SIZE, Irp); +} + +NTSTATUS +ViGetLastSession(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + + PIO_STACK_LOCATION Stack; + PCDROM_TOC_SESSION_DATA Toc; + PDEVICE_EXTENSION DeviceExtension; + + /* No image, no last session */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject == NULL) + { + return ViSetIoStatus(STATUS_NO_MEDIA_IN_DEVICE, 0, Irp); + } + + /* No last session if we have to verify */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (BooleanFlagOn(DeviceObject->Flags, DO_VERIFY_VOLUME) && + !BooleanFlagOn(Stack->Flags, SL_OVERRIDE_VERIFY_VOLUME)) + { + return ViVerifyVolume(DeviceObject, Irp); + } + + /* Check we have enough room for last session data */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(CDROM_TOC_SESSION_DATA)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(CDROM_TOC_SESSION_DATA), Irp); + } + + /* Fill in data */ + Toc = Irp->AssociatedIrp.SystemBuffer; + Toc->Length[0] = 0; + Toc->Length[1] = 8; + Toc->FirstCompleteSession = 1; + Toc->LastCompleteSession = 1; + /* And return our track with 2sec gap (cf TOC function) */ + ViFillInTrackData(Toc->TrackData, TOC_DATA_TRACK, ADR_NO_MODE_INFORMATION, 1, 150); + + return ViSetIoStatus(STATUS_SUCCESS, sizeof(CDROM_TOC_SESSION_DATA), Irp); +} + +NTSTATUS +ViEnumerateDrives(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PDRIVES_LIST DrivesList; + PIO_STACK_LOCATION Stack; + PDEVICE_OBJECT CurrentDO; + PDEVICE_EXTENSION DeviceExtension; + + /* Check we have enough room for output */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DRIVES_LIST)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(DRIVES_LIST), Irp); + } + + /* Get the output buffer */ + DrivesList = Irp->AssociatedIrp.SystemBuffer; + DrivesList->Count = 0; + + /* And now, starting from our main DO, start browsing all the DO we created */ + for (CurrentDO = DeviceObject->DriverObject->DeviceObject; CurrentDO != NULL; + CurrentDO = CurrentDO->NextDevice) + { + /* Check we won't output our main DO */ + DeviceExtension = CurrentDO->DeviceExtension; + if (DeviceExtension->GlobalName.Length != + RtlCompareMemory(DeviceExtension->GlobalName.Buffer, + L"\\??\\VirtualCdRom", + DeviceExtension->GlobalName.Length)) + { + /* When we return, we extract the drive letter + * See ViCreateDriveLetter(), it's \??\Z: + */ + DrivesList->Drives[DrivesList->Count++] = DeviceExtension->GlobalName.Buffer[4]; + } + } + + return ViSetIoStatus(STATUS_SUCCESS, sizeof(DRIVES_LIST), Irp); +} + +NTSTATUS +ViGetImagePath(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PIMAGE_PATH ImagePath; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExtension; + + /* Check we have enough room for output */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(IMAGE_PATH)) + { + return ViSetIoStatus(STATUS_BUFFER_TOO_SMALL, sizeof(IMAGE_PATH), Irp); + } + + /* Get our image path from DO */ + DeviceExtension = DeviceObject->DeviceExtension; + ImagePath = Irp->AssociatedIrp.SystemBuffer; + ImagePath->Mounted = (DeviceExtension->VolumeObject != NULL); + ImagePath->Length = DeviceExtension->ImageName.Length; + /* And if it's set, copy it back to the caller */ + if (DeviceExtension->ImageName.Length != 0) + { + RtlCopyMemory(ImagePath->Path, DeviceExtension->ImageName.Buffer, DeviceExtension->ImageName.Length); + } + + return ViSetIoStatus(STATUS_SUCCESS, sizeof(IMAGE_PATH), Irp); +} + +NTSTATUS +ViEjectMedia(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PDEVICE_EXTENSION DeviceExtension; + + /* Eject will force a verify */ + SetFlag(DeviceObject->Flags, DO_VERIFY_VOLUME); + + /* If we have an image mounted, unmount it + * But don't free anything related, so that + * we can perform quick remount. + * See: IOCTL_STORAGE_LOAD_MEDIA + */ + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->VolumeObject != NULL) + { + ObDereferenceObject(DeviceExtension->VolumeObject); + /* Device changed, so mandatory increment */ + ++DeviceExtension->ChangeCount; + DeviceExtension->VolumeObject = NULL; + } + + return ViSetIoStatus(STATUS_SUCCESS, 0, Irp); +} + +NTSTATUS +ViRemountMedia(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status; + UNICODE_STRING Image; + PDEVICE_EXTENSION DeviceExtension; + + /* Get the device extension */ + DeviceExtension = DeviceObject->DeviceExtension; + /* Allocate a new string as mount parameter */ + Status = ViAllocateUnicodeString(DeviceExtension->ImageName.MaximumLength, &Image); + if (!NT_SUCCESS(Status)) + { + return ViSetIoStatus(Status, 0, Irp); + } + + /* To allow cleanup in case of troubles */ + _SEH2_TRY + { + /* Copy our current image name and mount */ + RtlCopyUnicodeString(&Image, &DeviceExtension->ImageName); + Status = ViIssueMountImage(DeviceObject, &Image, Irp); + } + _SEH2_FINALLY + { + ViFreeUnicodeString(&Image); + } + _SEH2_END; + + return ViSetIoStatus(Status, 0, Irp); +} + +NTSTATUS +NTAPI +VcdDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status; + UNICODE_STRING Image; + PIO_STACK_LOCATION Stack; + PMOUNT_PARAMETERS MountParameters; + PDEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + Stack = IoGetCurrentIrpStackLocation(Irp); + + _SEH2_TRY + { + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + /* First of all, our private IOCTLs */ + case IOCTL_VCDROM_CREATE_DRIVE: + Status = ViCreateDevice(DeviceObject->DriverObject, Irp); + break; + + case IOCTL_VCDROM_DELETE_DRIVE: + Status = ViDeleteDevice(DeviceObject, Irp); + break; + + case IOCTL_VCDROM_MOUNT_IMAGE: + MountParameters = Irp->AssociatedIrp.SystemBuffer; + Image.MaximumLength = 255 * sizeof(WCHAR); + Image.Length = MountParameters->Length; + Image.Buffer = MountParameters->Path; + DeviceExtension->Flags = MountParameters->Flags; + Status = ViIssueMountImage(DeviceObject, &Image, Irp); + break; + + case IOCTL_VCDROM_ENUMERATE_DRIVES: + Status = ViEnumerateDrives(DeviceObject, Irp); + break; + + case IOCTL_VCDROM_GET_IMAGE_PATH: + Status = ViGetImagePath(DeviceObject, Irp); + break; + + /* Now, IOCTLs we have to handle as class driver */ + case IOCTL_DISK_GET_DRIVE_GEOMETRY: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY: + Status = ViGetDriveGeometry(DeviceObject, Irp); + break; + + case IOCTL_DISK_CHECK_VERIFY: + case IOCTL_CDROM_CHECK_VERIFY: + Status = ViCheckVerify(DeviceObject, Irp); + break; + + case IOCTL_CDROM_READ_TOC: + Status = ViReadToc(DeviceObject, Irp); + break; + + case IOCTL_CDROM_READ_TOC_EX: + Status = ViReadTocEx(DeviceObject, Irp); + break; + + case IOCTL_CDROM_GET_LAST_SESSION: + Status = ViGetLastSession(DeviceObject, Irp); + break; + + case IOCTL_STORAGE_EJECT_MEDIA: + case IOCTL_CDROM_EJECT_MEDIA: + Status = ViEjectMedia(DeviceObject, Irp); + break; + + /* That one is a bit specific + * It gets unmounted image mounted again + */ + case IOCTL_STORAGE_LOAD_MEDIA: + /* That means it can only be performed if: + * - We had an image previously + * - It's no longer mounted + * Otherwise, we just return success + */ + if (DeviceExtension->ImageName.Buffer == NULL || DeviceExtension->VolumeObject != NULL) + { + Status = ViSetIoStatus(STATUS_SUCCESS, 0, Irp); + } + else + { + Status = ViRemountMedia(DeviceObject, Irp); + } + break; + + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + DPRINT1("IOCTL: %x not supported\n", Stack->Parameters.DeviceIoControl.IoControlCode); + break; + } + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + /* Depending on the failure code, we may force a verify */ + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_DEVICE_NOT_READY || Status == STATUS_IO_TIMEOUT || + Status == STATUS_MEDIA_WRITE_PROTECTED || Status == STATUS_NO_MEDIA_IN_DEVICE || + Status == STATUS_VERIFY_REQUIRED || Status == STATUS_UNRECOGNIZED_MEDIA || + Status == STATUS_WRONG_VOLUME) + { + IoSetHardErrorOrVerifyDevice(Irp, DeviceObject); + } + } + + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + + return Status; +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + UNICODE_STRING DeviceName; + PDEVICE_OBJECT DeviceObject; + PDEVICE_EXTENSION DeviceExtension; + + /* Set our entry points (rather limited :-)) */ + DriverObject->DriverUnload = VcdUnload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = VcdHandle; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = VcdHandle; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VcdHandle; + DriverObject->MajorFunction[IRP_MJ_READ] = VcdRead; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = VcdDeviceControl; + + /* Create our main device to receive private IOCTLs */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\VirtualCdRom"); + Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), &DeviceName, + FILE_DEVICE_CD_ROM, FILE_READ_ONLY_DEVICE | FILE_FLOPPY_DISKETTE, + FALSE, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Initialize our device extension */ + ViInitializeDeviceExtension(DeviceObject); + DeviceExtension = DeviceObject->DeviceExtension; + + /* And create our accessible name from umode */ + ViAllocateUnicodeString(DEFAULT_STRING_SIZE, &DeviceExtension->GlobalName); + RtlAppendUnicodeToString(&DeviceExtension->GlobalName, L"\\??\\VirtualCdRom"); + Status = IoCreateSymbolicLink(&DeviceExtension->GlobalName, &DeviceName); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(DeviceObject); + return Status; + } + + /* Initialize our mutex for device count */ + ExInitializeFastMutex(&ViMutex); + + /* And try to load images that would have been stored in registry */ + ViLoadImagesFromRegistry(DriverObject, RegistryPath->Buffer); + + return STATUS_SUCCESS; +} diff --git a/modules/rosapps/drivers/vcdrom/vcdrom.rc b/modules/rosapps/drivers/vcdrom/vcdrom.rc new file mode 100644 index 0000000000..d6bcc7a45d --- /dev/null +++ b/modules/rosapps/drivers/vcdrom/vcdrom.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Virtual CD-ROM Class Driver" +#define REACTOS_STR_INTERNAL_NAME "vcdrom" +#define REACTOS_STR_ORIGINAL_FILENAME "vcdrom.sys" +#include <reactos/version.rc> diff --git a/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf b/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf new file mode 100644 index 0000000000..3eaf361c7c --- /dev/null +++ b/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf @@ -0,0 +1,7 @@ +; Vcdrom class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Group",0x00000000,"SCSI Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","ImagePath",0x00020000,"system32\drivers\vcdrom.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Type",0x00010001,0x00000001

7 years

[reactos] 01/03: [PSDK] Define the IOCTL_CDROM_EJECT_MEDIA IOCTL

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63d46228b8e9c70c2510d… commit 63d46228b8e9c70c2510d049371600a68acefef3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 3 18:09:43 2017 +0100 [PSDK] Define the IOCTL_CDROM_EJECT_MEDIA IOCTL --- sdk/include/psdk/ntddcdrm.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/psdk/ntddcdrm.h b/sdk/include/psdk/ntddcdrm.h index c23487dade..ce6766299a 100644 --- a/sdk/include/psdk/ntddcdrm.h +++ b/sdk/include/psdk/ntddcdrm.h @@ -91,6 +91,9 @@ extern "C" { #define IOCTL_CDROM_STOP_AUDIO \ CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_EJECT_MEDIA \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) + #define MAXIMUM_NUMBER_TRACKS 100 #define MAXIMUM_CDROM_SIZE 804

7 years

[reactos] 02/02: [CMD] Fix the del /s command, reported by Pablo De Napoli. CORE-10460

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f79d268ea1d1cf474ab02… commit f79d268ea1d1cf474ab02370d2392f66d9a18ebc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 3 16:01:44 2017 +0100 [CMD] Fix the del /s command, reported by Pablo De Napoli. CORE-10460 The command should delete files in the specified directory and all of its sub-directories, using any file pattern specified. For example, the command: del /S .\my_directory should delete all the files inside my_directory and its sub-directories, and as such should also detect that "my_directory" is indeed a directory, while doing: del /S .\my_file should of course detect that "my_file" is indeed a file pattern, and thus, delete all "my_file" files from the current directory and its sub-directories. The command: del /S some_directory\file_pattern should delete "file_pattern" files from some_directory and its sub-directories. --- base/shell/cmd/del.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/base/shell/cmd/del.c b/base/shell/cmd/del.c index 5d3d3ca4c0..4c0dc3a876 100644 --- a/base/shell/cmd/del.c +++ b/base/shell/cmd/del.c @@ -284,39 +284,46 @@ ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) WIN32_FIND_DATA f; DWORD dwFiles = 0; + /* Get the full path to the file */ GetFullPathName(FileName, MAX_PATH, szFullPath, &pFilePart); + /* Delete all the files in this directory */ dwFiles = DeleteFiles(szFullPath, dwFlags, dwAttrFlags); - if (dwFiles & 0x80000000) return dwFiles; + if (dwFiles & 0x80000000) + return dwFiles; if (*dwFlags & DEL_SUBDIR) { /* Get just the file name */ - pSearchPart = _tcsrchr(FileName,_T('\\')); - if (pSearchPart != NULL) - pSearchPart++; - else - pSearchPart = FileName; - - /* Get the full path to the file */ - GetFullPathName (FileName,MAX_PATH,szFullPath,NULL); + pSearchPart = _T("*"); + if (!IsExistingDirectory(szFullPath)) + { + pSearchPart = _tcsrchr(FileName, _T('\\')); + if (pSearchPart != NULL) + pSearchPart++; + else + pSearchPart = FileName; + } - /* strip the filename off of it */ - pFilePart = _tcsrchr(szFullPath, _T('\\')); - if (pFilePart == NULL) + /* If no wildcard or file was specified and this is a directory, then + display all files in it */ + if (pFilePart == NULL || IsExistingDirectory(szFullPath)) { - pFilePart = szFullPath; + pFilePart = &szFullPath[_tcslen(szFullPath)]; + if (*(pFilePart-1) != _T('\\')) + *pFilePart++ = _T('\\'); + _tcscpy(pFilePart, _T("*")); } else { - pFilePart++; + /* strip the filename off of it */ + _tcscpy(pFilePart, _T("*")); } - _tcscpy(pFilePart, _T("*")); - + /* Enumerate all the sub-directories */ hFile = FindFirstFile(szFullPath, &f); if (hFile != INVALID_HANDLE_VALUE) { @@ -341,6 +348,7 @@ ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) FindClose (hFile); } } + return dwFiles; }

7 years

[reactos] 01/02: [CMD] Fix the presentation of some confirmation prompts.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a595583073a38c3a5a2f… commit 9a595583073a38c3a5a2f52411c14f25daa15254 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 22:37:16 2017 +0100 [CMD] Fix the presentation of some confirmation prompts. --- base/shell/cmd/lang/cs-CZ.rc | 8 ++++---- base/shell/cmd/lang/de-DE.rc | 8 ++++---- base/shell/cmd/lang/el-GR.rc | 8 ++++---- base/shell/cmd/lang/en-US.rc | 8 ++++---- base/shell/cmd/lang/es-ES.rc | 8 ++++---- base/shell/cmd/lang/fr-FR.rc | 9 ++++----- base/shell/cmd/lang/hu-HU.rc | 8 ++++---- base/shell/cmd/lang/id-ID.rc | 8 ++++---- base/shell/cmd/lang/it-IT.rc | 8 ++++---- base/shell/cmd/lang/ja-JP.rc | 10 +++++----- base/shell/cmd/lang/no-NO.rc | 8 ++++---- base/shell/cmd/lang/pl-PL.rc | 8 ++++---- base/shell/cmd/lang/ro-RO.rc | 12 ++++++------ base/shell/cmd/lang/ru-RU.rc | 8 ++++---- base/shell/cmd/lang/sk-SK.rc | 8 ++++---- base/shell/cmd/lang/sq-AL.rc | 8 ++++---- base/shell/cmd/lang/sv-SE.rc | 8 ++++---- base/shell/cmd/lang/tr-TR.rc | 8 ++++---- base/shell/cmd/lang/uk-UA.rc | 8 ++++---- base/shell/cmd/lang/zh-CN.rc | 8 ++++---- base/shell/cmd/lang/zh-TW.rc | 4 ++-- 21 files changed, 85 insertions(+), 86 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 1c8c84d865..222d26f4b6 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -144,7 +144,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ A Archiveable files\n\ H Hidden Files\n\ - prefix meaning not\n" - STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)?" + STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)? " STRING_DEL_HELP3 " %lu file deleted\n" STRING_DEL_HELP4 " %lu files deleted\n" STRING_DELAY_HELP "Pause for n seconds or milliseconds.\n\ @@ -383,8 +383,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -508,7 +508,7 @@ title new title\n" STRING_COPY_ERROR4 "Chyba: Není naimplementováno!\n" STRING_DATE_ERROR "Neplatné datum." STRING_DEL_ERROR5 "Soubor %s bude vymazán! " - STRING_DEL_ERROR6 "Určitě provést (A/N)?" + STRING_DEL_ERROR6 "Určitě provést (A/N)? " STRING_DEL_ERROR7 "Mazání: %s\n" STRING_ERROR_ERROR1 "Neznámá chyba! Kód: 0x%lx\n" STRING_ERROR_ERROR2 "Chyba syntaxe" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 9067bdd5ba..52ff6829c7 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -138,7 +138,7 @@ ERASE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\n\ /W Sicheres Löschen. Dateien werden mit Zufallszahlen überschrieben, bevor sie gelöscht werden.\n\ /Y Löscht alles (*.*) ohne Vorwarnung.\n\ /Z Löscht versteckte, schreibgeschützte und Systemdateien.\n" - STRING_DEL_HELP2 "Alle Dateien in diesem Verzeichnis werden gelöscht!\nSind Sie sich sicher (J/N)?" + STRING_DEL_HELP2 "Alle Dateien in diesem Verzeichnis werden gelöscht!\nSind Sie sich sicher (J/N) ?" STRING_DEL_HELP3 " %lu Datei(en) gelöscht\n" STRING_DEL_HELP4 " %lu Datei(en) gelöscht\n" STRING_DELAY_HELP "Pause für n Sekunden oder Millisekunden.\n\ @@ -375,8 +375,8 @@ REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U STRING_REPLACE_HELP6 "Ersetze %s\n" STRING_REPLACE_HELP7 "Keine Dateien hinzugefügt\n" STRING_REPLACE_HELP8 "%lu Datei(en) hinzugefügt\n" - STRING_REPLACE_HELP9 "Füge %s hinzu (J/N) " - STRING_REPLACE_HELP10 "Ersetze %s (J/N) " + STRING_REPLACE_HELP9 "Füge %s hinzu (J/N)? " + STRING_REPLACE_HELP10 "Ersetze %s (J/N)? " STRING_REPLACE_HELP11 "Füge %s hinzu\n" STRING_SHIFT_HELP "Verändert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\ SHIFT [DOWN]" @@ -502,7 +502,7 @@ Titel neuer Titel" STRING_COPY_ERROR4 "Fehler: Noch nicht implementiert!\n" STRING_DATE_ERROR "Ungültiges Datum." STRING_DEL_ERROR5 "Die Datei %s wird gelöscht! " - STRING_DEL_ERROR6 "Sind Sie sicher (J/N)?" + STRING_DEL_ERROR6 "Sind Sie sicher (J/N)? " STRING_DEL_ERROR7 "Löschen: %s\n" STRING_ERROR_ERROR1 "Unbekannter Fehler! Fehlernummer: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax-Fehler" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 2ce0815966..d61f676fd8 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -143,7 +143,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]χαρακτηριστικά]] ονόματ A Αρχεία έτοιμα προς αρχειοθέτηση\n\ H Κρυφά αρχεία\n\ - Πρόθεμα που σημαίνει όχι\n" - STRING_DEL_HELP2 "Όλα τα αρχεία στον κατάλογο θα διαγραφούν!\nΕίστε σίγουροι (Y/N)?" + STRING_DEL_HELP2 "Όλα τα αρχεία στον κατάλογο θα διαγραφούν!\nΕίστε σίγουροι (Y/N)? " STRING_DEL_HELP3 " %lu αρχείο διαγράφηκε\n" STRING_DEL_HELP4 " %lu αρχεία διαγράφηκαν\n" STRING_DELAY_HELP "Παύση για n δευτερόλεπτα ή μιλιδευτερόλεπτα.\n\ @@ -382,8 +382,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Αντικατάσταση του %s\n" STRING_REPLACE_HELP7 "Δεν προστέθηκαν αρχεία\n" STRING_REPLACE_HELP8 "%lu αρχείο(α) προστέθηκαν\n" - STRING_REPLACE_HELP9 "Προσθήκη %s (Y/N) " - STRING_REPLACE_HELP10 "Αντικατάσταση %s (Y/N) " + STRING_REPLACE_HELP9 "Προσθήκη %s (Y/N)? " + STRING_REPLACE_HELP10 "Αντικατάσταση %s (Y/N)? " STRING_REPLACE_HELP11 "Γίνεται προσθήκη του %s\n" STRING_SHIFT_HELP "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -507,7 +507,7 @@ title new title\n" STRING_COPY_ERROR4 "Σφάλμα: Not implemented yet!\n" STRING_DATE_ERROR "Μη έγκυρη ημερομηνία." STRING_DEL_ERROR5 "Το αρχείο %s πρόκειται να διαγραφεί! " - STRING_DEL_ERROR6 "Είστε σίγουροι (Y/N)?" + STRING_DEL_ERROR6 "Είστε σίγουροι (Y/N)? " STRING_DEL_ERROR7 "Γίνεται διαγραφή: %s\n" STRING_ERROR_ERROR1 "Άγνωστο σφάλμα! Κωδικός λάθους: 0x%lx\n" STRING_ERROR_ERROR2 "Σφάλμα σύνταξης" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index c0f16a2764..100bbe6bb8 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -139,7 +139,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ A Archiveable files\n\ H Hidden Files\n\ - prefix meaning not\n" - STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)?" + STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)? " STRING_DEL_HELP3 " %lu file deleted\n" STRING_DEL_HELP4 " %lu files deleted\n" STRING_DELAY_HELP "Pause for n seconds or milliseconds.\n\ @@ -378,8 +378,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -503,7 +503,7 @@ title new title\n" STRING_COPY_ERROR4 "Error: Not implemented yet!\n" STRING_DATE_ERROR "Invalid date." STRING_DEL_ERROR5 "The file %s will be deleted! " - STRING_DEL_ERROR6 "Are you sure (Y/N)?" + STRING_DEL_ERROR6 "Are you sure (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 1fe5466f5f..d2767a4b25 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -141,7 +141,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]atributos]] archivo ...\n\n\ A Archivos listos para archivar\n\ H Archivos ocultos\n\ - Prefijo que signifca sin\n" - STRING_DEL_HELP2 "¡Todos los archivos del directorio van a ser borrados!\n¿Estás seguro? (S/N)?" + STRING_DEL_HELP2 "¡Todos los archivos del directorio van a ser borrados!\n¿Estás seguro (S/N)? " STRING_DEL_HELP3 " Archivo %lu borrado\n" STRING_DEL_HELP4 " Archivos %lu borrados\n" STRING_DELAY_HELP "Espera por n segundos o milisegundos.\n\ @@ -381,8 +381,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Reemplazar %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu archivo(s) añadidos\n" - STRING_REPLACE_HELP9 "Añadir %s (S/N) " - STRING_REPLACE_HELP10 "Reemplazar %s (S/N) " + STRING_REPLACE_HELP9 "Añadir %s (S/N)? " + STRING_REPLACE_HELP10 "Reemplazar %s (S/N)? " STRING_REPLACE_HELP11 "Añadiendo %s\n" STRING_SHIFT_HELP "Cambia la posición de los parámetros remplazables en un \n\ archivo por lotes.\n\n\ @@ -507,7 +507,7 @@ title Nuevo título\n" STRING_COPY_ERROR4 "Error: ¡No implementado aún!\n" STRING_DATE_ERROR "Fecha incorrecta." STRING_DEL_ERROR5 "¡El archivo %s va a ser borrado!" - STRING_DEL_ERROR6 "¿Estás seguro (S/N)?" + STRING_DEL_ERROR6 "¿Estás seguro (S/N)? " STRING_DEL_ERROR7 "Borrando: %s\n" STRING_ERROR_ERROR1 "¡Error desconocido! Códige de error: 0x%lx\n" STRING_ERROR_ERROR2 "Error de sintaxsis" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 4a8add0a3e..efe80145fa 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -147,8 +147,7 @@ ERASE [/N /P /T /Q /W /Y /Z] fichier ...\n\n\ A Fichiers archivables\n\ H Fichiers cachés\n\ - préfixe signifiant ne pas\n" - STRING_DEL_HELP2 "Tous les fichiers du répertoire seront effacés!\n\ -Etes vous sûr(e) (O/N) ?" + STRING_DEL_HELP2 "Tous les fichiers du répertoire seront effacés!\n\Etes vous sûr(e) (O/N) ? " STRING_DEL_HELP3 " %lu fichier effacé\n" STRING_DEL_HELP4 " %lu fichiers effacés\n" STRING_DELAY_HELP "Attend pendant n secondes ou millisecondes.\n\ @@ -395,8 +394,8 @@ REPLACE [lecteur1:][chemin1]nomdefichier [lecteur2:][chemin2] [/P] [/R] [/S] [/W STRING_REPLACE_HELP6 "Remplace %s\n" STRING_REPLACE_HELP7 "Aucun fichier ajouté\n" STRING_REPLACE_HELP8 "%lu fichier(s) ajouté(s)\n" - STRING_REPLACE_HELP9 "Ajouter %s (Y/N) " - STRING_REPLACE_HELP10 "Remplacer %s (Y/N) " + STRING_REPLACE_HELP9 "Ajouter %s (O/N) ? " + STRING_REPLACE_HELP10 "Remplacer %s (O/N) ? " STRING_REPLACE_HELP11 "Ajoute %s\n" STRING_SHIFT_HELP "Change la position de paramètres remplaçables dans un fichier batch.\n\n\ SHIFT [DOWN]" @@ -520,7 +519,7 @@ titre titre de la fenêtre" STRING_COPY_ERROR4 "Erreur : Non implémenté actuellement !\n" STRING_DATE_ERROR "Date invalide." STRING_DEL_ERROR5 "Le fichier %s va être effacé ! " - STRING_DEL_ERROR6 "Etes vous sûr (O/N) ?" + STRING_DEL_ERROR6 "Etes vous sûr (O/N) ? " STRING_DEL_ERROR7 "Efface : %s\n" STRING_ERROR_ERROR1 "Erreur inconnue! Code d'erreur : 0x%lx\n" STRING_ERROR_ERROR2 "Erreur de syntaxe" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 7763adbe02..8b91ff129e 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -132,7 +132,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attribútumok]] állomány ...\n\n\ A Archivált állomány\n\ H Rejtett állománys\n\ - ""Nem"" prefix\n" - STRING_DEL_HELP2 "Minden állomány törölve lesz a mappában!\nBiztosan ezt akarod (I/N)?" + STRING_DEL_HELP2 "Minden állomány törölve lesz a mappában!\nBiztosan ezt akarod (I/N)? " STRING_DEL_HELP3 " %lu állomány törölve\n" STRING_DEL_HELP4 " %lu állomány törölve\n" STRING_DELAY_HELP "Pause for n seconds or milliseconds.\n\ @@ -362,8 +362,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Eltolja a helyettesíthetõ paraméterek pozícióját a batch állományban.\n\n\ SHIFT [DOWN]" @@ -487,7 +487,7 @@ title new title\n" STRING_COPY_ERROR4 "Hiba: ez még nem mûködik!\n" STRING_DATE_ERROR "Érvénytelen dátum." STRING_DEL_ERROR5 "A(z) %s állomány törölve lesz! " - STRING_DEL_ERROR6 "Biztos vagy benne (I/N)?" + STRING_DEL_ERROR6 "Biztos vagy benne (I/N)? " STRING_DEL_ERROR7 "Törlés: %s\n" STRING_ERROR_ERROR1 "Ismeretlen hiba! Hiba kód: 0x%lx\n" STRING_ERROR_ERROR2 "Szintaxis hiba" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 6fdfe505b3..6017803e74 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -141,7 +141,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ A File Bisa Diarsipkan\n\ H File Tersembunyi\n\ - prefiks berarti tidak\n" - STRING_DEL_HELP2 "Semua file dalam direktori akan dihapus!\nAnda yakin (Y/T)?" + STRING_DEL_HELP2 "Semua file dalam direktori akan dihapus!\nAnda yakin (Y/T)? " STRING_DEL_HELP3 " %lu file dihapus\n" STRING_DEL_HELP4 " %lu file dihapus\n" STRING_DELAY_HELP "Menunda n detik atau milidetik.\n\ @@ -379,8 +379,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Mengubah posisi parameter yang bisa diganti dalam file batch.\n\n\ SHIFT [DOWN]" @@ -502,7 +502,7 @@ title judul baru\n" STRING_COPY_ERROR4 "Salah: Belum diimplementasikan!\n" STRING_DATE_ERROR "Tanggal tidak benar." STRING_DEL_ERROR5 "File %s akan dihapus! " - STRING_DEL_ERROR6 "Anda yakin (Y/N)?" + STRING_DEL_ERROR6 "Anda yakin (Y/N)? " STRING_DEL_ERROR7 "Menghapus: %s\n" STRING_ERROR_ERROR1 "Kesalahan tidak dikenal! Kode kesalahan: 0x%lx\n" STRING_ERROR_ERROR2 "Sintaks salah" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 2e4e360ae6..199b5a5c5e 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -139,7 +139,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\n\ A Archiviabile\n\ H nascosto\n\ - prefisso con il significato di non\n" - STRING_DEL_HELP2 "Tutti i file nella cartella saranno cancellati!\nSei sicuro (S/N)?" + STRING_DEL_HELP2 "Tutti i file nella cartella saranno cancellati!\nSei sicuro (S/N)? " STRING_DEL_HELP3 " %lu file cancellato\n" STRING_DEL_HELP4 " %lu file cancellati\n" STRING_DELAY_HELP "Aspetta per il tempo indicato in secondi o millisecondi.\n\ @@ -386,8 +386,8 @@ REPLACE [disco1:][percorso1]nomefile [disco2:][percorso2] [/P] [/R] [/S] [/W] [/ STRING_REPLACE_HELP6 "Sostituzione di %s\n" STRING_REPLACE_HELP7 "Nessun file aggiunto\n" STRING_REPLACE_HELP8 "%lu file aggiunti\n" - STRING_REPLACE_HELP9 "Aggiungere %s (S/N) " - STRING_REPLACE_HELP10 "Sostituire %s (S/N) " + STRING_REPLACE_HELP9 "Aggiungere %s (S/N)? " + STRING_REPLACE_HELP10 "Sostituire %s (S/N)? " STRING_REPLACE_HELP11 "Aggiunta di %s in corso\n" STRING_SHIFT_HELP "Cambia la posizione dei parametri in un batch.\n\n\ SHIFT [DOWN]" @@ -513,7 +513,7 @@ titolo il nuovo titolo\n" STRING_COPY_ERROR4 "Errore: Non ancora implementato!\n" STRING_DATE_ERROR "Data non valida." STRING_DEL_ERROR5 "Il file %s sarà cancellato! " - STRING_DEL_ERROR6 "Sei sicuro (S/N)?" + STRING_DEL_ERROR6 "Sei sicuro (S/N)? " STRING_DEL_ERROR7 "Cancellazione di: %s\n" STRING_ERROR_ERROR1 "Errore sconosciuto! Codice errore: 0x%lx\n" STRING_ERROR_ERROR2 "Errore di sintassi" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index 369b4a5a85..0064cccdb2 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -89,7 +89,7 @@ COLOR [属性 [/-F]]\n\n\ 5 5 紫 13 D 明るい紫\n\ 6 6 黄色 14 E 明るい黄色\n\ 7 7 白 15 F 輝く白\n" - STRING_COPY_HELP1 "%s を上書きしますが、よろしいですか? (Yes/No/All)? " + STRING_COPY_HELP1 "%s を上書きしますが、よろしいですか (Yes/No/All)? " STRING_COPY_HELP2 "1 つまたは複数のファイルを別の場所にコピーします。\n\n\ COPY [/V][/Y|/-Y][/A|/B] コピー元 [/A|/B]\n\ [+ コピー元 [/A|/B] [+ ...]] [コピー先 [/A|/B]]\n\n\ @@ -143,7 +143,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]属性]] ファイル名 ...\n\n\ A アーカイブ\n\ H 隠しファイル\n\ - その属性以外\n" - STRING_DEL_HELP2 "ディレクトリのすべてのファイルが削除されます!\nよろしいですか (Y/N)?" + STRING_DEL_HELP2 "ディレクトリのすべてのファイルが削除されます!\nよろしいですか (Y/N)? " STRING_DEL_HELP3 " %lu 個のファイルを削除しました\n" STRING_DEL_HELP4 " %lu 個のファイルを削除しました\n" STRING_DELAY_HELP "n 秒、または n ミリ秒待機します。\n\ @@ -387,8 +387,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "バッチファイル中の置き換え可能なパラメータの位置を変更します。\n\n\ SHIFT [DOWN]" @@ -510,7 +510,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_COPY_ERROR4 "エラー: まだ実装されていません!\n" STRING_DATE_ERROR "無効な日付です。" STRING_DEL_ERROR5 "ファイル %s は削除されます! " - STRING_DEL_ERROR6 "よろしいですか (Y/N)?" + STRING_DEL_ERROR6 "よろしいですか (Y/N)? " STRING_DEL_ERROR7 "削除しています: %s\n" STRING_ERROR_ERROR1 "不明なエラーです! エラーコード: 0x%lx\n" STRING_ERROR_ERROR2 "構文エラー" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index b2aa73a3ef..08ee2659d9 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -139,7 +139,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributer]] fil ...\n\n\ A Arkiv filer\n\ H Skjulte filer\n\ - prefiks som betyr IKKE. (f.eks -R)\n" - STRING_DEL_HELP2 "Alle filer i mappen vil bli slettet!\nEr du sikker (J/N)?" + STRING_DEL_HELP2 "Alle filer i mappen vil bli slettet!\nEr du sikker (J/N)? " STRING_DEL_HELP3 " %lu fil slettet\n" STRING_DEL_HELP4 " %lu filer slettet\n" STRING_DELAY_HELP "Pause i n sekunder eller mikrosekunder.\n\ @@ -377,8 +377,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Endre posisjon for erstattelig parameter i et satsvis fil.\n\n\ SHIFT [NED]" @@ -501,7 +501,7 @@ tittel ny tittel\n" STRING_COPY_ERROR4 "Feil: Ikke implementert enda!\n" STRING_DATE_ERROR "Ugyldig dato." STRING_DEL_ERROR5 "Filen %s vil bli slettet! " - STRING_DEL_ERROR6 "Er du sikker (J/N)?" + STRING_DEL_ERROR6 "Er du sikker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Ukjent feil! Feilkode: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaks feil" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 5adf2e068b..c6bc00e74f 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -147,7 +147,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributy]] plik ...\n\n\ A Archiwa\n\ H Ukryte\n\ - przedrostek NIE\n" - STRING_DEL_HELP2 "Wszystkie pliki w tym katalogu zostaną skasowane!\nCzy jesteś pewien (T/N)?" + STRING_DEL_HELP2 "Wszystkie pliki w tym katalogu zostaną skasowane!\nCzy jesteś pewien (T/N)? " STRING_DEL_HELP3 " %lu plik skasowany\n" STRING_DEL_HELP4 " %lu pliki(-ów) skasowane(-ych)\n" STRING_DELAY_HELP "Pauzuje na n sekund lub milisekund.\n\ @@ -383,8 +383,8 @@ REPLACE [napęd1:][ścieżka1] pliki [napęd2:][ścieżka2] [/P] [/R] [/S] [/W] STRING_REPLACE_HELP6 "Zamieniony %s\n" STRING_REPLACE_HELP7 "Nie dodano nowych plików\n" STRING_REPLACE_HELP8 "Dodano %lu plik(i/ów)\n" - STRING_REPLACE_HELP9 "Czy dodać %s (T/N) " - STRING_REPLACE_HELP10 "Czy zamienić %s (T/N) " + STRING_REPLACE_HELP9 "Czy dodać %s (T/N)? " + STRING_REPLACE_HELP10 "Czy zamienić %s (T/N)? " STRING_REPLACE_HELP11 "Dodawanie %s\n" STRING_SHIFT_HELP "Zmienia pozycję parametru w pliku wsadowym.\n\n\ SHIFT [DOWN]" @@ -507,7 +507,7 @@ title nowy tytuł okna\n" STRING_COPY_ERROR4 "Błąd: Nie zaimplementowano!\n" STRING_DATE_ERROR "Data nieprawidłowa." STRING_DEL_ERROR5 "Plik %s zostanie skasowany! " - STRING_DEL_ERROR6 "Czy jesteś pewien (T/N)?" + STRING_DEL_ERROR6 "Czy jesteś pewien (T/N)? " STRING_DEL_ERROR7 "Kasowanie: %s\n" STRING_ERROR_ERROR1 "Nieznany błąd! Kod błędu: 0x%lx\n" STRING_ERROR_ERROR2 "Błąd składni" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 4e86924670..a1565d6d52 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -104,7 +104,7 @@ Exemple:\n\ COLOR green ON bright white\n\ COLOR 0 ON 7\n\ COLOR 8F /-F\n" - STRING_COPY_HELP1 "Suprascrieți «%s»? (Da|Nu|Toate)" + STRING_COPY_HELP1 "Suprascrieți «%s» (Da|Nu|Toate)? " STRING_COPY_HELP2 "Copiază unul sau mai multe fișiere într-un alt loc.\n\n\ COPY [/V][/Y|/-Y][/A|/B] sursă [/A|/B]\n\ [+ sursă [/A|/B] [+ ...]] [destinație [/A|/B]]\n\n\ @@ -152,7 +152,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]atribute]] fișier ...\n\n\ A Arhivabil\n\ H Ascuns\n\ - Prefix de negație\n" - STRING_DEL_HELP2 "Toate fișierele din director vor fi șterse!\nConfirmați ștergerea? (Da|Nu)" + STRING_DEL_HELP2 "Toate fișierele din director vor fi șterse!\nConfirmați ștergerea (Da|Nu)? " STRING_DEL_HELP3 " %lu fișier(e) șters(e)\n" STRING_DEL_HELP4 " %lu fișier(e) șters(e)\n" STRING_DELAY_HELP "Pauză pentru n secunde sau milisecunde.\n\ @@ -309,7 +309,7 @@ legătură simbolică." %13s octeți în total în memoria virtuală.\n\ %13s octeți disponibili în memoria virtuală.\n" STRING_MISC_HELP1 "Tastați pentru a continua..." - STRING_MOVE_HELP1 "Suprascrieți «%s»? (Da|Nu|Toate)" + STRING_MOVE_HELP1 "Suprascrieți «%s» (Da|Nu|Toate)?" STRING_MOVE_HELP2 "Mută sau redenumește fișiere și directoare.\n\n\ Pentru a muta unul sau mai multe fișiere:\n\ MOVE [/N][unitate:][cale]fișier[,...] destinație\n\n\ @@ -410,8 +410,8 @@ REPLACE [unitate1:][cale1]fișier [unitate2:][cale2] [/P] [/R] [/S] [/W] [/U]\n\ STRING_REPLACE_HELP6 "Înlocuiește «%s»\n" STRING_REPLACE_HELP7 "Nu au fost adăugate fișiere\n" STRING_REPLACE_HELP8 "A(u) fost adăugat(e) %lu fișier(e)\n" - STRING_REPLACE_HELP9 "Adaugă «%s»? (Da|Nu)" - STRING_REPLACE_HELP10 "Înlocuiește «%s»? (Da|Nu)" + STRING_REPLACE_HELP9 "Adaugă «%s» (Da|Nu)? " + STRING_REPLACE_HELP10 "Înlocuiește «%s» (Da|Nu)? " STRING_REPLACE_HELP11 "Adăugare «%s»\n" STRING_SHIFT_HELP "Modifică poziția argumentelor înlocuibile într-un fișier de comenzi.\n\n\ SHIFT [DOWN]\n" @@ -534,7 +534,7 @@ titlu Noul titlu.\n" STRING_COPY_ERROR4 "Eroare: Încă nu a fost implementat!\n" STRING_DATE_ERROR "Dată nevalidă." STRING_DEL_ERROR5 "Fișierul «%s» va fi șters!\n" - STRING_DEL_ERROR6 "Confirmați? (Da|Nu)" + STRING_DEL_ERROR6 "Confirmați (Da|Nu)? " STRING_DEL_ERROR7 "Ștergere: %s\n" STRING_ERROR_ERROR1 "Eroare necunoscută! Codul de eroare: 0x%lx\n" STRING_ERROR_ERROR2 "Eroare de sintaxă" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 54f3d4ed07..ec8f64f3cc 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -142,7 +142,7 @@ ERASE [/N] [/P] [/T] [/Q] [/S] [/W] [/Y] [/Z] [/A[[:]атрибуты]] имен A Файлы для архивирования\n\ H Скрытые файлы\n\ Префикс ""-"" имеет значение НЕ\n" - STRING_DEL_HELP2 "Все файлы в каталоге будут удалены!\nВы уверены (Y/N)?" + STRING_DEL_HELP2 "Все файлы в каталоге будут удалены!\nВы уверены (Y/N)? " STRING_DEL_HELP3 " %lu файл удален\n" STRING_DEL_HELP4 " %lu файлов удалено\n" STRING_DELAY_HELP "Пауза на n секунд или миллисекунд.\n\ @@ -387,8 +387,8 @@ REPLACE [диск1:][путь1]имя_файла [диск2:][путь2] [/P] [/ STRING_REPLACE_HELP6 "Замена %s\n" STRING_REPLACE_HELP7 "Нет новых файлов\n" STRING_REPLACE_HELP8 "%lu файл(ов) добавлено\n" - STRING_REPLACE_HELP9 "Добавить %s (Y/N) " - STRING_REPLACE_HELP10 "Заменить %s (Y/N) " + STRING_REPLACE_HELP9 "Добавить %s (Y/N)? " + STRING_REPLACE_HELP10 "Заменить %s (Y/N)? " STRING_REPLACE_HELP11 "Добавление %s\n" STRING_SHIFT_HELP "Изменение содержимого (сдвиг) подставляемых параметров для пакетного файла.\n\n\ SHIFT [DOWN]" @@ -513,7 +513,7 @@ RESTORE восстанавливает окно\n\ STRING_COPY_ERROR4 "Ошибка: В данный момент не реализовано!\n" STRING_DATE_ERROR "Неправильная дата." STRING_DEL_ERROR5 "Файл %s будет удален! " - STRING_DEL_ERROR6 "Вы уверены (Y/N)?" + STRING_DEL_ERROR6 "Вы уверены (Y/N)? " STRING_DEL_ERROR7 "Удаление: %s\n" STRING_ERROR_ERROR1 "Неизвестная ошибка! Код ошибки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксическая ошибка" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index e2a301ae9b..8278a534ce 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -145,7 +145,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ A Archiveable files\n\ H Hidden Files\n\ - prefix meaning not\n" - STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)?" + STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)? " STRING_DEL_HELP3 " %lu file deleted\n" STRING_DEL_HELP4 " %lu files deleted\n" STRING_DELAY_HELP "Pause for n seconds or milliseconds.\n\ @@ -384,8 +384,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -509,7 +509,7 @@ title new title\n" STRING_COPY_ERROR4 "Chyba: Zatiaľ neimplementované!\n" STRING_DATE_ERROR "Neplatný dátum." STRING_DEL_ERROR5 "The file %s will be deleted! " - STRING_DEL_ERROR6 "Ste si istý (Y/N)?" + STRING_DEL_ERROR6 "Ste si istý (Y/N)? " STRING_DEL_ERROR7 "Deleting: %s\n" STRING_ERROR_ERROR1 "Neznáma chyba! Kód chyby: 0x%lx\n" STRING_ERROR_ERROR2 "Syntax error" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 91845f7ece..2a620e8782 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -143,7 +143,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ A Arkivat\n\ H Të fshehur\n\ - kuptimi parashtesë nuk\n" - STRING_DEL_HELP2 "Të gjitha dokumentet në skedare do të fshihen!\nJeni i sigurtë (P/J)?" + STRING_DEL_HELP2 "Të gjitha dokumentet në skedare do të fshihen!\nJeni i sigurtë (P/J)? " STRING_DEL_HELP3 " %lu u fshi\n" STRING_DEL_HELP4 " %lu u fshinë\n" STRING_DELAY_HELP "Pauzë për sekonda ose milisekonda.\n\ @@ -382,8 +382,8 @@ REPLACE [drive1:][rrugë1]emri [drive2:][rrugë2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Zëvendësoh %s\n" STRING_REPLACE_HELP7 "S'ka dokumentat te shtuar\n" STRING_REPLACE_HELP8 "%lu dokumenta(t) u shtuan\n" - STRING_REPLACE_HELP9 "Shto %s (P/J) " - STRING_REPLACE_HELP10 "Zëvendëso %s (P/J) " + STRING_REPLACE_HELP9 "Shto %s (P/J)? " + STRING_REPLACE_HELP10 "Zëvendëso %s (P/J)? " STRING_REPLACE_HELP11 "Shtim %s\n" STRING_SHIFT_HELP "Ndryshon pozitën e parametrave në një dokument batch.\n\n\ SHIFT [DOWN]" @@ -507,7 +507,7 @@ title titull i ri\n" STRING_COPY_ERROR4 "Error: Akoma nuk është implementuar!\n" STRING_DATE_ERROR "Date Invalid." STRING_DEL_ERROR5 "Dokumenti %s do të fshihet! " - STRING_DEL_ERROR6 "Jeni të sigurtë (P/J))?" + STRING_DEL_ERROR6 "Jeni të sigurtë (P/J)? " STRING_DEL_ERROR7 "Fshini: %s\n" STRING_ERROR_ERROR1 "Error i paditur! Kodi error: 0x%lx\n" STRING_ERROR_ERROR2 "Error sintaksi" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 613f18f33b..c1ea602ac0 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -139,7 +139,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attribut]] fil ...\n\n\ A Arkiv filer\n\ H Dolda filer\n\ - prefiks som betyder INTE. (f.eks -R)\n" - STRING_DEL_HELP2 "Alla filer i mappen kommer att bli raderade!\nÄr du säker (J/N)?" + STRING_DEL_HELP2 "Alla filer i mappen kommer att bli raderade!\nÄr du säker (J/N)? " STRING_DEL_HELP3 " %lu fil raderade\n" STRING_DEL_HELP4 " %lu filer raderade\n" STRING_DELAY_HELP "Paus i n sekunder eller mikrosekunder.\n\ @@ -377,8 +377,8 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Replace %s\n" STRING_REPLACE_HELP7 "No files added\n" STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " + STRING_REPLACE_HELP9 "Add %s (Y/N)? " + STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" STRING_SHIFT_HELP "Ändra posisjon for erstattelig parameter i et satsvis fil.\n\n\ SHIFT [NED]" @@ -501,7 +501,7 @@ tittel ny tittel\n" STRING_COPY_ERROR4 "Feil: Inte implementert enda!\n" STRING_DATE_ERROR "Ugyldig dato." STRING_DEL_ERROR5 "Filen %s vil bli slettet! " - STRING_DEL_ERROR6 "Er du sikker (J/N)?" + STRING_DEL_ERROR6 "Er du sikker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" STRING_ERROR_ERROR1 "Ukjent feil! Feilkode: 0x%lx\n" STRING_ERROR_ERROR2 "Syntaks feil" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 982af49de0..df9e5061db 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -142,7 +142,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]öz nitelikler]] kütük ...\n\n\ A Belgeliklenebilir kütükler\n\ H Gizli kütükler\n\ - değil anlamına gelen ön ek\n" - STRING_DEL_HELP2 "Dizindeki tüm kütükler silinecek!\nEmin misiniz (Y/N)?" + STRING_DEL_HELP2 "Dizindeki tüm kütükler silinecek!\nEmin misiniz (Y/N)? " STRING_DEL_HELP3 " %lu kütük silindi\n" STRING_DEL_HELP4 " %lu kütük silindi\n" STRING_DELAY_HELP "n sâniye ya da milisâniye duraklat.\n\ @@ -384,8 +384,8 @@ REPLACE [sürücü1:][yol1]kütük adı [sürücü2:][yol2] [/P] [/R] [/S] [/W] STRING_REPLACE_HELP6 "%s değiştir\n" STRING_REPLACE_HELP7 "Bir kütük eklenmedi\n" STRING_REPLACE_HELP8 "%lu kütük eklendi\n" - STRING_REPLACE_HELP9 "Ekle %s (E/H) " - STRING_REPLACE_HELP10 "Değiştir %s (E/H) " + STRING_REPLACE_HELP9 "Ekle %s (E/H)? " + STRING_REPLACE_HELP10 "Değiştir %s (E/H)? " STRING_REPLACE_HELP11 "%s ekleniyor\n" STRING_SHIFT_HELP "Bir toplu iş kütüğünde yerleri değiştirilebilir değişkenlerin konumunu değiştirir.\n\n\ SHIFT [DOWN]" @@ -508,7 +508,7 @@ başlık Yeni başlık\n" STRING_COPY_ERROR4 "Yanlışlık: Daha bitirilmedi!\n" STRING_DATE_ERROR "Geçersiz târih." STRING_DEL_ERROR5 "%s kütüğü silinecek! " - STRING_DEL_ERROR6 "Emin misiniz (E/H)?" + STRING_DEL_ERROR6 "Emin misiniz (E/H)? " STRING_DEL_ERROR7 "Siliniyor: %s\n" STRING_ERROR_ERROR1 "Bilinmeyen yanlışlık! Yanlışlık kodu: 0x%lx\n" STRING_ERROR_ERROR2 "Yazım yanlışlığı" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index d30ef0163e..8aeabb0a3c 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -150,7 +150,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]атрибути]] iмена_файлiв .. A Файли для архiвування\n\ H Прихованi файли\n\ Префiкс ""-"" означає НЕ\n" - STRING_DEL_HELP2 "Всi файли в каталозi будуть видалннi!\nВи впевненi (Y/N)?" + STRING_DEL_HELP2 "Всi файли в каталозi будуть видалннi!\nВи впевненi (Y/N)? " STRING_DEL_HELP3 " %lu файл видалено\n" STRING_DEL_HELP4 " %lu файлiв видалено\n" STRING_DELAY_HELP "Пауза на n секунд чи мiлiсекунд.\n\ @@ -388,8 +388,8 @@ REPLACE [диск1:][шлях1]iм'я_файлу [диск2:][шлях2] [/P] [/ STRING_REPLACE_HELP6 "Замiнити %s\n" STRING_REPLACE_HELP7 "Не додано жодних файлiв\n" STRING_REPLACE_HELP8 "%lu файл(iв) додано\n" - STRING_REPLACE_HELP9 "Додати %s (Y/N) " - STRING_REPLACE_HELP10 "Замiнити %s (Y/N) " + STRING_REPLACE_HELP9 "Додати %s (Y/N)? " + STRING_REPLACE_HELP10 "Замiнити %s (Y/N)? " STRING_REPLACE_HELP11 "Додавання %s\n" STRING_SHIFT_HELP "Змiна позицiї пiдставлюваних параметрiв для пакетного файлу.\n\n\ SHIFT [DOWN]" @@ -513,7 +513,7 @@ title новий заголовок\n" STRING_COPY_ERROR4 "Помилка: Ще не реалiзовано!\n" STRING_DATE_ERROR "Невiрна дата." STRING_DEL_ERROR5 "Файл %s буде видалений! " - STRING_DEL_ERROR6 "Ви впевненi (Y/N)?" + STRING_DEL_ERROR6 "Ви впевненi (Y/N)? " STRING_DEL_ERROR7 "Видалення: %s\n" STRING_ERROR_ERROR1 "Невiдома помилка! Код помилки: 0x%lx\n" STRING_ERROR_ERROR2 "Синтаксична помилка" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 00543e1b7b..3d2a62b254 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -135,7 +135,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]属性]] 文件 ...\n\n\ A 归档文件\n\ H 隐藏文件\n\ - 意为“否”的前缀\n" - STRING_DEL_HELP2 "该目录中的所有文件都将被删除！\n您确定吗 (Y/N)？" + STRING_DEL_HELP2 "该目录中的所有文件都将被删除！\n您确定吗 (Y/N)？ " STRING_DEL_HELP3 " %lu 文件已删除\n" STRING_DEL_HELP4 " %lu 文件已删除\n" STRING_DELAY_HELP "暂停 n 秒或毫秒。\n\ @@ -353,8 +353,8 @@ REPLACE [驱动器1:][路径1]文件名 [驱动器2:][路径2] [/P] [/R] [/S] [/ STRING_REPLACE_HELP6 "替换 %s\n" STRING_REPLACE_HELP7 "没有文件被添加\n" STRING_REPLACE_HELP8 "%lu 个文件已被添加\n" - STRING_REPLACE_HELP9 "添加 %s 吗 (Y/N)？" - STRING_REPLACE_HELP10 "替换 %s 吗 (Y/N)？" + STRING_REPLACE_HELP9 "添加 %s 吗 (Y/N)？ " + STRING_REPLACE_HELP10 "替换 %s 吗 (Y/N)？ " STRING_REPLACE_HELP11 "正在添加 %s\n" STRING_SHIFT_HELP "在批处理文件中改变可替换参数的位置。\n\n\ SHIFT [DOWN]" @@ -472,7 +472,7 @@ RESTORE 恢复窗口\n\ STRING_COPY_ERROR4 "错误：尚未实现！\n" STRING_DATE_ERROR "无效日期。" STRING_DEL_ERROR5 "文件 %s 将会被删除！" - STRING_DEL_ERROR6 "您确定吗 (Y/N)？" + STRING_DEL_ERROR6 "您确定吗 (Y/N)？ " STRING_DEL_ERROR7 "正在删除：%s\n" STRING_ERROR_ERROR1 "未知错误！错误码：0x%lx\n" STRING_ERROR_ERROR2 "语法错误" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 1366af2cd1..a1c6ef7093 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -135,7 +135,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]屬性]] 檔案 ...\n\n\ A 歸檔檔案\n\ H 隱藏檔案\n\ - 意為“否”的字首\n" - STRING_DEL_HELP2 "該目錄中的所有檔案都將被刪除！\n您確定嗎 (Y/N)？" + STRING_DEL_HELP2 "該目錄中的所有檔案都將被刪除！\n您確定嗎 (Y/N)？ " STRING_DEL_HELP3 " %lu 檔案已刪除\n" STRING_DEL_HELP4 " %lu 檔案已刪除\n" STRING_DELAY_HELP "暫停 n 秒或毫秒。\n\ @@ -472,7 +472,7 @@ RESTORE 恢復視窗\n\ STRING_COPY_ERROR4 "錯誤：尚未實現！\n" STRING_DATE_ERROR "無效日期。" STRING_DEL_ERROR5 "檔案 %s 將會被刪除！" - STRING_DEL_ERROR6 "您確定嗎 (Y/N)？" + STRING_DEL_ERROR6 "您確定嗎 (Y/N)？ " STRING_DEL_ERROR7 "正在刪除：%s\n" STRING_ERROR_ERROR1 "未知錯誤！錯誤碼：0x%lx\n" STRING_ERROR_ERROR2 "語法錯誤"

7 years

[reactos] 01/01: [USER32_APITEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c39b0fc66706635a73fdb… commit c39b0fc66706635a73fdbab557e1404e515fa622 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 2 21:17:22 2017 +0100 [USER32_APITEST] Add a PCH. --- modules/rostests/apitests/include/user32testhelpers.h | 2 ++ modules/rostests/apitests/user32/AttachThreadInput.c | 9 +-------- modules/rostests/apitests/user32/CMakeLists.txt | 6 +++--- modules/rostests/apitests/user32/CreateDialog.c | 7 +------ .../apitests/user32/CreateIconFromResourceEx.c | 7 ++----- modules/rostests/apitests/user32/CreateWindowEx.c | 5 +---- modules/rostests/apitests/user32/DeferWindowPos.c | 7 +------ modules/rostests/apitests/user32/DestroyCursorIcon.c | 7 ++----- modules/rostests/apitests/user32/DrawIconEx.c | 7 ++----- modules/rostests/apitests/user32/EmptyClipboard.c | 8 +------- modules/rostests/apitests/user32/EnumDisplaySettings.c | 4 +--- modules/rostests/apitests/user32/GetDCEx.c | 5 +---- modules/rostests/apitests/user32/GetIconInfo.c | 9 +-------- modules/rostests/apitests/user32/GetKeyState.c | 7 ++----- modules/rostests/apitests/user32/GetPeekMessage.c | 4 +--- modules/rostests/apitests/user32/GetSystemMetrics.c | 6 +----- .../apitests/user32/GetUserObjectInformation.c | 7 +++---- modules/rostests/apitests/user32/GetWindowPlacement.c | 3 +-- modules/rostests/apitests/user32/InitializeLpkHooks.c | 5 +---- modules/rostests/apitests/user32/LoadImage.c | 6 +----- .../apitests/user32/LookupIconIdFromDirectoryEx.c | 9 ++------- modules/rostests/apitests/user32/NextDlgItem.c | 6 +----- modules/rostests/apitests/user32/RealGetWindowClass.c | 6 +----- modules/rostests/apitests/user32/RegisterClassEx.c | 9 +-------- modules/rostests/apitests/user32/RegisterHotKey.c | 7 +------ modules/rostests/apitests/user32/ScrollDC.c | 6 +----- modules/rostests/apitests/user32/ScrollWindowEx.c | 6 +----- modules/rostests/apitests/user32/SendMessageTimeout.c | 6 +----- modules/rostests/apitests/user32/SetActiveWindow.c | 9 +-------- modules/rostests/apitests/user32/SetCursorPos.c | 6 +----- modules/rostests/apitests/user32/SetParent.c | 6 +----- modules/rostests/apitests/user32/SetProp.c | 4 +--- modules/rostests/apitests/user32/SetScrollInfo.c | 5 +---- modules/rostests/apitests/user32/SetScrollRange.c | 5 +---- .../rostests/apitests/user32/SystemParametersInfo.c | 11 ++--------- modules/rostests/apitests/user32/TrackMouseEvent.c | 8 +------- modules/rostests/apitests/user32/WndProc.c | 5 +---- modules/rostests/apitests/user32/desktop.c | 12 ++---------- modules/rostests/apitests/user32/precomp.h | 18 ++++++++++++++++++ 39 files changed, 68 insertions(+), 197 deletions(-) diff --git a/modules/rostests/apitests/include/user32testhelpers.h b/modules/rostests/apitests/include/user32testhelpers.h index 687af541a2..ef020ed429 100644 --- a/modules/rostests/apitests/include/user32testhelpers.h +++ b/modules/rostests/apitests/include/user32testhelpers.h @@ -1,4 +1,6 @@ +#pragma once + static __inline ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName) { WNDCLASSEXW wcex; diff --git a/modules/rostests/apitests/user32/AttachThreadInput.c b/modules/rostests/apitests/user32/AttachThreadInput.c index 78b461d0c6..fbba717872 100644 --- a/modules/rostests/apitests/user32/AttachThreadInput.c +++ b/modules/rostests/apitests/user32/AttachThreadInput.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> -#include <msgtrace.h> -#include <user32testhelpers.h> - -#define DESKTOP_ALL_ACCESS 0x01ff +#include "precomp.h" typedef struct { DWORD tid; diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 3b758836d4..5a0c2d1844 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -38,13 +38,13 @@ list(APPEND SOURCE TrackMouseEvent.c WndProc.c wsprintf.c - testlist.c - user32_apitest.rc) + precomp.h) -add_executable(user32_apitest ${SOURCE}) +add_executable(user32_apitest ${SOURCE} testlist.c user32_apitest.rc) target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll) +add_pch(user32_apitest precomp.h SOURCE) add_rostests_file(TARGET user32_apitest) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/verclasstest1.manifest") diff --git a/modules/rostests/apitests/user32/CreateDialog.c b/modules/rostests/apitests/user32/CreateDialog.c index dfb33a5c00..0d7d718cc0 100644 --- a/modules/rostests/apitests/user32/CreateDialog.c +++ b/modules/rostests/apitests/user32/CreateDialog.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Andreas Maier */ -#include <stdarg.h> -#include <stdio.h> -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" #define TEST_MAX_MSG 50 diff --git a/modules/rostests/apitests/user32/CreateIconFromResourceEx.c b/modules/rostests/apitests/user32/CreateIconFromResourceEx.c index 4c5d7b7deb..25f75c42a7 100644 --- a/modules/rostests/apitests/user32/CreateIconFromResourceEx.c +++ b/modules/rostests/apitests/user32/CreateIconFromResourceEx.c @@ -1,8 +1,5 @@ -#include <apitest.h> - -#include <winuser.h> -#include <wingdi.h> +#include "precomp.h" START_TEST(CreateIconFromResourceEx) { @@ -89,4 +86,4 @@ START_TEST(CreateIconFromResourceEx) ok(hcur1 == NULL, "\n"); err = GetLastError(); ok(err == 0x0badf00d, "err: %lu\n", err); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/CreateWindowEx.c b/modules/rostests/apitests/user32/CreateWindowEx.c index d377b3f0da..24ac64d26f 100644 --- a/modules/rostests/apitests/user32/CreateWindowEx.c +++ b/modules/rostests/apitests/user32/CreateWindowEx.c @@ -6,10 +6,7 @@ * Mark Jansen */ -#include <apitest.h> -#include <winuser.h> -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" static void Test_Params(void) { diff --git a/modules/rostests/apitests/user32/DeferWindowPos.c b/modules/rostests/apitests/user32/DeferWindowPos.c index 223d489496..ad18459cf4 100644 --- a/modules/rostests/apitests/user32/DeferWindowPos.c +++ b/modules/rostests/apitests/user32/DeferWindowPos.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winuser.h> -#include <undocuser.h> -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" HWND hWnd1, hWnd2, hWnd3, hWnd4; diff --git a/modules/rostests/apitests/user32/DestroyCursorIcon.c b/modules/rostests/apitests/user32/DestroyCursorIcon.c index df91a41e0d..da87d122f0 100644 --- a/modules/rostests/apitests/user32/DestroyCursorIcon.c +++ b/modules/rostests/apitests/user32/DestroyCursorIcon.c @@ -1,8 +1,5 @@ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" START_TEST(DestroyCursorIcon) { @@ -51,4 +48,4 @@ START_TEST(DestroyCursorIcon) /* clean up */ DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/DrawIconEx.c b/modules/rostests/apitests/user32/DrawIconEx.c index b3a7cc354f..41b1707e03 100644 --- a/modules/rostests/apitests/user32/DrawIconEx.c +++ b/modules/rostests/apitests/user32/DrawIconEx.c @@ -1,8 +1,5 @@ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" START_TEST(DrawIconEx) { @@ -55,4 +52,4 @@ START_TEST(DrawIconEx) hbmp = SelectObject(hdc, hbmp); DeleteObject(hbmp); DeleteDC(hdc); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/EmptyClipboard.c b/modules/rostests/apitests/user32/EmptyClipboard.c index a7d0140bd7..0536736902 100644 --- a/modules/rostests/apitests/user32/EmptyClipboard.c +++ b/modules/rostests/apitests/user32/EmptyClipboard.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" HWND hWnd1, hWnd2; diff --git a/modules/rostests/apitests/user32/EnumDisplaySettings.c b/modules/rostests/apitests/user32/EnumDisplaySettings.c index 0d058bb934..06ee987a2c 100644 --- a/modules/rostests/apitests/user32/EnumDisplaySettings.c +++ b/modules/rostests/apitests/user32/EnumDisplaySettings.c @@ -1,7 +1,5 @@ -#include <apitest.h> -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" #define SIZEOF_DEVMODEW_300_W 188 #define SIZEOF_DEVMODEW_400_W 212 diff --git a/modules/rostests/apitests/user32/GetDCEx.c b/modules/rostests/apitests/user32/GetDCEx.c index b9a183fa3b..6900797ccb 100644 --- a/modules/rostests/apitests/user32/GetDCEx.c +++ b/modules/rostests/apitests/user32/GetDCEx.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <stdio.h> -#include <wine/test.h> -#include <windows.h> +#include "precomp.h" #define DCX_USESTYLE 0x00010000 @@ -446,4 +444,3 @@ START_TEST(GetDCEx) Test_GetDCEx_CS_Mixed(); Test_GetDCEx_CS_SwitchedStyle(); } - diff --git a/modules/rostests/apitests/user32/GetIconInfo.c b/modules/rostests/apitests/user32/GetIconInfo.c index 6a36ad1247..b8da5148f8 100644 --- a/modules/rostests/apitests/user32/GetIconInfo.c +++ b/modules/rostests/apitests/user32/GetIconInfo.c @@ -1,10 +1,5 @@ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#include "resource.h" +#include "precomp.h" // FIXME user32 @@ -278,5 +273,3 @@ START_TEST(GetIconInfo) /* Delete cursor */ DestroyCursor(hcursor); } - - diff --git a/modules/rostests/apitests/user32/GetKeyState.c b/modules/rostests/apitests/user32/GetKeyState.c index df90461062..e539bdbf91 100644 --- a/modules/rostests/apitests/user32/GetKeyState.c +++ b/modules/rostests/apitests/user32/GetKeyState.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <winuser.h> -#include <assert.h> +#include "precomp.h" HHOOK hKbdHook, hKbdLLHook; @@ -133,4 +130,4 @@ void Test_GetKeyState() START_TEST(GetKeyState) { Test_GetKeyState(); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/GetPeekMessage.c b/modules/rostests/apitests/user32/GetPeekMessage.c index fc10725218..b947672a15 100644 --- a/modules/rostests/apitests/user32/GetPeekMessage.c +++ b/modules/rostests/apitests/user32/GetPeekMessage.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winuser.h> +#include "precomp.h" void Test_GetMessage(HWND hWnd) { diff --git a/modules/rostests/apitests/user32/GetSystemMetrics.c b/modules/rostests/apitests/user32/GetSystemMetrics.c index f969a41cc4..9e6fd3feec 100644 --- a/modules/rostests/apitests/user32/GetSystemMetrics.c +++ b/modules/rostests/apitests/user32/GetSystemMetrics.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_GetSystemMetrics() { @@ -408,4 +405,3 @@ START_TEST(GetSystemMetrics) { Test_GetSystemMetrics(); } - diff --git a/modules/rostests/apitests/user32/GetUserObjectInformation.c b/modules/rostests/apitests/user32/GetUserObjectInformation.c index e509f31e0a..31ad447288 100644 --- a/modules/rostests/apitests/user32/GetUserObjectInformation.c +++ b/modules/rostests/apitests/user32/GetUserObjectInformation.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" + #include <ndk/mmfuncs.h> #include <ndk/pstypes.h> #include <strsafe.h> @@ -465,4 +464,4 @@ START_TEST(GetUserObjectInformation) { TestGetUserObjectInfoW(); TestGetUserObjectInfoA(); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/GetWindowPlacement.c b/modules/rostests/apitests/user32/GetWindowPlacement.c index c5fe2072e8..5871ef6eb5 100644 --- a/modules/rostests/apitests/user32/GetWindowPlacement.c +++ b/modules/rostests/apitests/user32/GetWindowPlacement.c @@ -5,8 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <winuser.h> +#include "precomp.h" #define ALIGN_DOWN_BY(size, align) \ ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) diff --git a/modules/rostests/apitests/user32/InitializeLpkHooks.c b/modules/rostests/apitests/user32/InitializeLpkHooks.c index 5090baa53b..eefaf7c609 100644 --- a/modules/rostests/apitests/user32/InitializeLpkHooks.c +++ b/modules/rostests/apitests/user32/InitializeLpkHooks.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <winuser.h> +#include "precomp.h" typedef struct _LPK_LPEDITCONTROL_LIST { @@ -106,4 +104,3 @@ START_TEST(InitializeLpkHooks) { Test_InitializeLpkHooks(); } - diff --git a/modules/rostests/apitests/user32/LoadImage.c b/modules/rostests/apitests/user32/LoadImage.c index 39e09bd715..586e86988a 100644 --- a/modules/rostests/apitests/user32/LoadImage.c +++ b/modules/rostests/apitests/user32/LoadImage.c @@ -1,9 +1,5 @@ -#include <apitest.h> - -#include <stdio.h> -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" START_TEST(LoadImage) { diff --git a/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c b/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c index 218da48a1b..ac1392482f 100644 --- a/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c +++ b/modules/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c @@ -1,10 +1,5 @@ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#include "resource.h" +#include "precomp.h" START_TEST(LookupIconIdFromDirectoryEx) { @@ -129,4 +124,4 @@ START_TEST(LookupIconIdFromDirectoryEx) ok(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) == DISP_CHANGE_SUCCESSFUL, "\n"); FreeResource(hMem); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/NextDlgItem.c b/modules/rostests/apitests/user32/NextDlgItem.c index a27ee23176..38a0819881 100644 --- a/modules/rostests/apitests/user32/NextDlgItem.c +++ b/modules/rostests/apitests/user32/NextDlgItem.c @@ -5,12 +5,8 @@ * PROGRAMMERS: Katayama Hirofumi MZ */ -#include <stdarg.h> -#include <stdio.h> -#include <apitest.h> +#include "precomp.h" -#include <wingdi.h> -#include <winuser.h> #include <windowsx.h> #include <dlgs.h> diff --git a/modules/rostests/apitests/user32/RealGetWindowClass.c b/modules/rostests/apitests/user32/RealGetWindowClass.c index e47003f599..856c28c71f 100644 --- a/modules/rostests/apitests/user32/RealGetWindowClass.c +++ b/modules/rostests/apitests/user32/RealGetWindowClass.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Gregor Gullwi */ -#include <apitest.h> - -#include <stdio.h> -#include <winuser.h> +#include "precomp.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) @@ -189,4 +186,3 @@ START_TEST(RealGetWindowClass) Test_ClassAtoms(); Test_RealGetWindowClass(); } - diff --git a/modules/rostests/apitests/user32/RegisterClassEx.c b/modules/rostests/apitests/user32/RegisterClassEx.c index 8134b98c23..7a7f3456fc 100644 --- a/modules/rostests/apitests/user32/RegisterClassEx.c +++ b/modules/rostests/apitests/user32/RegisterClassEx.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> - -#include <wchar.h> -#include <wingdi.h> -#include <winuser.h> -#include <undocuser.h> +#include "precomp.h" static ATOM _RegisterClass(LPCWSTR lpwszClassName, HINSTANCE hInstance, UINT style, WNDPROC lpfnWndProc) { diff --git a/modules/rostests/apitests/user32/RegisterHotKey.c b/modules/rostests/apitests/user32/RegisterHotKey.c index 529797422e..c390157239 100644 --- a/modules/rostests/apitests/user32/RegisterHotKey.c +++ b/modules/rostests/apitests/user32/RegisterHotKey.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winuser.h> -#include <shlobj.h> -#include <undocshell.h> -#include <undocuser.h> +#include "precomp.h" #define msg_hotkey(msg, id, mod, vk) do \ { \ diff --git a/modules/rostests/apitests/user32/ScrollDC.c b/modules/rostests/apitests/user32/ScrollDC.c index 33bae38899..4b3bee03e0 100644 --- a/modules/rostests/apitests/user32/ScrollDC.c +++ b/modules/rostests/apitests/user32/ScrollDC.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_ScrollDC() { @@ -75,4 +72,3 @@ START_TEST(ScrollDC) { Test_ScrollDC(); } - diff --git a/modules/rostests/apitests/user32/ScrollWindowEx.c b/modules/rostests/apitests/user32/ScrollWindowEx.c index 2c0ce9679e..4d403174aa 100644 --- a/modules/rostests/apitests/user32/ScrollWindowEx.c +++ b/modules/rostests/apitests/user32/ScrollWindowEx.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_ScrollWindowEx() { @@ -61,4 +58,3 @@ START_TEST(ScrollWindowEx) { Test_ScrollWindowEx(); } - diff --git a/modules/rostests/apitests/user32/SendMessageTimeout.c b/modules/rostests/apitests/user32/SendMessageTimeout.c index 90fcc31628..e633168732 100644 --- a/modules/rostests/apitests/user32/SendMessageTimeout.c +++ b/modules/rostests/apitests/user32/SendMessageTimeout.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <winuser.h> - -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" static DWORD dwThread1; static DWORD dwThread2; diff --git a/modules/rostests/apitests/user32/SetActiveWindow.c b/modules/rostests/apitests/user32/SetActiveWindow.c index 4ba07cfd86..110289b54b 100644 --- a/modules/rostests/apitests/user32/SetActiveWindow.c +++ b/modules/rostests/apitests/user32/SetActiveWindow.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> -#include <undocuser.h> - -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" HWND hWnd1, hWnd2; diff --git a/modules/rostests/apitests/user32/SetCursorPos.c b/modules/rostests/apitests/user32/SetCursorPos.c index 052e300e52..9ac6e2bfe0 100644 --- a/modules/rostests/apitests/user32/SetCursorPos.c +++ b/modules/rostests/apitests/user32/SetCursorPos.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> -#include <assert.h> +#include "precomp.h" HHOOK hMouseHookLL, hMouseHook; diff --git a/modules/rostests/apitests/user32/SetParent.c b/modules/rostests/apitests/user32/SetParent.c index 7ee1e406dd..79452cb46b 100644 --- a/modules/rostests/apitests/user32/SetParent.c +++ b/modules/rostests/apitests/user32/SetParent.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winuser.h> -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" static HWND hWndList[5 + 1]; static const int hWndCount = sizeof(hWndList) / sizeof(hWndList[0]) - 1; diff --git a/modules/rostests/apitests/user32/SetProp.c b/modules/rostests/apitests/user32/SetProp.c index de57337c23..3d656fd993 100644 --- a/modules/rostests/apitests/user32/SetProp.c +++ b/modules/rostests/apitests/user32/SetProp.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <winuser.h> -#include <user32testhelpers.h> +#include "precomp.h" static ATOM Atom1, Atom2, Atom3; diff --git a/modules/rostests/apitests/user32/SetScrollInfo.c b/modules/rostests/apitests/user32/SetScrollInfo.c index 59faad01fb..1d9d9f00c4 100644 --- a/modules/rostests/apitests/user32/SetScrollInfo.c +++ b/modules/rostests/apitests/user32/SetScrollInfo.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" START_TEST(SetScrollInfo) { diff --git a/modules/rostests/apitests/user32/SetScrollRange.c b/modules/rostests/apitests/user32/SetScrollRange.c index f73db6bf87..75c5479737 100644 --- a/modules/rostests/apitests/user32/SetScrollRange.c +++ b/modules/rostests/apitests/user32/SetScrollRange.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" START_TEST(SetScrollRange) { diff --git a/modules/rostests/apitests/user32/SystemParametersInfo.c b/modules/rostests/apitests/user32/SystemParametersInfo.c index 2b84508715..64330bc79b 100644 --- a/modules/rostests/apitests/user32/SystemParametersInfo.c +++ b/modules/rostests/apitests/user32/SystemParametersInfo.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> -#include <undocuser.h> - -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" HWND hWnd1, hWnd2; @@ -193,4 +186,4 @@ START_TEST(SystemParametersInfo) DestroyWindow(hWnd1); DestroyWindow(hWnd2); UnregisterClassW(L"sysparamstest", 0); -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/user32/TrackMouseEvent.c b/modules/rostests/apitests/user32/TrackMouseEvent.c index 7cc76467e5..6024489842 100644 --- a/modules/rostests/apitests/user32/TrackMouseEvent.c +++ b/modules/rostests/apitests/user32/TrackMouseEvent.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <apitest.h> -#include <wingdi.h> -#include <winuser.h> -#include <undocuser.h> - -#include <msgtrace.h> -#include <user32testhelpers.h> +#include "precomp.h" HWND hWnd1, hWnd2, hWnd3; HHOOK hMouseHookLL, hMouseHook; diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index bdcff2f8d5..185726f8cc 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -5,10 +5,7 @@ * PROGRAMMERS: */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" /* Used wine Redraw test for proof in principle. */ diff --git a/modules/rostests/apitests/user32/desktop.c b/modules/rostests/apitests/user32/desktop.c index e20450137e..f7bffe0721 100644 --- a/modules/rostests/apitests/user32/desktop.c +++ b/modules/rostests/apitests/user32/desktop.c @@ -6,17 +6,9 @@ * Thomas Faber */ -#define WIN32_NO_STATUS -#include <apitest.h> - -#include <stdio.h> -#include <wingdi.h> -#include <winuser.h> -#include <user32testhelpers.h> -#include <ndk/umtypes.h> -#include <ndk/obfuncs.h> +#include "precomp.h" -#define DESKTOP_ALL_ACCESS 0x01ff +#include <ndk/obfuncs.h> struct test_info { WCHAR* ExpectedWinsta; diff --git a/modules/rostests/apitests/user32/precomp.h b/modules/rostests/apitests/user32/precomp.h new file mode 100644 index 0000000000..8cb2810b59 --- /dev/null +++ b/modules/rostests/apitests/user32/precomp.h @@ -0,0 +1,18 @@ +#ifndef _USER32_APITEST_PRECOMP_H_ +#define _USER32_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#include <assert.h> +#include <stdio.h> +#include <apitest.h> +#include <wingdi.h> +#include <winuser.h> +#include <msgtrace.h> +#include <user32testhelpers.h> +#include <undocuser.h> + +#include "resource.h" + +#define DESKTOP_ALL_ACCESS 0x01ff + +#endif /* _USER32_APITEST_PRECOMP_H_ */

7 years

[reactos] 01/01: [NTDLL_APITEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=283bbe734669eb09c935f… commit 283bbe734669eb09c935f87e29fca8ab6cff30a0 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 2 21:05:46 2017 +0100 [NTDLL_APITEST] Add a PCH. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 5 +++-- modules/rostests/apitests/ntdll/LdrEnumResources.c | 5 +---- modules/rostests/apitests/ntdll/NtAcceptConnectPort.c | 6 +----- modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c | 6 +----- modules/rostests/apitests/ntdll/NtApphelpCacheControl.c | 7 ++----- modules/rostests/apitests/ntdll/NtContinue.c | 3 +-- modules/rostests/apitests/ntdll/NtCreateFile.c | 7 +------ modules/rostests/apitests/ntdll/NtCreateKey.c | 6 +----- modules/rostests/apitests/ntdll/NtCreateThread.c | 5 +---- modules/rostests/apitests/ntdll/NtDeleteKey.c | 9 +-------- modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c | 6 +----- modules/rostests/apitests/ntdll/NtLoadUnloadKey.c | 13 +------------ modules/rostests/apitests/ntdll/NtMapViewOfSection.c | 5 +---- modules/rostests/apitests/ntdll/NtMutant.c | 5 +---- modules/rostests/apitests/ntdll/NtOpenKey.c | 7 +------ modules/rostests/apitests/ntdll/NtOpenProcessToken.c | 6 +----- modules/rostests/apitests/ntdll/NtOpenThreadToken.c | 6 +----- modules/rostests/apitests/ntdll/NtProtectVirtualMemory.c | 6 +----- modules/rostests/apitests/ntdll/NtQueryInformationProcess.c | 7 +------ modules/rostests/apitests/ntdll/NtQueryKey.c | 8 +------- .../rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c | 7 +------ .../rostests/apitests/ntdll/NtQueryVolumeInformationFile.c | 5 +---- modules/rostests/apitests/ntdll/NtReadFile.c | 11 +---------- modules/rostests/apitests/ntdll/NtSaveKey.c | 8 +------- modules/rostests/apitests/ntdll/NtSetValueKey.c | 9 +-------- modules/rostests/apitests/ntdll/NtWriteFile.c | 11 +---------- modules/rostests/apitests/ntdll/RtlAllocateHeap.c | 5 +---- modules/rostests/apitests/ntdll/RtlBitmap.c | 6 +----- modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c | 5 +---- modules/rostests/apitests/ntdll/RtlDeleteAce.c | 4 +--- .../rostests/apitests/ntdll/RtlDetermineDosPathNameType.c | 6 +----- modules/rostests/apitests/ntdll/RtlDoesFileExists.c | 6 +----- .../ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c | 5 +---- .../rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c | 5 +---- modules/rostests/apitests/ntdll/RtlDosSearchPath_U.c | 6 +----- modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c | 5 +---- modules/rostests/apitests/ntdll/RtlFirstFreeAce.c | 4 +--- modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c | 6 +----- modules/rostests/apitests/ntdll/RtlGetFullPathName_U.c | 5 +---- modules/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c | 5 +---- modules/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c | 5 +---- .../ntdll/RtlGetLengthWithoutTrailingPathSeperators.c | 4 +--- modules/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c | 5 +---- modules/rostests/apitests/ntdll/RtlHandle.c | 6 +----- modules/rostests/apitests/ntdll/RtlImageRvaToVa.c | 4 +--- modules/rostests/apitests/ntdll/RtlInitializeBitMap.c | 5 +---- modules/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c | 5 +---- modules/rostests/apitests/ntdll/RtlMemoryStream.c | 5 ++--- .../rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c | 5 +---- modules/rostests/apitests/ntdll/RtlReAllocateHeap.c | 3 +-- .../rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c | 3 +-- .../ntdll/RtlUpcaseUnicodeStringToCountedOemString.c | 5 +---- modules/rostests/apitests/ntdll/RtlpEnsureBufferSize.c | 4 +--- modules/rostests/apitests/ntdll/StackOverflow.c | 6 +----- modules/rostests/apitests/ntdll/SystemInfo.c | 7 +------ modules/rostests/apitests/ntdll/Timer.c | 8 +------- modules/rostests/apitests/ntdll/precomp.h | 11 +++++++++++ 57 files changed, 71 insertions(+), 272 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 23da6c5570..42fc3fbdb8 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -55,16 +55,17 @@ list(APPEND SOURCE StackOverflow.c SystemInfo.c Timer.c - testlist.c) + precomp.h) if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) endif() -add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm}) +add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm} testlist.c) target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) +add_pch(ntdll_apitest precomp.h SOURCE) if(NOT MSVC) set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") diff --git a/modules/rostests/apitests/ntdll/LdrEnumResources.c b/modules/rostests/apitests/ntdll/LdrEnumResources.c index 84478c287e..7d63ecc90a 100644 --- a/modules/rostests/apitests/ntdll/LdrEnumResources.c +++ b/modules/rostests/apitests/ntdll/LdrEnumResources.c @@ -5,10 +5,7 @@ * PROGRAMMER: Timo Kreuzer */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/ldrfuncs.h> +#include "precomp.h" typedef struct _TEST_RESOURCES { diff --git a/modules/rostests/apitests/ntdll/NtAcceptConnectPort.c b/modules/rostests/apitests/ntdll/NtAcceptConnectPort.c index 38dd4d46e6..359f06382f 100644 --- a/modules/rostests/apitests/ntdll/NtAcceptConnectPort.c +++ b/modules/rostests/apitests/ntdll/NtAcceptConnectPort.c @@ -5,12 +5,8 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <ndk/lpcfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/rtlfuncs.h> #include <process.h> #define TEST_CONNECTION_INFO_SIGNATURE1 0xaabb0123 diff --git a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c index 748fc2610b..d1a73cc9a5 100644 --- a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/mmfuncs.h> +#include "precomp.h" static PVOID Allocations[4096] = { NULL }; static ULONG CurrentAllocation = 0; diff --git a/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c b/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c index aee392844a..ea9cb2920c 100644 --- a/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c +++ b/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c @@ -5,12 +5,9 @@ * PROGRAMMER: Mark Jansen */ -#include <apitest.h> +#include "precomp.h" -#include <windows.h> - -#define WIN32_NO_STATUS -#include <ntndk.h> +#include <winsvc.h> enum ServiceCommands { diff --git a/modules/rostests/apitests/ntdll/NtContinue.c b/modules/rostests/apitests/ntdll/NtContinue.c index 1f619f1ffa..e2b254beda 100644 --- a/modules/rostests/apitests/ntdll/NtContinue.c +++ b/modules/rostests/apitests/ntdll/NtContinue.c @@ -5,8 +5,7 @@ * PROGRAMMER: */ -#include <apitest.h> -#include <ndk/kefuncs.h> +#include "precomp.h" #include <setjmp.h> #include <time.h> diff --git a/modules/rostests/apitests/ntdll/NtCreateFile.c b/modules/rostests/apitests/ntdll/NtCreateFile.c index a0f256d424..147028dd4e 100644 --- a/modules/rostests/apitests/ntdll/NtCreateFile.c +++ b/modules/rostests/apitests/ntdll/NtCreateFile.c @@ -5,12 +5,7 @@ * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#define WIN32_NO_STATUS -#include <wine/test.h> -//#include <ndk/iotypes.h> -#include <ndk/iofuncs.h> -//#include <ndk/obtypes.h> -//#include <ndk/obfuncs.h> +#include "precomp.h" START_TEST(NtCreateFile) { diff --git a/modules/rostests/apitests/ntdll/NtCreateKey.c b/modules/rostests/apitests/ntdll/NtCreateKey.c index a8ead335df..98fc236643 100644 --- a/modules/rostests/apitests/ntdll/NtCreateKey.c +++ b/modules/rostests/apitests/ntdll/NtCreateKey.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winreg.h> -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/ntdll/NtCreateThread.c b/modules/rostests/apitests/ntdll/NtCreateThread.c index dcb1921572..b31fc1fb79 100644 --- a/modules/rostests/apitests/ntdll/NtCreateThread.c +++ b/modules/rostests/apitests/ntdll/NtCreateThread.c @@ -5,10 +5,7 @@ * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#define WIN32_NO_STATUS -#include <wine/test.h> -#include <ndk/pstypes.h> -#include <ndk/psfuncs.h> +#include "precomp.h" START_TEST(NtCreateThread) { diff --git a/modules/rostests/apitests/ntdll/NtDeleteKey.c b/modules/rostests/apitests/ntdll/NtDeleteKey.c index fc49cf37fe..57774a7445 100644 --- a/modules/rostests/apitests/ntdll/NtDeleteKey.c +++ b/modules/rostests/apitests/ntdll/NtDeleteKey.c @@ -4,14 +4,7 @@ * PURPOSE: Test for NtDeleteKey */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtlfuncs.h> -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/setypes.h> +#include "precomp.h" static NTSTATUS diff --git a/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c b/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c index d5cf23b349..7a0b4bc99c 100644 --- a/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c @@ -1,9 +1,5 @@ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/pstypes.h> -#include <ndk/mmfuncs.h> +#include "precomp.h" static void Test_NtFreeVirtualMemory(void) { diff --git a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c index b8339af8e5..bc4f4b967a 100644 --- a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c +++ b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c @@ -5,18 +5,7 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#include <stdio.h> - -#include <apitest.h> -#include <strsafe.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/cmfuncs.h> -#include <ndk/cmtypes.h> -#include <ndk/iofuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/setypes.h> +#include "precomp.h" /* See xdk/cmtypes.h */ #define REG_CREATED_NEW_KEY 1 diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index ad93b1fcb8..000c4a2738 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -6,10 +6,7 @@ * Thomas Faber */ -#include <apitest.h> -#include <strsafe.h> -#define WIN32_NO_STATUS -#include <ndk/ntndk.h> +#include "precomp.h" void Test_PageFileSection(void) diff --git a/modules/rostests/apitests/ntdll/NtMutant.c b/modules/rostests/apitests/ntdll/NtMutant.c index a274bb44b7..d80f1e5804 100644 --- a/modules/rostests/apitests/ntdll/NtMutant.c +++ b/modules/rostests/apitests/ntdll/NtMutant.c @@ -1,8 +1,5 @@ -#include <apitest.h> - -#include <ndk/exfuncs.h> - +#include "precomp.h" VOID Test_Release(VOID) diff --git a/modules/rostests/apitests/ntdll/NtOpenKey.c b/modules/rostests/apitests/ntdll/NtOpenKey.c index e5520fb07d..e30ee395c6 100644 --- a/modules/rostests/apitests/ntdll/NtOpenKey.c +++ b/modules/rostests/apitests/ntdll/NtOpenKey.c @@ -5,15 +5,10 @@ * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) */ -#include <apitest.h> - -#include <ntndk.h> - +#include "precomp.h" #define TEST_STR L"\\Registry\\Machine\\SOFTWARE" - - START_TEST(NtOpenKey) { OBJECT_ATTRIBUTES Object; diff --git a/modules/rostests/apitests/ntdll/NtOpenProcessToken.c b/modules/rostests/apitests/ntdll/NtOpenProcessToken.c index 009f8903df..93acea876b 100644 --- a/modules/rostests/apitests/ntdll/NtOpenProcessToken.c +++ b/modules/rostests/apitests/ntdll/NtOpenProcessToken.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/sefuncs.h> +#include "precomp.h" START_TEST(NtOpenProcessToken) { diff --git a/modules/rostests/apitests/ntdll/NtOpenThreadToken.c b/modules/rostests/apitests/ntdll/NtOpenThreadToken.c index 6ad67bb9a6..66769e3722 100644 --- a/modules/rostests/apitests/ntdll/NtOpenThreadToken.c +++ b/modules/rostests/apitests/ntdll/NtOpenThreadToken.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" START_TEST(NtOpenThreadToken) { diff --git a/modules/rostests/apitests/ntdll/NtProtectVirtualMemory.c b/modules/rostests/apitests/ntdll/NtProtectVirtualMemory.c index 60ef9a01bc..0d30b0a875 100644 --- a/modules/rostests/apitests/ntdll/NtProtectVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtProtectVirtualMemory.c @@ -6,11 +6,7 @@ * Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/mmfuncs.h> +#include "precomp.h" static void diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c index 66798a3ae6..ec6c56d170 100644 --- a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c @@ -5,12 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/psfuncs.h> +#include "precomp.h" static LARGE_INTEGER TestStartTime; diff --git a/modules/rostests/apitests/ntdll/NtQueryKey.c b/modules/rostests/apitests/ntdll/NtQueryKey.c index b254363d95..01ecd7bd76 100644 --- a/modules/rostests/apitests/ntdll/NtQueryKey.c +++ b/modules/rostests/apitests/ntdll/NtQueryKey.c @@ -6,13 +6,7 @@ * Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/cmfuncs.h> -#include <ndk/cmtypes.h> -#include <ndk/obfuncs.h> +#include "precomp.h" static void diff --git a/modules/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c b/modules/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c index a554a3eb09..e01cba4105 100644 --- a/modules/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c +++ b/modules/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c @@ -5,12 +5,7 @@ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/setypes.h> -#include <ndk/rtlfuncs.h> -#include <ndk/exfuncs.h> +#include "precomp.h" // Arbitrary-defined constants #define MIN_BUFFER_LENGTH 4L diff --git a/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c b/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c index de6edcadd6..b361d26681 100644 --- a/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c +++ b/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c @@ -5,10 +5,7 @@ * PROGRAMMER: Víctor Martínez Calvo <vicmarcal(a)gmail.com> */ -#define WIN32_NO_STATUS -#include <stdio.h> -#include <wine/test.h> -#include <ndk/ntndk.h> +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/ntdll/NtReadFile.c b/modules/rostests/apitests/ntdll/NtReadFile.c index 0d6ceaea9e..6ec6b23b80 100644 --- a/modules/rostests/apitests/ntdll/NtReadFile.c +++ b/modules/rostests/apitests/ntdll/NtReadFile.c @@ -5,16 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> -#include <ndk/cmfuncs.h> -#include <ndk/iofuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static BOOL diff --git a/modules/rostests/apitests/ntdll/NtSaveKey.c b/modules/rostests/apitests/ntdll/NtSaveKey.c index cea4225142..273e2c14b9 100644 --- a/modules/rostests/apitests/ntdll/NtSaveKey.c +++ b/modules/rostests/apitests/ntdll/NtSaveKey.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/setypes.h> +#include "precomp.h" static NTSTATUS diff --git a/modules/rostests/apitests/ntdll/NtSetValueKey.c b/modules/rostests/apitests/ntdll/NtSetValueKey.c index 6da3c9ea54..7a77839a19 100644 --- a/modules/rostests/apitests/ntdll/NtSetValueKey.c +++ b/modules/rostests/apitests/ntdll/NtSetValueKey.c @@ -5,14 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winreg.h> -#define WIN32_NO_STATUS -#include <ndk/cmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/rtlfuncs.h> -#include <strsafe.h> +#include "precomp.h" START_TEST(NtSetValueKey) { diff --git a/modules/rostests/apitests/ntdll/NtWriteFile.c b/modules/rostests/apitests/ntdll/NtWriteFile.c index c6f13c7b39..f9f1e70236 100644 --- a/modules/rostests/apitests/ntdll/NtWriteFile.c +++ b/modules/rostests/apitests/ntdll/NtWriteFile.c @@ -5,16 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> -#include <ndk/cmfuncs.h> -#include <ndk/iofuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static BOOL diff --git a/modules/rostests/apitests/ntdll/RtlAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlAllocateHeap.c index 829983cd39..77e72f3370 100644 --- a/modules/rostests/apitests/ntdll/RtlAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlAllocateHeap.c @@ -5,10 +5,7 @@ * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" PVOID Buffers[0x100]; diff --git a/modules/rostests/apitests/ntdll/RtlBitmap.c b/modules/rostests/apitests/ntdll/RtlBitmap.c index 99ff3a9806..82a2eff3ac 100644 --- a/modules/rostests/apitests/ntdll/RtlBitmap.c +++ b/modules/rostests/apitests/ntdll/RtlBitmap.c @@ -1,9 +1,5 @@ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static PVOID diff --git a/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c b/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c index 5a8f3be13e..d6c3149096 100644 --- a/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c +++ b/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" START_TEST(RtlCopyMappedMemory) { diff --git a/modules/rostests/apitests/ntdll/RtlDeleteAce.c b/modules/rostests/apitests/ntdll/RtlDeleteAce.c index fbf4313680..4c4aaf58cd 100644 --- a/modules/rostests/apitests/ntdll/RtlDeleteAce.c +++ b/modules/rostests/apitests/ntdll/RtlDeleteAce.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static PVOID diff --git a/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c b/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c index 7edc7d12f9..3f99a38a9b 100644 --- a/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c +++ b/modules/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* ULONG diff --git a/modules/rostests/apitests/ntdll/RtlDoesFileExists.c b/modules/rostests/apitests/ntdll/RtlDoesFileExists.c index 155e8da870..d113ccbea2 100644 --- a/modules/rostests/apitests/ntdll/RtlDoesFileExists.c +++ b/modules/rostests/apitests/ntdll/RtlDoesFileExists.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" #define ok_bool_file(value, expected, file) do { \ if (expected) \ diff --git a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c index 9a77f04296..9b9f15955b 100644 --- a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c @@ -5,10 +5,7 @@ * PROGRAMMER: Giannis Adamopoulos */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" #define ok_eq_hex(value, expected) ok((value) == (expected), #value " = 0x%lx, expected 0x%lx\n", value, expected) #define ok_eq_pointer(value, expected) ok((value) == (expected), #value " = %p, expected %p\n", value, expected) diff --git a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c index 63dbcf2a37..3b0dcb24c1 100644 --- a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c +++ b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c @@ -39,10 +39,7 @@ # include <stdio.h> # include <stddef.h> #else /* Compile for ReactOS or wine */ -# include <apitest.h> -# define WIN32_NO_STATUS -# include <stdio.h> -# include <ndk/rtlfuncs.h> +# include "precomp.h" #endif /* diff --git a/modules/rostests/apitests/ntdll/RtlDosSearchPath_U.c b/modules/rostests/apitests/ntdll/RtlDosSearchPath_U.c index d785ac1a35..7261877699 100644 --- a/modules/rostests/apitests/ntdll/RtlDosSearchPath_U.c +++ b/modules/rostests/apitests/ntdll/RtlDosSearchPath_U.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* ULONG diff --git a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c index df66d13db9..6a4de4ee8f 100644 --- a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* NTSTATUS diff --git a/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c b/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c index ebe12e06d0..0022945e41 100644 --- a/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c +++ b/modules/rostests/apitests/ntdll/RtlFirstFreeAce.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static PVOID diff --git a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c index f13ebb75f9..0c1da43bc9 100644 --- a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c +++ b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c @@ -5,11 +5,7 @@ * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <stdio.h> +#include "precomp.h" NTSYSAPI VOID diff --git a/modules/rostests/apitests/ntdll/RtlGetFullPathName_U.c b/modules/rostests/apitests/ntdll/RtlGetFullPathName_U.c index f6f8e305a3..fd8c8d8403 100644 --- a/modules/rostests/apitests/ntdll/RtlGetFullPathName_U.c +++ b/modules/rostests/apitests/ntdll/RtlGetFullPathName_U.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* ULONG diff --git a/modules/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c b/modules/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c index bb3f4351de..72b7423b88 100644 --- a/modules/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* ULONG diff --git a/modules/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c b/modules/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c index 41d0850838..b96d7485ac 100644 --- a/modules/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c +++ b/modules/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* NTSTATUS diff --git a/modules/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c b/modules/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c index f336c940f7..189ccdb90a 100644 --- a/modules/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c +++ b/modules/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c @@ -5,9 +5,7 @@ * PROGRAMMER: David Quintana <gigaherz(a)gmail.com> */ -#define WIN32_NO_STATUS -#include <apitest.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" #define MakeTestEntry_Success(str, expect) \ { str, expect, STATUS_SUCCESS, __LINE__ } diff --git a/modules/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c b/modules/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c index d80f1c8fa4..3f6b81f7e1 100644 --- a/modules/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c +++ b/modules/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" /* ULONG diff --git a/modules/rostests/apitests/ntdll/RtlHandle.c b/modules/rostests/apitests/ntdll/RtlHandle.c index 74b4cef335..2e598fd9d9 100644 --- a/modules/rostests/apitests/ntdll/RtlHandle.c +++ b/modules/rostests/apitests/ntdll/RtlHandle.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <stdio.h> +#include "precomp.h" typedef struct _TEST_HANDLE_ENTRY { diff --git a/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c b/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c index 2671f86b46..9d15c58e71 100644 --- a/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c +++ b/modules/rostests/apitests/ntdll/RtlImageRvaToVa.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <ndk/mmfuncs.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static PVOID diff --git a/modules/rostests/apitests/ntdll/RtlInitializeBitMap.c b/modules/rostests/apitests/ntdll/RtlInitializeBitMap.c index 2e2ab49c19..6dc1e193a0 100644 --- a/modules/rostests/apitests/ntdll/RtlInitializeBitMap.c +++ b/modules/rostests/apitests/ntdll/RtlInitializeBitMap.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" void Test_RtlInitializeBitmap() { diff --git a/modules/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c b/modules/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c index 40a52c32e5..ab7f51bb82 100644 --- a/modules/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c +++ b/modules/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" START_TEST(RtlIsNameLegalDOS8Dot3) { diff --git a/modules/rostests/apitests/ntdll/RtlMemoryStream.c b/modules/rostests/apitests/ntdll/RtlMemoryStream.c index 5df223052c..0cde75edb4 100644 --- a/modules/rostests/apitests/ntdll/RtlMemoryStream.c +++ b/modules/rostests/apitests/ntdll/RtlMemoryStream.c @@ -5,10 +5,9 @@ * PROGRAMMER: David Quintana <gigaherz(a)gmail.com> */ -#define COBJMACROS +#include "precomp.h" -#include <apitest.h> -#include <ndk/rtlfuncs.h> +#define COBJMACROS #include <ole2.h> #include <wtypes.h> diff --git a/modules/rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c b/modules/rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c index 7cf99f5ea3..311dfd8d53 100644 --- a/modules/rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c +++ b/modules/rostests/apitests/ntdll/RtlNtPathNameToDosPathName.c @@ -5,10 +5,7 @@ * PROGRAMMER: Mark Jansen */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" NTSTATUS (NTAPI *pRtlNtPathNameToDosPathName)(ULONG Flags, PRTL_UNICODE_STRING_BUFFER Path, PULONG Type, PULONG Unknown4); diff --git a/modules/rostests/apitests/ntdll/RtlReAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlReAllocateHeap.c index 23225cc0a4..311b01b791 100644 --- a/modules/rostests/apitests/ntdll/RtlReAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlReAllocateHeap.c @@ -5,8 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static BOOLEAN diff --git a/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c b/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c index a517299568..3ed5dd6d40 100644 --- a/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c +++ b/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c @@ -5,8 +5,7 @@ * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" START_TEST(RtlUnicodeStringToAnsiString) { diff --git a/modules/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c b/modules/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c index 0febe21d8e..645449bae6 100644 --- a/modules/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c +++ b/modules/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> +#include "precomp.h" START_TEST(RtlUpcaseUnicodeStringToCountedOemString) { diff --git a/modules/rostests/apitests/ntdll/RtlpEnsureBufferSize.c b/modules/rostests/apitests/ntdll/RtlpEnsureBufferSize.c index 116ada95e4..79bf5ddfb9 100644 --- a/modules/rostests/apitests/ntdll/RtlpEnsureBufferSize.c +++ b/modules/rostests/apitests/ntdll/RtlpEnsureBufferSize.c @@ -5,10 +5,8 @@ * PROGRAMMER: Mark Jansen */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> #include <tlhelp32.h> diff --git a/modules/rostests/apitests/ntdll/StackOverflow.c b/modules/rostests/apitests/ntdll/StackOverflow.c index 9cd710753b..794e2fe0ff 100644 --- a/modules/rostests/apitests/ntdll/StackOverflow.c +++ b/modules/rostests/apitests/ntdll/StackOverflow.c @@ -5,11 +5,7 @@ * PROGRAMMER: Jérôme Gardou */ -#define WIN32_NO_STATUS -#include <apitest.h> -#include <stdio.h> -#include <ndk/rtlfuncs.h> -#include <ndk/mmfuncs.h> +#include "precomp.h" static int iteration = 0; static PVOID StackAllocationBase; diff --git a/modules/rostests/apitests/ntdll/SystemInfo.c b/modules/rostests/apitests/ntdll/SystemInfo.c index 7ba1158f98..0d9613d115 100644 --- a/modules/rostests/apitests/ntdll/SystemInfo.c +++ b/modules/rostests/apitests/ntdll/SystemInfo.c @@ -6,12 +6,7 @@ * Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/exfuncs.h> -#include <ndk/rtlfuncs.h> -#include <ndk/setypes.h> +#include "precomp.h" #define ntv6(x) (LOBYTE(LOWORD(GetVersion())) >= 6 ? (x) : 0) diff --git a/modules/rostests/apitests/ntdll/Timer.c b/modules/rostests/apitests/ntdll/Timer.c index 0152c44b8c..23fe697a76 100644 --- a/modules/rostests/apitests/ntdll/Timer.c +++ b/modules/rostests/apitests/ntdll/Timer.c @@ -5,13 +5,7 @@ * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <ndk/ketypes.h> -#include <ndk/kefuncs.h> - -#include <stdio.h> +#include "precomp.h" START_TEST(TimerResolution) { diff --git a/modules/rostests/apitests/ntdll/precomp.h b/modules/rostests/apitests/ntdll/precomp.h new file mode 100644 index 0000000000..1552223a0b --- /dev/null +++ b/modules/rostests/apitests/ntdll/precomp.h @@ -0,0 +1,11 @@ +#ifndef _NTDLL_APITEST_PRECOMP_H_ +#define _NTDLL_APITEST_PRECOMP_H_ + +#include <stdio.h> +#include <apitest.h> +#define WIN32_NO_STATUS +#include <ndk/ntndk.h> +#include <winreg.h> +#include <strsafe.h> + +#endif /* _NTDLL_APITEST_PRECOMP_H_ */

7 years

[reactos] 01/01: [GDI32_APITEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aee83c359c6ff976005d2… commit aee83c359c6ff976005d2443b7e07b465f1d06c2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 2 21:00:06 2017 +0100 [GDI32_APITEST] Add a PCH. --- .../rostests/apitests/gdi32/AddFontMemResourceEx.c | 5 +---- modules/rostests/apitests/gdi32/AddFontResource.c | 4 +--- .../rostests/apitests/gdi32/AddFontResourceEx.c | 4 +--- modules/rostests/apitests/gdi32/BeginPath.c | 4 +--- modules/rostests/apitests/gdi32/CMakeLists.txt | 5 +++-- modules/rostests/apitests/gdi32/CombineRgn.c | 3 +-- modules/rostests/apitests/gdi32/CombineTransform.c | 5 +---- modules/rostests/apitests/gdi32/CreateBitmap.c | 6 +----- .../rostests/apitests/gdi32/CreateBitmapIndirect.c | 4 +--- .../rostests/apitests/gdi32/CreateCompatibleDC.c | 5 +---- .../apitests/gdi32/CreateDIBPatternBrush.c | 3 +-- modules/rostests/apitests/gdi32/CreateDIBitmap.c | 5 +---- modules/rostests/apitests/gdi32/CreateFont.c | 4 +--- .../rostests/apitests/gdi32/CreateFontIndirect.c | 3 +-- .../rostests/apitests/gdi32/CreateIconIndirect.c | 8 +------ modules/rostests/apitests/gdi32/CreatePen.c | 7 +----- modules/rostests/apitests/gdi32/CreateRectRgn.c | 3 +-- modules/rostests/apitests/gdi32/DPtoLP.c | 5 +---- .../rostests/apitests/gdi32/EngAcquireSemaphore.c | 5 +---- .../rostests/apitests/gdi32/EngCreateSemaphore.c | 5 +---- .../rostests/apitests/gdi32/EngDeleteSemaphore.c | 5 +---- .../rostests/apitests/gdi32/EngReleaseSemaphore.c | 5 +---- modules/rostests/apitests/gdi32/EnumFontFamilies.c | 7 +----- modules/rostests/apitests/gdi32/ExcludeClipRect.c | 13 +---------- modules/rostests/apitests/gdi32/ExtCreatePen.c | 8 +------ modules/rostests/apitests/gdi32/ExtCreateRegion.c | 3 +-- modules/rostests/apitests/gdi32/FrameRgn.c | 5 ++--- modules/rostests/apitests/gdi32/GdiConvertBitmap.c | 4 +--- modules/rostests/apitests/gdi32/GdiConvertBrush.c | 4 +--- modules/rostests/apitests/gdi32/GdiConvertDC.c | 4 +--- modules/rostests/apitests/gdi32/GdiConvertFont.c | 4 +--- .../rostests/apitests/gdi32/GdiConvertPalette.c | 4 +--- modules/rostests/apitests/gdi32/GdiConvertRegion.c | 4 +--- modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c | 4 +--- .../rostests/apitests/gdi32/GdiGetCharDimensions.c | 4 +--- modules/rostests/apitests/gdi32/GdiGetLocalBrush.c | 4 +--- modules/rostests/apitests/gdi32/GdiGetLocalDC.c | 4 +--- .../rostests/apitests/gdi32/GdiReleaseLocalDC.c | 4 +--- modules/rostests/apitests/gdi32/GdiSetAttrs.c | 4 +--- modules/rostests/apitests/gdi32/GetClipBox.c | 11 +--------- modules/rostests/apitests/gdi32/GetClipRgn.c | 5 +---- modules/rostests/apitests/gdi32/GetCurrentObject.c | 8 +------ modules/rostests/apitests/gdi32/GetDIBColorTable.c | 4 +--- modules/rostests/apitests/gdi32/GetDIBits.c | 5 +---- .../rostests/apitests/gdi32/GetFontResourceInfoW.c | 7 ++---- modules/rostests/apitests/gdi32/GetGlyphIndices.c | 6 +----- modules/rostests/apitests/gdi32/GetObject.c | 8 +------ modules/rostests/apitests/gdi32/GetPixel.c | 4 +--- modules/rostests/apitests/gdi32/GetRandomRgn.c | 7 +----- modules/rostests/apitests/gdi32/GetStockObject.c | 10 +-------- .../rostests/apitests/gdi32/GetTextExtentExPoint.c | 9 +------- modules/rostests/apitests/gdi32/GetTextFace.c | 7 +----- modules/rostests/apitests/gdi32/MaskBlt.c | 4 +--- .../rostests/apitests/gdi32/NtGdiAddFontResource.c | 6 ++---- modules/rostests/apitests/gdi32/OffsetClipRgn.c | 5 +---- modules/rostests/apitests/gdi32/OffsetRgn.c | 5 +---- modules/rostests/apitests/gdi32/PaintRgn.c | 6 ++---- modules/rostests/apitests/gdi32/PatBlt.c | 5 +---- modules/rostests/apitests/gdi32/RealizePalette.c | 6 ++---- modules/rostests/apitests/gdi32/Rectangle.c | 4 +--- modules/rostests/apitests/gdi32/SelectObject.c | 12 +---------- modules/rostests/apitests/gdi32/SetBoundsRect.c | 4 +--- modules/rostests/apitests/gdi32/SetBrushOrgEx.c | 4 +--- modules/rostests/apitests/gdi32/SetDCPenColor.c | 5 +---- modules/rostests/apitests/gdi32/SetDIBits.c | 4 +--- .../rostests/apitests/gdi32/SetDIBitsToDevice.c | 3 +-- modules/rostests/apitests/gdi32/SetMapMode.c | 8 +------ modules/rostests/apitests/gdi32/SetPixel.c | 3 +-- modules/rostests/apitests/gdi32/SetSysColors.c | 7 +----- modules/rostests/apitests/gdi32/SetWindowExtEx.c | 8 +------ .../rostests/apitests/gdi32/SetWorldTransform.c | 5 +---- modules/rostests/apitests/gdi32/init.c | 5 ++--- modules/rostests/apitests/gdi32/init.h | 1 + modules/rostests/apitests/gdi32/precomp.h | 25 ++++++++++++++++++++++ 74 files changed, 106 insertions(+), 307 deletions(-) diff --git a/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c b/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c index 057a6b495a..e8b71864cf 100644 --- a/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c +++ b/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c @@ -9,10 +9,7 @@ * Captured from firefox, embedded on reactos.org */ - -#include <apitest.h> -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" typedef struct _fnt_res { diff --git a/modules/rostests/apitests/gdi32/AddFontResource.c b/modules/rostests/apitests/gdi32/AddFontResource.c index e020dfc4db..cee4079d97 100644 --- a/modules/rostests/apitests/gdi32/AddFontResource.c +++ b/modules/rostests/apitests/gdi32/AddFontResource.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <stdio.h> -#include <apitest.h> -#include <wingdi.h> +#include "precomp.h" #define COUNT 26 diff --git a/modules/rostests/apitests/gdi32/AddFontResourceEx.c b/modules/rostests/apitests/gdi32/AddFontResourceEx.c index 0cae71abd1..9448a6ff1c 100644 --- a/modules/rostests/apitests/gdi32/AddFontResourceEx.c +++ b/modules/rostests/apitests/gdi32/AddFontResourceEx.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_AddFontResourceExW() { diff --git a/modules/rostests/apitests/gdi32/BeginPath.c b/modules/rostests/apitests/gdi32/BeginPath.c index db4761dfe2..176a0c4f17 100644 --- a/modules/rostests/apitests/gdi32/BeginPath.c +++ b/modules/rostests/apitests/gdi32/BeginPath.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_BeginPath() { diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index e1edb91c26..3dfe1c3474 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -73,10 +73,11 @@ list(APPEND SOURCE SetWindowExtEx.c SetWorldTransform.c init.c - testlist.c) + precomp.h) -add_executable(gdi32_apitest ${SOURCE} resource.rc) +add_executable(gdi32_apitest ${SOURCE} testlist.c resource.rc) target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_pch(gdi32_apitest precomp.h SOURCE) add_rostests_file(TARGET gdi32_apitest) diff --git a/modules/rostests/apitests/gdi32/CombineRgn.c b/modules/rostests/apitests/gdi32/CombineRgn.c index 3e10ec3f63..b000a49554 100644 --- a/modules/rostests/apitests/gdi32/CombineRgn.c +++ b/modules/rostests/apitests/gdi32/CombineRgn.c @@ -5,8 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> -#include <windows.h> +#include "precomp.h" typedef struct _RECT_TEST { diff --git a/modules/rostests/apitests/gdi32/CombineTransform.c b/modules/rostests/apitests/gdi32/CombineTransform.c index 679d34c74b..8989133a36 100644 --- a/modules/rostests/apitests/gdi32/CombineTransform.c +++ b/modules/rostests/apitests/gdi32/CombineTransform.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> +#include "precomp.h" typedef union { diff --git a/modules/rostests/apitests/gdi32/CreateBitmap.c b/modules/rostests/apitests/gdi32/CreateBitmap.c index 9c8a1b0dd1..4cf719feaf 100644 --- a/modules/rostests/apitests/gdi32/CreateBitmap.c +++ b/modules/rostests/apitests/gdi32/CreateBitmap.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> - -#define DEFAULT_BITMAP 21 +#include "precomp.h" void Test_CreateBitmap_Params() { diff --git a/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c b/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c index fb448d9902..e9050f95b2 100644 --- a/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c +++ b/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_CreateBitmapIndirect() { diff --git a/modules/rostests/apitests/gdi32/CreateCompatibleDC.c b/modules/rostests/apitests/gdi32/CreateCompatibleDC.c index 3d7c7dc6c2..6be042aabf 100644 --- a/modules/rostests/apitests/gdi32/CreateCompatibleDC.c +++ b/modules/rostests/apitests/gdi32/CreateCompatibleDC.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_CreateCompatibleDC() { diff --git a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c index b1cf27d2f3..6ac5da0b3d 100644 --- a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c +++ b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <wingdi.h> #include "init.h" /* New color use parameter. See support.microsoft.com/kb/kbview/108497 */ diff --git a/modules/rostests/apitests/gdi32/CreateDIBitmap.c b/modules/rostests/apitests/gdi32/CreateDIBitmap.c index cfc88f9755..1e302618d5 100644 --- a/modules/rostests/apitests/gdi32/CreateDIBitmap.c +++ b/modules/rostests/apitests/gdi32/CreateDIBitmap.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" #include "init.h" diff --git a/modules/rostests/apitests/gdi32/CreateFont.c b/modules/rostests/apitests/gdi32/CreateFont.c index e4a378de4e..cc251863f2 100644 --- a/modules/rostests/apitests/gdi32/CreateFont.c +++ b/modules/rostests/apitests/gdi32/CreateFont.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" #define INVALIDFONT "ThisFontDoesNotExist" diff --git a/modules/rostests/apitests/gdi32/CreateFontIndirect.c b/modules/rostests/apitests/gdi32/CreateFontIndirect.c index 477952d987..4940957887 100644 --- a/modules/rostests/apitests/gdi32/CreateFontIndirect.c +++ b/modules/rostests/apitests/gdi32/CreateFontIndirect.c @@ -6,8 +6,7 @@ * Katayama Hirofumi MZ */ -#include <apitest.h> -#include <wingdi.h> +#include "precomp.h" #define trace_if(val, msg) do { if (!(val)) trace(msg); } while (0) diff --git a/modules/rostests/apitests/gdi32/CreateIconIndirect.c b/modules/rostests/apitests/gdi32/CreateIconIndirect.c index bfd78e2add..8c1bf3639b 100644 --- a/modules/rostests/apitests/gdi32/CreateIconIndirect.c +++ b/modules/rostests/apitests/gdi32/CreateIconIndirect.c @@ -1,9 +1,5 @@ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - +#include "precomp.h" // FIXME user32 @@ -204,5 +200,3 @@ START_TEST(CreateIconIndirect) ok(iconinfo2.hbmColor == NULL, "\n"); } - - diff --git a/modules/rostests/apitests/gdi32/CreatePen.c b/modules/rostests/apitests/gdi32/CreatePen.c index ad03b3b804..90e6d09060 100644 --- a/modules/rostests/apitests/gdi32/CreatePen.c +++ b/modules/rostests/apitests/gdi32/CreatePen.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> +#include "precomp.h" void Test_CreatePen() { diff --git a/modules/rostests/apitests/gdi32/CreateRectRgn.c b/modules/rostests/apitests/gdi32/CreateRectRgn.c index e5904696f3..5c799b728f 100644 --- a/modules/rostests/apitests/gdi32/CreateRectRgn.c +++ b/modules/rostests/apitests/gdi32/CreateRectRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" void Test_CreateRectRgn() { @@ -16,4 +16,3 @@ START_TEST(CreateRectRgn) { Test_CreateRectRgn(); } - diff --git a/modules/rostests/apitests/gdi32/DPtoLP.c b/modules/rostests/apitests/gdi32/DPtoLP.c index 940e7a7e5e..dd2a6f9900 100644 --- a/modules/rostests/apitests/gdi32/DPtoLP.c +++ b/modules/rostests/apitests/gdi32/DPtoLP.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_DPtoLP_Params() { diff --git a/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c b/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c index 94014546a1..be0f9d17e0 100644 --- a/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c +++ b/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> +#include "precomp.h" void Test_EngAcquireSemaphore() { diff --git a/modules/rostests/apitests/gdi32/EngCreateSemaphore.c b/modules/rostests/apitests/gdi32/EngCreateSemaphore.c index eb6ccec67a..0bd25a1d0c 100644 --- a/modules/rostests/apitests/gdi32/EngCreateSemaphore.c +++ b/modules/rostests/apitests/gdi32/EngCreateSemaphore.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> +#include "precomp.h" void Test_EngCreateSemaphore() { diff --git a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c b/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c index f129fb94c7..d8c1218e3e 100644 --- a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c +++ b/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> +#include "precomp.h" void Test_EngDeleteSemaphore() { diff --git a/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c b/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c index c6d20bb89e..be843f5164 100644 --- a/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c +++ b/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Magnus Olsen */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> +#include "precomp.h" void Test_EngReleaseSemaphore() { diff --git a/modules/rostests/apitests/gdi32/EnumFontFamilies.c b/modules/rostests/apitests/gdi32/EnumFontFamilies.c index 51d7f86c5a..b9ae7f3c10 100644 --- a/modules/rostests/apitests/gdi32/EnumFontFamilies.c +++ b/modules/rostests/apitests/gdi32/EnumFontFamilies.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winnls.h> -#include <wingdi.h> -#include <winddi.h> -#include <strsafe.h> +#include "precomp.h" static BYTE ContextContinue; static BYTE ContextStop; diff --git a/modules/rostests/apitests/gdi32/ExcludeClipRect.c b/modules/rostests/apitests/gdi32/ExcludeClipRect.c index af27cd6b7b..ee4e74b7af 100644 --- a/modules/rostests/apitests/gdi32/ExcludeClipRect.c +++ b/modules/rostests/apitests/gdi32/ExcludeClipRect.c @@ -5,18 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#define CLIPRGN 1 - -#define ok_rect(_prc, _left, _top, _right, _bottom) \ - ok_int((_prc)->left, _left); \ - ok_int((_prc)->top, _top); \ - ok_int((_prc)->right, _right); \ - ok_int((_prc)->bottom, _bottom); \ +#include "precomp.h" void Test_ExcludeClipRect() { diff --git a/modules/rostests/apitests/gdi32/ExtCreatePen.c b/modules/rostests/apitests/gdi32/ExtCreatePen.c index 5901194faa..c8370bd5cb 100644 --- a/modules/rostests/apitests/gdi32/ExtCreatePen.c +++ b/modules/rostests/apitests/gdi32/ExtCreatePen.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> -#include <stdio.h> +#include "precomp.h" #define ok_lasterror(err) \ ok(GetLastError() == err, "expected last error " #err " but got 0x%lx\n", GetLastError()); diff --git a/modules/rostests/apitests/gdi32/ExtCreateRegion.c b/modules/rostests/apitests/gdi32/ExtCreateRegion.c index eea2323e11..16fe55f143 100644 --- a/modules/rostests/apitests/gdi32/ExtCreateRegion.c +++ b/modules/rostests/apitests/gdi32/ExtCreateRegion.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <windows.h> #include <math.h> VOID diff --git a/modules/rostests/apitests/gdi32/FrameRgn.c b/modules/rostests/apitests/gdi32/FrameRgn.c index 2187acfa1a..547d4947e6 100644 --- a/modules/rostests/apitests/gdi32/FrameRgn.c +++ b/modules/rostests/apitests/gdi32/FrameRgn.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> -#include <windows.h> -#include <stdio.h> +#include "precomp.h" + #include "init.h" #if 0 diff --git a/modules/rostests/apitests/gdi32/GdiConvertBitmap.c b/modules/rostests/apitests/gdi32/GdiConvertBitmap.c index 78f5899ad3..06e6e337ae 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertBitmap.c +++ b/modules/rostests/apitests/gdi32/GdiConvertBitmap.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm); diff --git a/modules/rostests/apitests/gdi32/GdiConvertBrush.c b/modules/rostests/apitests/gdi32/GdiConvertBrush.c index 4fb97f3e2b..d82ddd7f16 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertBrush.c +++ b/modules/rostests/apitests/gdi32/GdiConvertBrush.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); diff --git a/modules/rostests/apitests/gdi32/GdiConvertDC.c b/modules/rostests/apitests/gdi32/GdiConvertDC.c index dd9f736861..29179071b4 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertDC.c +++ b/modules/rostests/apitests/gdi32/GdiConvertDC.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HDC WINAPI GdiConvertDC(HDC hdc); diff --git a/modules/rostests/apitests/gdi32/GdiConvertFont.c b/modules/rostests/apitests/gdi32/GdiConvertFont.c index d8e90785b3..bfc7bb30df 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertFont.c +++ b/modules/rostests/apitests/gdi32/GdiConvertFont.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HFONT WINAPI GdiConvertFont(HFONT); diff --git a/modules/rostests/apitests/gdi32/GdiConvertPalette.c b/modules/rostests/apitests/gdi32/GdiConvertPalette.c index 85dc8787b0..ffb383a0ac 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertPalette.c +++ b/modules/rostests/apitests/gdi32/GdiConvertPalette.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HPALETTE WINAPI GdiConvertPalette(HPALETTE); diff --git a/modules/rostests/apitests/gdi32/GdiConvertRegion.c b/modules/rostests/apitests/gdi32/GdiConvertRegion.c index 028842c13b..0a32e4a603 100644 --- a/modules/rostests/apitests/gdi32/GdiConvertRegion.c +++ b/modules/rostests/apitests/gdi32/GdiConvertRegion.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HRGN WINAPI GdiConvertRegion(HRGN); diff --git a/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c b/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c index 6de9eba242..7faf690b0e 100644 --- a/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c +++ b/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" BOOL WINAPI GdiDeleteLocalDC(HDC); diff --git a/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c b/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c index 2f03dfe2e7..6ac880f922 100644 --- a/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c +++ b/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_GdiGetCharDimensions() { diff --git a/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c b/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c index 7af9a1a89b..349f1d53c7 100644 --- a/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c +++ b/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); diff --git a/modules/rostests/apitests/gdi32/GdiGetLocalDC.c b/modules/rostests/apitests/gdi32/GdiGetLocalDC.c index e445da1e87..590004c013 100644 --- a/modules/rostests/apitests/gdi32/GdiGetLocalDC.c +++ b/modules/rostests/apitests/gdi32/GdiGetLocalDC.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" HDC WINAPI GdiGetLocalDC(HDC); diff --git a/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c b/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c index 2c9572ce9f..0966efd7e6 100644 --- a/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c +++ b/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" BOOL WINAPI GdiReleaseLocalDC(HDC); diff --git a/modules/rostests/apitests/gdi32/GdiSetAttrs.c b/modules/rostests/apitests/gdi32/GdiSetAttrs.c index 537250efc7..798a52847d 100644 --- a/modules/rostests/apitests/gdi32/GdiSetAttrs.c +++ b/modules/rostests/apitests/gdi32/GdiSetAttrs.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" BOOL WINAPI GdiSetAttrs(HDC); diff --git a/modules/rostests/apitests/gdi32/GetClipBox.c b/modules/rostests/apitests/gdi32/GetClipBox.c index 3ee3c252e2..5df59c237b 100644 --- a/modules/rostests/apitests/gdi32/GetClipBox.c +++ b/modules/rostests/apitests/gdi32/GetClipBox.c @@ -5,16 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#define ok_rect(_prc, _left, _top, _right, _bottom) \ - ok_int((_prc)->left, _left); \ - ok_int((_prc)->top, _top); \ - ok_int((_prc)->right, _right); \ - ok_int((_prc)->bottom, _bottom); \ +#include "precomp.h" void Test_GetClipBox() { diff --git a/modules/rostests/apitests/gdi32/GetClipRgn.c b/modules/rostests/apitests/gdi32/GetClipRgn.c index c952d22c9e..7edb8f959a 100644 --- a/modules/rostests/apitests/gdi32/GetClipRgn.c +++ b/modules/rostests/apitests/gdi32/GetClipRgn.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_GetClipRgn() { diff --git a/modules/rostests/apitests/gdi32/GetCurrentObject.c b/modules/rostests/apitests/gdi32/GetCurrentObject.c index 5aea265309..a5a32f3e1b 100644 --- a/modules/rostests/apitests/gdi32/GetCurrentObject.c +++ b/modules/rostests/apitests/gdi32/GetCurrentObject.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> +#include "precomp.h" void Test_GetCurrentObject() { diff --git a/modules/rostests/apitests/gdi32/GetDIBColorTable.c b/modules/rostests/apitests/gdi32/GetDIBColorTable.c index ff700910c8..eb15ed4171 100644 --- a/modules/rostests/apitests/gdi32/GetDIBColorTable.c +++ b/modules/rostests/apitests/gdi32/GetDIBColorTable.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_GetDIBColorTable() { diff --git a/modules/rostests/apitests/gdi32/GetDIBits.c b/modules/rostests/apitests/gdi32/GetDIBits.c index cfc3618070..3b13adadbd 100644 --- a/modules/rostests/apitests/gdi32/GetDIBits.c +++ b/modules/rostests/apitests/gdi32/GetDIBits.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" #include "init.h" diff --git a/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c b/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c index bb4d37900c..72cb75c258 100644 --- a/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c +++ b/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c @@ -4,11 +4,8 @@ * PURPOSE: Test for GetFontResourceInfoW * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <apitest.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <stdio.h> + +#include "precomp.h" /* GetFontResourceInfoW is undocumented */ BOOL WINAPI GetFontResourceInfoW(LPCWSTR lpFileName, DWORD *pdwBufSize, void* lpBuffer, DWORD dwType); diff --git a/modules/rostests/apitests/gdi32/GetGlyphIndices.c b/modules/rostests/apitests/gdi32/GetGlyphIndices.c index 6e3377359c..281616b614 100644 --- a/modules/rostests/apitests/gdi32/GetGlyphIndices.c +++ b/modules/rostests/apitests/gdi32/GetGlyphIndices.c @@ -5,11 +5,7 @@ * PROGRAMMERS: Ged Murphy */ -#include <apitest.h> -#include <wingdi.h> -#include <winuser.h> -#include <strsafe.h> - +#include "precomp.h" #define ok_lasterrornotchanged() \ ok_err(0x12345) diff --git a/modules/rostests/apitests/gdi32/GetObject.c b/modules/rostests/apitests/gdi32/GetObject.c index 0eaff6ef06..a11241ea20 100644 --- a/modules/rostests/apitests/gdi32/GetObject.c +++ b/modules/rostests/apitests/gdi32/GetObject.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> +#include "precomp.h" void Test_General(void) diff --git a/modules/rostests/apitests/gdi32/GetPixel.c b/modules/rostests/apitests/gdi32/GetPixel.c index ddd6ed791d..adf98e8514 100644 --- a/modules/rostests/apitests/gdi32/GetPixel.c +++ b/modules/rostests/apitests/gdi32/GetPixel.c @@ -5,9 +5,7 @@ * PROGRAMMERS: J�r�me Gardou */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_GetPixel_1bpp() { diff --git a/modules/rostests/apitests/gdi32/GetRandomRgn.c b/modules/rostests/apitests/gdi32/GetRandomRgn.c index 5c822793e8..63eea4420a 100644 --- a/modules/rostests/apitests/gdi32/GetRandomRgn.c +++ b/modules/rostests/apitests/gdi32/GetRandomRgn.c @@ -5,13 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <stdio.h> -#include <wingdi.h> -#include <winuser.h> - -#define CLIPRGN 1 #define METARGN 2 #define APIRGN 3 #define SYSRGN 4 diff --git a/modules/rostests/apitests/gdi32/GetStockObject.c b/modules/rostests/apitests/gdi32/GetStockObject.c index 4f7c01ec0c..4ad2e8ed3c 100644 --- a/modules/rostests/apitests/gdi32/GetStockObject.c +++ b/modules/rostests/apitests/gdi32/GetStockObject.c @@ -5,15 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winddi.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" void Test_GetStockObject() { diff --git a/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c b/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c index 594838c14f..9ec44811cf 100644 --- a/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c +++ b/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c @@ -5,14 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <stdio.h> -#include <wingdi.h> -#include <winuser.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" void Test_GetTextExtentExPoint() { diff --git a/modules/rostests/apitests/gdi32/GetTextFace.c b/modules/rostests/apitests/gdi32/GetTextFace.c index 9686d1b660..e304986d13 100644 --- a/modules/rostests/apitests/gdi32/GetTextFace.c +++ b/modules/rostests/apitests/gdi32/GetTextFace.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" void Test_GetTextFace() { diff --git a/modules/rostests/apitests/gdi32/MaskBlt.c b/modules/rostests/apitests/gdi32/MaskBlt.c index 6fe552bcfb..2ebb7c4b5c 100644 --- a/modules/rostests/apitests/gdi32/MaskBlt.c +++ b/modules/rostests/apitests/gdi32/MaskBlt.c @@ -5,10 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <wingdi.h> -#include <winuser.h> #include "init.h" void Test_MaskBlt_1bpp() diff --git a/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c b/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c index eaded16381..c9c335ba51 100644 --- a/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c +++ b/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c @@ -5,11 +5,9 @@ * PROGRAMMERS: Víctor Martínez Calvo ( victor.martinez(a)reactos.org ) */ -#include <apitest.h> -#include <wingdi.h> -#include <ndk/rtlfuncs.h> -#include <strsafe.h> +#include "precomp.h" +#include <ndk/rtlfuncs.h> INT APIENTRY diff --git a/modules/rostests/apitests/gdi32/OffsetClipRgn.c b/modules/rostests/apitests/gdi32/OffsetClipRgn.c index a40265bf6c..046bd06ac1 100644 --- a/modules/rostests/apitests/gdi32/OffsetClipRgn.c +++ b/modules/rostests/apitests/gdi32/OffsetClipRgn.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> -#include <wingdi.h> - -#define CLIPRGN 1 +#include "precomp.h" void Test_OffsetClipRgn() { diff --git a/modules/rostests/apitests/gdi32/OffsetRgn.c b/modules/rostests/apitests/gdi32/OffsetRgn.c index 11bb882637..fcda1f3c35 100644 --- a/modules/rostests/apitests/gdi32/OffsetRgn.c +++ b/modules/rostests/apitests/gdi32/OffsetRgn.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> -#include <windows.h> -#include <stdio.h> -#include "init.h" +#include "precomp.h" void Test_OffsetRgn() { diff --git a/modules/rostests/apitests/gdi32/PaintRgn.c b/modules/rostests/apitests/gdi32/PaintRgn.c index 36fa935cb0..083dcfd457 100644 --- a/modules/rostests/apitests/gdi32/PaintRgn.c +++ b/modules/rostests/apitests/gdi32/PaintRgn.c @@ -5,11 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> -#include <windows.h> -#include <stdio.h> -#include "init.h" +#include "precomp.h" +#include "init.h" void Test_PaintRgn() { diff --git a/modules/rostests/apitests/gdi32/PatBlt.c b/modules/rostests/apitests/gdi32/PatBlt.c index a849377574..456319218e 100644 --- a/modules/rostests/apitests/gdi32/PatBlt.c +++ b/modules/rostests/apitests/gdi32/PatBlt.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <stdio.h> -#include <wingdi.h> +#include "precomp.h" HBITMAP ghbmpTarget; PULONG gpulTargetBits; diff --git a/modules/rostests/apitests/gdi32/RealizePalette.c b/modules/rostests/apitests/gdi32/RealizePalette.c index 461420af00..d3c20c0b26 100644 --- a/modules/rostests/apitests/gdi32/RealizePalette.c +++ b/modules/rostests/apitests/gdi32/RealizePalette.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <stdio.h> -#include <wine/test.h> -#include <windows.h> +#include "precomp.h" + #include "init.h" START_TEST(RealizePalette) @@ -19,4 +18,3 @@ START_TEST(RealizePalette) ok_int(RealizePalette(ghdcDIB32), 0); } - diff --git a/modules/rostests/apitests/gdi32/Rectangle.c b/modules/rostests/apitests/gdi32/Rectangle.c index 308680c7ce..266664beac 100644 --- a/modules/rostests/apitests/gdi32/Rectangle.c +++ b/modules/rostests/apitests/gdi32/Rectangle.c @@ -5,9 +5,7 @@ * PROGRAMMERS: J�r�me Gardou */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_Rectangle(void) { diff --git a/modules/rostests/apitests/gdi32/SelectObject.c b/modules/rostests/apitests/gdi32/SelectObject.c index 0bae4405ef..b7ddb8f735 100644 --- a/modules/rostests/apitests/gdi32/SelectObject.c +++ b/modules/rostests/apitests/gdi32/SelectObject.c @@ -5,17 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <stdio.h> -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" HDC hdc1, hdc2; diff --git a/modules/rostests/apitests/gdi32/SetBoundsRect.c b/modules/rostests/apitests/gdi32/SetBoundsRect.c index 261d99dde2..7d1359e6c9 100644 --- a/modules/rostests/apitests/gdi32/SetBoundsRect.c +++ b/modules/rostests/apitests/gdi32/SetBoundsRect.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org */ -#include <apitest.h> -#include <winuser.h> -#include <wingdi.h> +#include "precomp.h" START_TEST(SetBoundsRect) { diff --git a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c index 74acb15153..e708fef180 100644 --- a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c +++ b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) { diff --git a/modules/rostests/apitests/gdi32/SetDCPenColor.c b/modules/rostests/apitests/gdi32/SetDCPenColor.c index 0f91656bad..397b810bf0 100644 --- a/modules/rostests/apitests/gdi32/SetDCPenColor.c +++ b/modules/rostests/apitests/gdi32/SetDCPenColor.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_SetDCPenColor() { diff --git a/modules/rostests/apitests/gdi32/SetDIBits.c b/modules/rostests/apitests/gdi32/SetDIBits.c index 6a00814891..1c8a1c9faa 100644 --- a/modules/rostests/apitests/gdi32/SetDIBits.c +++ b/modules/rostests/apitests/gdi32/SetDIBits.c @@ -5,9 +5,7 @@ * PROGRAMMERS: J�r�me Gardou */ -#include <apitest.h> - -#include <wingdi.h> +#include "precomp.h" void Test_SetDIBits() { diff --git a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c index 1a86a3646a..6e35b0d0af 100644 --- a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c +++ b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <wingdi.h> #include "init.h" static void diff --git a/modules/rostests/apitests/gdi32/SetMapMode.c b/modules/rostests/apitests/gdi32/SetMapMode.c index 7c8c04857c..004bf0c8ab 100644 --- a/modules/rostests/apitests/gdi32/SetMapMode.c +++ b/modules/rostests/apitests/gdi32/SetMapMode.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" void Test_SetMapMode() { diff --git a/modules/rostests/apitests/gdi32/SetPixel.c b/modules/rostests/apitests/gdi32/SetPixel.c index 1d2758397a..14da033936 100644 --- a/modules/rostests/apitests/gdi32/SetPixel.c +++ b/modules/rostests/apitests/gdi32/SetPixel.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> +#include "precomp.h" -#include <wingdi.h> #include <mmsystem.h> static struct diff --git a/modules/rostests/apitests/gdi32/SetSysColors.c b/modules/rostests/apitests/gdi32/SetSysColors.c index d662996b87..c7584a7b80 100644 --- a/modules/rostests/apitests/gdi32/SetSysColors.c +++ b/modules/rostests/apitests/gdi32/SetSysColors.c @@ -5,12 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#define TEST(x) ok(x, #x"\n") +#include "precomp.h" #define NUM_SYSCOLORS 31 diff --git a/modules/rostests/apitests/gdi32/SetWindowExtEx.c b/modules/rostests/apitests/gdi32/SetWindowExtEx.c index e17af66342..b32455a2ed 100644 --- a/modules/rostests/apitests/gdi32/SetWindowExtEx.c +++ b/modules/rostests/apitests/gdi32/SetWindowExtEx.c @@ -5,13 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> - -#define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") +#include "precomp.h" void Test_SetWindowExtEx() { diff --git a/modules/rostests/apitests/gdi32/SetWorldTransform.c b/modules/rostests/apitests/gdi32/SetWorldTransform.c index 55e9e092a8..0b9c03cbe4 100644 --- a/modules/rostests/apitests/gdi32/SetWorldTransform.c +++ b/modules/rostests/apitests/gdi32/SetWorldTransform.c @@ -5,10 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <apitest.h> - -#include <wingdi.h> -#include <winuser.h> +#include "precomp.h" void Test_SetWorldTransform() { diff --git a/modules/rostests/apitests/gdi32/init.c b/modules/rostests/apitests/gdi32/init.c index fcac6142d5..ab7d4673ea 100644 --- a/modules/rostests/apitests/gdi32/init.c +++ b/modules/rostests/apitests/gdi32/init.c @@ -1,7 +1,6 @@ -#include <stdio.h> -#include <windef.h> -#include <wingdi.h> +#include "precomp.h" + #include "init.h" HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; diff --git a/modules/rostests/apitests/gdi32/init.h b/modules/rostests/apitests/gdi32/init.h index 48d5ce8df7..a57e860a05 100644 --- a/modules/rostests/apitests/gdi32/init.h +++ b/modules/rostests/apitests/gdi32/init.h @@ -1,3 +1,4 @@ +#pragma once extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; diff --git a/modules/rostests/apitests/gdi32/precomp.h b/modules/rostests/apitests/gdi32/precomp.h new file mode 100644 index 0000000000..a0331e74a7 --- /dev/null +++ b/modules/rostests/apitests/gdi32/precomp.h @@ -0,0 +1,25 @@ +#ifndef _GDI32_APITEST_PRECOMP_H_ +#define _GDI32_APITEST_PRECOMP_H_ + +#include <apitest.h> +#include <wingdi.h> +#include <winuser.h> +#include <winddi.h> +#include <winnls.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> +#include <stdio.h> +#include <strsafe.h> + +#define CLIPRGN 1 + +#define TEST(x) ok(x, #x"\n") +#define RTEST(x) ok(x, #x"\n") + +#define ok_rect(_prc, _left, _top, _right, _bottom) \ + ok_int((_prc)->left, _left); \ + ok_int((_prc)->top, _top); \ + ok_int((_prc)->right, _right); \ + ok_int((_prc)->bottom, _bottom); \ + +#endif /* _GDI32_APITEST_PRECOMP_H_ */

7 years

[reactos] 01/01: [SHELL32] Fix show properties with Alt+Enter

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2bdad2981e940b1f4faa… commit c2bdad2981e940b1f4faa5011327dbba72679ff0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Dec 2 17:54:17 2017 +0300 [SHELL32] Fix show properties with Alt+Enter --- dll/win32/shell32/CDefView.cpp | 1 + dll/win32/shell32/shell32.rc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 1492724e55..9863205273 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1596,6 +1596,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand case FCIDM_SHVIEW_CUT: case FCIDM_SHVIEW_COPY: case FCIDM_SHVIEW_RENAME: + case FCIDM_SHVIEW_PROPERTIES: return OnExplorerCommand(dwCmdID, TRUE); case FCIDM_SHVIEW_INSERT: diff --git a/dll/win32/shell32/shell32.rc b/dll/win32/shell32/shell32.rc index 7ba3cdc4ee..bfb1d6374d 100644 --- a/dll/win32/shell32/shell32.rc +++ b/dll/win32/shell32/shell32.rc @@ -34,7 +34,7 @@ BEGIN VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY, SHIFT VK_F2, FCIDM_SHVIEW_RENAME, VIRTKEY - VK_RETURN, FCIDM_SHVIEW_OPEN, VIRTKEY, ALT + VK_RETURN, FCIDM_SHVIEW_PROPERTIES, VIRTKEY, ALT "X", FCIDM_SHVIEW_CUT, VIRTKEY, CONTROL "C", FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL VK_INSERT, FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL

7 years

[reactos] 01/01: [README] Clean up and finish styling

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8393412c42c91e75169af… commit 8393412c42c91e75169af9578736827c5640f4d7 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sat Dec 2 17:31:07 2017 +0200 [README] Clean up and finish styling Unified the first badge row to use the same colors as reactos.org Moved build related badges to 'Build' section Fixed all links to use https and to be semantically correct Replaced 'Tweet' badge with 'Follow', 'Flattr' with more general 'donate' Added a sentence about donation --- README.md | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index e5c1c90d3f..a2b53dc6e7 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,27 @@ -# ReactOS Project [![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![coverity.badge]][coverity.link] - <p align=center> <img src="https://reactos.org/wiki/images/0/02/ReactOS_logo.png"> </p> +--- + <p align=center> <a href="https://reactos.org/project-news/reactos-046-released"> - <img alt="Release 0.4.6 Release" src="https://img.shields.io/badge/release-0.4.6-brightgreen.svg"> + <img alt="Release 0.4.6 Release" src="https://img.shields.io/badge/release-0.4.6-0688CB.svg"> </a> <a href="https://reactos.org/download"> - <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-blue.svg"> + <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg"> </a> <a href="https://sourceforge.net/projects/reactos"> - <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg"> + <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB"> </a> <a href="https://github.com/reactos/reactos/blob/master/COPYING"> - <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-blue.svg"> + <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg"> </a> - <a href="https://flattr.com/thing/505443/ReactOS"> - <img alt="Flattr" src="https://api.flattr.com/button/flattr-badge-large.png"> + <a href="https://reactos.org/donating"> + <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg"> </a> - <a href="https://twitter.com/intent/tweet?text=Check%20out%20ReactOS%20-%20Free%20an…"> - <img alt="License" src="https://img.shields.io/twitter/url/http/shields.io.svg?style=social"> + <a href="https://twitter.com/reactos"> + <img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow…"> </a> </p> @@ -40,11 +40,13 @@ ReactOS™ is an Open Source effort to develop a quality operating system that i The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. -The code of ReactOS is licensed under [GNU GPL 2.0+](https://spdx.org/licenses/GPL-2.0+.html). +The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING). -## Building [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] +## Building -To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ +[![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] + +To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: http://www.reactos.org/wiki/Build_Environment. Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: https://www.reactos.org/wiki/Building_with_MSVC. @@ -78,10 +80,12 @@ See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide. __NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum). -## Contributing +## Contributing ![prwelcome.badge] We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. +You can also support ReactOS by [donating](https://reactos.org/donating)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/node/785). + ## More information ReactOS is a Free and Open Source operating system based on the Windows architecture, @@ -102,18 +106,19 @@ See also the [CREDITS](CREDITS) file for others. ## Code mirrors -The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/) in case GitHub is down. +The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/?p=reactos.git) in case GitHub is down. There is also an obsolete [SVN archive repository](https://svn.reactos.org/svn/reactos?view=revision) that is kept for historical purposes. [travis.badge]: https://travis-ci.org/reactos/reactos.svg?branch=master [appveyor.badge]: https://ci.appveyor.com/api/projects/status/github/reactos/reactos?branch=m… [coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1 -[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.1.5-blue.svg -[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.1.2-blue.svg +[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.1.5-0688CB.svg +[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.1.2-0688CB.svg +[prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg [travis.link]: https://travis-ci.org/reactos/reactos [appveyor.link]: https://ci.appveyor.com/project/AmineKhaldi/reactos [coverity.link]: https://scan.coverity.com/projects/205 [rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.5/ -[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/ +[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017