date:20171217

[ros-diffs] [reactos] 01/01: [FS] During 1st stage, disable any FS we don't support install to in order to let RawFS these volumes. This avoids bloated setup and avoids potential bugs in 3rd party dri

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a650f6ba50a270faf37c36f8054b931dd9b4272

commit 5a650f6ba50a270faf37c36f8054b931dd9b4272
Author: Pierre Schweitzer 
AuthorDate: Mon Dec 18 08:44:24 2017 +0100

[FS] During 1st stage, disable any FS we don't support install to in order 
to let RawFS these volumes.
This avoids bloated setup and avoids potential bugs in 3rd party drivers.

This is following 806cd1.
---
 boot/bootdata/txtsetup.sif  | 4 
 drivers/filesystems/ext2/CMakeLists.txt | 2 +-
 drivers/filesystems/ffs/CMakeLists.txt  | 2 +-
 drivers/filesystems/reiserfs/CMakeLists.txt | 2 +-
 drivers/filesystems/udfs/CMakeLists.txt | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 822c19c8c8..7a86befd28 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -57,7 +57,6 @@ scsiport.sys=,,x,,4
 storport.sys=,,x,,4
 fastfat.sys=,,x,,4
 ramdisk.sys=,,x,,4
-ext2fs.sys=,,x,,4
 classpnp.sys=4
 pciide.sys=4
 pciidex.sys=4
@@ -68,9 +67,6 @@ ntdll.dll=2
 wmilib.sys=4
 ksecdd.sys=4
 mountmgr.sys=,,x,,4
-reiserfs.sys=,,x,,4
-ffs.sys=,,x,,4
-udfs.sys=,,x,,4
 
 [SystemPartitionFiles]
 
diff --git a/drivers/filesystems/ext2/CMakeLists.txt 
b/drivers/filesystems/ext2/CMakeLists.txt
index 6d0bdb7d01..94b077b0c4 100644
--- a/drivers/filesystems/ext2/CMakeLists.txt
+++ b/drivers/filesystems/ext2/CMakeLists.txt
@@ -118,4 +118,4 @@ if(NOT USE_CLANG_CL)
 add_pch(ext2fs inc/ext2fs.h SOURCE)
 endif()
 
-add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/filesystems/ffs/CMakeLists.txt 
b/drivers/filesystems/ffs/CMakeLists.txt
index 8138a15a5a..6f371875b2 100644
--- a/drivers/filesystems/ffs/CMakeLists.txt
+++ b/drivers/filesystems/ffs/CMakeLists.txt
@@ -45,5 +45,5 @@ set_module_type(ffs kernelmodedriver)
 target_link_libraries(ffs memcmp ${PSEH_LIB})
 add_importlibs(ffs ntoskrnl hal)
 add_pch(ffs inc/ffsdrv.h SOURCE)
-add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers FOR all)
 
diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt 
b/drivers/filesystems/reiserfs/CMakeLists.txt
index 7990886489..95d70eaf01 100644
--- a/drivers/filesystems/reiserfs/CMakeLists.txt
+++ b/drivers/filesystems/reiserfs/CMakeLists.txt
@@ -95,4 +95,4 @@ add_definitions(-D__KERNEL__)
 set_module_type(reiserfs kernelmodedriver)
 add_importlibs(reiserfs ntoskrnl hal)
 add_pch(reiserfs inc/rfsd.h SOURCE)
-add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers NO_CAB FOR 
all)
+add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/filesystems/udfs/CMakeLists.txt 
b/drivers/filesystems/udfs/CMakeLists.txt
index 8b5df85fcf..8bb85aa627 100644
--- a/drivers/filesystems/udfs/CMakeLists.txt
+++ b/drivers/filesystems/udfs/CMakeLists.txt
@@ -60,5 +60,5 @@ set_module_type(udfs kernelmodedriver)
 target_link_libraries(udfs ${PSEH_LIB})
 add_importlibs(udfs ntoskrnl hal)
 add_pch(udfs udffs.h SOURCE)
-add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers FOR all)
 add_registry_inf(udfs_reg.inf)

[ros-diffs] [reactos] 03/03: [NTOSKRNL] Make again an attempt at killing the IopParseDevice() hack.

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ef08871ee67cafc1b3566f408bd4f7a86df9a80

commit 4ef08871ee67cafc1b3566f408bd4f7a86df9a80
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 23:30:58 2017 +0100

[NTOSKRNL] Make again an attempt at killing the IopParseDevice() hack.

For the record, the only place it was remaining was 1st stage, notably 
because
FSD (FastAT <3) was missing a few features. As this features weren't 
triggered
in 3rd stage (unless forced), it was not needed there any longer.

Now that they are implemented, and seem working out of the box, this hack 
might
not be longer anymore.

This is my ... ?! pfff attempt at killing it. It might not be the last, so 
just
disabling the hack for now. If there are no regressions (who can really 
believe that?)
we'll be clear for dropping it once for all.
---
 ntoskrnl/io/iomgr/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c
index 71863ccb42..11ad0529b3 100644
--- a/ntoskrnl/io/iomgr/file.c
+++ b/ntoskrnl/io/iomgr/file.c
@@ -533,7 +533,7 @@ IopParseDevice(IN PVOID ParseObject,
 /* Check if we can simply use a dummy file */
 UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly));
 
-#if 1
+#if 0
 /* FIXME: Small hack still exists, have to check why...
  * This is triggered multiple times by usetup and then once per boot.
  */

[ros-diffs] [reactos] 02/03: [FASFAT] Enable FAT volume dismount using VPB swapout

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd1e7bf85e01ccaece3c3da4a701f7911f63cd7e

commit bd1e7bf85e01ccaece3c3da4a701f7911f63cd7e
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 23:29:33 2017 +0100

[FASFAT] Enable FAT volume dismount using VPB swapout
---
 drivers/filesystems/fastfat/vfat.h | 4 
 1 file changed, 4 deletions(-)

diff --git a/drivers/filesystems/fastfat/vfat.h 
b/drivers/filesystems/fastfat/vfat.h
index b84b320573..50b83b1afb 100644
--- a/drivers/filesystems/fastfat/vfat.h
+++ b/drivers/filesystems/fastfat/vfat.h
@@ -13,11 +13,7 @@
 #endif
 
 #define USE_ROS_CC_AND_FS
-#if 0
-#ifndef _MSC_VER
 #define ENABLE_SWAPOUT
-#endif
-#endif
 
 #define ROUND_DOWN(n, align) \
 (((ULONG)n) & ~((align) - 1l))

[ros-diffs] [reactos] 01/03: [USETUP] Our current FAT ChkDsk being a bit slow when using the right path make it only perform a full check if dirty bit is set (which should never happen cough).

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8f2befb5ff1465123d0bceb4595a00add62326f

commit c8f2befb5ff1465123d0bceb4595a00add62326f
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 23:26:38 2017 +0100

[USETUP] Our current FAT ChkDsk being a bit slow when using the right path 
make
it only perform a full check if dirty bit is set (which should never happen 
*cough*).

This is needed because otherwise, ReactOS installation takes forever when 
IopParseDevice is gone
due to slow ChkDsk.
---
 base/setup/usetup/chkdsk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c
index 1ad582a4be..6d8df5d214 100644
--- a/base/setup/usetup/chkdsk.c
+++ b/base/setup/usetup/chkdsk.c
@@ -77,7 +77,7 @@ ChkdskPartition(
 Status = FileSystem->ChkdskFunc(DriveRoot,
 TRUE,/* FixErrors */
 FALSE,   /* Verbose */
-FALSE,   /* CheckOnlyIfDirty */
+TRUE,/* CheckOnlyIfDirty */
 FALSE,   /* ScanDrive */
 ChkdskCallback); /* Callback */

[ros-diffs] [reactos] 01/01: [SETUP] Remove FSDs which have broken dismount implementation. This avoids issues when these partitions are formatted to FAT for setup.

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=806cd16328799771b89397f5c51a3d46884bce0a

commit 806cd16328799771b89397f5c51a3d46884bce0a
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 23:13:56 2017 +0100

[SETUP] Remove FSDs which have broken dismount implementation.
This avoids issues when these partitions are formatted to FAT for setup.

For now, this commit doesn't change anything, but once IopParseDevice hack
gets removed, this will make a difference!

CORE-6305
---
 boot/bootdata/txtsetup.sif   | 2 --
 drivers/filesystems/btrfs/CMakeLists.txt | 2 +-
 drivers/filesystems/ntfs/CMakeLists.txt  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 3ea62974b5..822c19c8c8 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -52,7 +52,6 @@ usbstor.sys=,,x,,4
 kbdhid.sys=4
 kbdclass.sys=,,x,,4
 l_intl.nls=2
-ntfs.sys=4
 pci.sys=4
 scsiport.sys=,,x,,4
 storport.sys=,,x,,4
@@ -69,7 +68,6 @@ ntdll.dll=2
 wmilib.sys=4
 ksecdd.sys=4
 mountmgr.sys=,,x,,4
-btrfs.sys=,,x,,4
 reiserfs.sys=,,x,,4
 ffs.sys=,,x,,4
 udfs.sys=,,x,,4
diff --git a/drivers/filesystems/btrfs/CMakeLists.txt 
b/drivers/filesystems/btrfs/CMakeLists.txt
index 65e61d255a..123c9f0522 100644
--- a/drivers/filesystems/btrfs/CMakeLists.txt
+++ b/drivers/filesystems/btrfs/CMakeLists.txt
@@ -41,4 +41,4 @@ add_definitions(-D__KERNEL__)
 set_module_type(btrfs kernelmodedriver)
 target_link_libraries(btrfs rtlver ntoskrnl_vista zlib_solo wdmguid 
${PSEH_LIB})
 add_importlibs(btrfs ntoskrnl hal)
-add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/filesystems/ntfs/CMakeLists.txt 
b/drivers/filesystems/ntfs/CMakeLists.txt
index 0b1af78947..5a193b449d 100644
--- a/drivers/filesystems/ntfs/CMakeLists.txt
+++ b/drivers/filesystems/ntfs/CMakeLists.txt
@@ -25,4 +25,4 @@ set_module_type(ntfs kernelmodedriver)
 target_link_libraries(ntfs ${PSEH_LIB})
 add_importlibs(ntfs ntoskrnl hal)
 add_pch(ntfs ntfs.h SOURCE)
-add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers FOR all)

[ros-diffs] [reactos] 01/01: [HAL] Use 64 bits for physical addresses.

2017-12-17 Thread Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5311c57b5fdb1a57d6017d9e89f8822a573fc6d1

commit 5311c57b5fdb1a57d6017d9e89f8822a573fc6d1
Author: Timo Kreuzer 
AuthorDate: Sun Dec 17 17:37:43 2017 +0100

[HAL] Use 64 bits for physical addresses.
---
 hal/halx86/generic/memory.c | 9 -
 hal/halx86/include/halp.h   | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hal/halx86/generic/memory.c b/hal/halx86/generic/memory.c
index e16eef3dbf..587503fca1 100644
--- a/hal/halx86/generic/memory.c
+++ b/hal/halx86/generic/memory.c
@@ -24,15 +24,15 @@ PVOID HalpHeapStart = MM_HAL_HEAP_START;
 
 /* PRIVATE FUNCTIONS */
 
-ULONG_PTR
+ULONG64
 NTAPI
 HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
-IN ULONG_PTR MaxAddress,
+IN ULONG64 MaxAddress,
 IN PFN_NUMBER PageCount,
 IN BOOLEAN Aligned)
 {
 ULONG UsedDescriptors;
-ULONG_PTR PhysicalAddress;
+ULONG64 PhysicalAddress;
 PFN_NUMBER MaxPage, BasePage, Alignment;
 PLIST_ENTRY NextEntry;
 PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock;
@@ -71,9 +71,8 @@ HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK 
LoaderBlock,
 (MdBlock->PageCount >= PageCount + Alignment) &&
 (BasePage + PageCount + Alignment < MaxPage))
 {
-
 /* We found an address */
-PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT;
+PhysicalAddress = ((ULONG64)BasePage + Alignment) << 
PAGE_SHIFT;
 break;
 }
 }
diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h
index 8e79f3444e..315282f809 100644
--- a/hal/halx86/include/halp.h
+++ b/hal/halx86/include/halp.h
@@ -633,11 +633,11 @@ HalpReleasePciDeviceForDebugging(
 //
 // Memory routines
 //
-ULONG_PTR
+ULONG64
 NTAPI
 HalpAllocPhysicalMemory(
 IN PLOADER_PARAMETER_BLOCK LoaderBlock,
-IN ULONG_PTR MaxAddress,
+IN ULONG64 MaxAddress,
 IN PFN_NUMBER PageCount,
 IN BOOLEAN Aligned
 );

[ros-diffs] [reactos] 01/01: [FASTFAT] Add a comment (and an ASSERT) in VfatCreateFile() that shows that my stats code is broken...

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcd95c1a85d88c2adc98af14194e9b3057cbcb27

commit dcd95c1a85d88c2adc98af14194e9b3057cbcb27
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 18:25:43 2017 +0100

[FASTFAT] Add a comment (and an ASSERT) in VfatCreateFile() that shows that 
my stats code is broken...
---
 drivers/filesystems/fastfat/create.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/filesystems/fastfat/create.c 
b/drivers/filesystems/fastfat/create.c
index 248d99e7f7..20a4bc0d04 100644
--- a/drivers/filesystems/fastfat/create.c
+++ b/drivers/filesystems/fastfat/create.c
@@ -982,6 +982,8 @@ VfatCreateFile(
 
 /* FIXME : test write access if requested */
 
+/* FIXME: That is broken, we cannot reach this code path with failure */
+ASSERT(NT_SUCCESS(Status));
 if (NT_SUCCESS(Status))
 {
 vfatAddToStat(DeviceExt, Fat.SuccessfulCreates, 1);

[ros-diffs] [reactos] 03/03: [FASTFAT] While closing FCBs on dismount, release from tail to head and not the contrary. It fixes assertion failure in vfatDestroyFCB() where we would have release parent

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64bc96558e878cc91da148ec5892a7e2bf58e052

commit 64bc96558e878cc91da148ec5892a7e2bf58e052
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 18:21:51 2017 +0100

[FASTFAT] While closing FCBs on dismount, release from tail to head and not 
the contrary.
It fixes assertion failure in vfatDestroyFCB() where we would have release 
parent before child.
This is still not perfect, but less bug prone...

With this commits (and ENABLE_SWAPOUT defined), ReactOS seems to unmount 
FAT volumes quite nice! :-)
(Tried with fsutil volume dismount X:)
---
 drivers/filesystems/fastfat/fsctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/filesystems/fastfat/fsctl.c 
b/drivers/filesystems/fastfat/fsctl.c
index f059410044..abd772648a 100644
--- a/drivers/filesystems/fastfat/fsctl.c
+++ b/drivers/filesystems/fastfat/fsctl.c
@@ -1203,7 +1203,7 @@ VfatDismountVolume(
 /* Rebrowse the FCB in order to free them now */
 while (!IsListEmpty(>FcbListHead))
 {
-NextEntry = RemoveHeadList(>FcbListHead);
+NextEntry = RemoveTailList(>FcbListHead);
 Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry);
 vfatDestroyFCB(Fcb);
 }

[ros-diffs] [reactos] 02/03: [FASTFAT] Fix a handle count leak on volume close. This can prevent locking a volume!

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de0368614814293c40517551911c0057bde7dfed

commit de0368614814293c40517551911c0057bde7dfed
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 18:20:04 2017 +0100

[FASTFAT] Fix a handle count leak on volume close. This can prevent locking 
a volume!
---
 drivers/filesystems/fastfat/cleanup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/filesystems/fastfat/cleanup.c 
b/drivers/filesystems/fastfat/cleanup.c
index 85b4ea2d2c..d584dee859 100644
--- a/drivers/filesystems/fastfat/cleanup.c
+++ b/drivers/filesystems/fastfat/cleanup.c
@@ -41,6 +41,7 @@ VfatCleanupFile(
 if (IsVolume)
 {
 pFcb->OpenHandleCount--;
+DeviceExt->OpenHandleCount--;
 
 if (pFcb->OpenHandleCount != 0)
 {

[ros-diffs] [reactos] 01/03: [FASTFAT] When not able to lock a volume due to open handles, print open handles

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27773dbb3f1ab3f93a24a742bec91676bf3a70a4

commit 27773dbb3f1ab3f93a24a742bec91676bf3a70a4
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 18:19:03 2017 +0100

[FASTFAT] When not able to lock a volume due to open handles, print open 
handles
---
 drivers/filesystems/fastfat/fsctl.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/drivers/filesystems/fastfat/fsctl.c 
b/drivers/filesystems/fastfat/fsctl.c
index a406276ee6..f059410044 100644
--- a/drivers/filesystems/fastfat/fsctl.c
+++ b/drivers/filesystems/fastfat/fsctl.c
@@ -1115,6 +1115,22 @@ VfatLockOrUnlockVolume(
 /* Deny locking if we're not alone */
 if (Lock && DeviceExt->OpenHandleCount != 1)
 {
+PLIST_ENTRY ListEntry;
+
+DPRINT1("Can't lock: %u opened\n", DeviceExt->OpenHandleCount);
+
+ListEntry = DeviceExt->FcbListHead.Flink;
+while (ListEntry != >FcbListHead)
+{
+Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry);
+ListEntry = ListEntry->Flink;
+
+if (Fcb->OpenHandleCount  > 0)
+{
+DPRINT1("Opened (%u - %u): %wZ\n", Fcb->OpenHandleCount, 
Fcb->RefCount, >PathNameU);
+}
+}
+
 return STATUS_ACCESS_DENIED;
 }

[ros-diffs] [reactos] 01/01: [RAPPS] Select 'Available' category by default.

2017-12-17 Thread Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab7ddc44f7ba8281ade75364861992d2f7f5b955

commit ab7ddc44f7ba8281ade75364861992d2f7f5b955
Author: Alexander Shaposhnikov 
AuthorDate: Sun Dec 17 16:09:55 2017 +0200

[RAPPS] Select 'Available' category by default.
---
 base/applications/rapps/gui.cpp | 50 -
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index 76a5e76d08..62d1a1961b 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -729,33 +729,33 @@ private:
 
 VOID InitCategoriesList()
 {
-HTREEITEM hRootItem1, hRootItem2;
-
-hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY);
-AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS);
-AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD);
-
-hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY);
-AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO);
-AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO);
-AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS);
-AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES);
-AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET);
-AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE);
-AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL);
-AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU);
-AddCategory(hRootItem2, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER);
-AddCategory(hRootItem2, IDS_CAT_FINANCE, IDI_CAT_FINANCE);
-AddCategory(hRootItem2, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE);
-AddCategory(hRootItem2, IDS_CAT_TOOLS, IDI_CAT_TOOLS);
-AddCategory(hRootItem2, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS);
-AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS);
-AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER);
+HTREEITEM hRootItemInstalled, hRootItemAvailable;
+
+hRootItemInstalled = AddCategory(TVI_ROOT, IDS_INSTALLED, 
IDI_CATEGORY);
+AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS);
+AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD);
+
+hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, 
IDI_CATEGORY);
+AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO);
+AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO);
+AddCategory(hRootItemAvailable, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS);
+AddCategory(hRootItemAvailable, IDS_CAT_GAMES, IDI_CAT_GAMES);
+AddCategory(hRootItemAvailable, IDS_CAT_INTERNET, IDI_CAT_INTERNET);
+AddCategory(hRootItemAvailable, IDS_CAT_OFFICE, IDI_CAT_OFFICE);
+AddCategory(hRootItemAvailable, IDS_CAT_DEVEL, IDI_CAT_DEVEL);
+AddCategory(hRootItemAvailable, IDS_CAT_EDU, IDI_CAT_EDU);
+AddCategory(hRootItemAvailable, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER);
+AddCategory(hRootItemAvailable, IDS_CAT_FINANCE, IDI_CAT_FINANCE);
+AddCategory(hRootItemAvailable, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE);
+AddCategory(hRootItemAvailable, IDS_CAT_TOOLS, IDI_CAT_TOOLS);
+AddCategory(hRootItemAvailable, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS);
+AddCategory(hRootItemAvailable, IDS_CAT_LIBS, IDI_CAT_LIBS);
+AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER);
 
 m_TreeView->SetImageList();
-m_TreeView->Expand(hRootItem1, TVE_EXPAND);
-m_TreeView->Expand(hRootItem2, TVE_EXPAND);
-m_TreeView->SelectItem(hRootItem1);
+m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND);
+m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND);
+m_TreeView->SelectItem(hRootItemAvailable);
 }
 
 BOOL CreateStatusBar()

[ros-diffs] [reactos] 01/01: [MSCONFIG_NEW] Temporarily "fix" the header of the SimpChinese resource file because this has nothing to do with Paint whatsoever. Proper headers will be used as soon as m

2017-12-17 Thread Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f04bf3af6e941764d581d1b09d65b0f556caefb

commit 8f04bf3af6e941764d581d1b09d65b0f556caefb
Author: Hermès Bélusca-Maïto 
AuthorDate: Sun Dec 17 14:44:23 2017 +0100

[MSCONFIG_NEW] Temporarily "fix" the header of the SimpChinese resource 
file because this has nothing to do with Paint whatsoever. Proper headers will 
be used as soon as msconfig_new replaces the old one and such headers be used 
in all of its code.
---
 base/applications/msconfig_new/lang/zh-CN.rc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/base/applications/msconfig_new/lang/zh-CN.rc 
b/base/applications/msconfig_new/lang/zh-CN.rc
index ad772d76b8..f6282e7028 100644
--- a/base/applications/msconfig_new/lang/zh-CN.rc
+++ b/base/applications/msconfig_new/lang/zh-CN.rc
@@ -1,7 +1,4 @@
 /*
- * PROJECT: PAINT for ReactOS
- * LICENSE: LGPL
- * FILE:base/applications/mspaint/lang/zh-CN.rc
  * PURPOSE: Simplified Chinese Language resource file
  * TRANSLATORS: zhangbing 
  *  Li Keqing

[ros-diffs] [reactos] 01/01: [TRANSLATION] Improve Simplified Chinese Translations.

2017-12-17 Thread Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6131ace49b7bbe2ff84c88c51d442f0e7ef55ba

commit d6131ace49b7bbe2ff84c88c51d442f0e7ef55ba
Author: Luo Yufan 
AuthorDate: Fri Dec 15 19:11:24 2017 +0800

[TRANSLATION] Improve Simplified Chinese Translations.

* Fix Simplified Chinese Translation of EXPLORER.
* Fix Simplified Chinese Translation of MSCONFIG_NEW.
* Fix Simplified Chinese Translation of MSPAINT.
* Fix Simplified Chinese Translation of SHELL32.
* Fix Simplified Chinese Translation of SYSDM.
* Fix Simplified Chinese Translation of SETUP/REACTOS.
---
 base/applications/msconfig_new/lang/zh-CN.rc |  44 ---
 base/applications/mspaint/lang/zh-CN.rc  |  15 ++-
 base/setup/reactos/lang/zh-CN.rc |  10 +-
 base/shell/explorer/lang/zh-CN.rc|   6 +-
 dll/cpl/sysdm/lang/zh-CN.rc  |   8 +-
 dll/win32/shell32/lang/zh-CN.rc  | 183 ++-
 6 files changed, 138 insertions(+), 128 deletions(-)

diff --git a/base/applications/msconfig_new/lang/zh-CN.rc 
b/base/applications/msconfig_new/lang/zh-CN.rc
index 6cc0e448ef..ad772d76b8 100644
--- a/base/applications/msconfig_new/lang/zh-CN.rc
+++ b/base/applications/msconfig_new/lang/zh-CN.rc
@@ -1,14 +1,22 @@
-/* Simplified Chinese translation by zhangbing  */
-
+/*
+ * PROJECT: PAINT for ReactOS
+ * LICENSE: LGPL
+ * FILE:base/applications/mspaint/lang/zh-CN.rc
+ * PURPOSE: Simplified Chinese Language resource file
+ * TRANSLATORS: zhangbing 
+ *  Li Keqing 
+ *  Luo Yufan 
+ */
+ 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "关于系统配置程序"
+CAPTION "关于系统配置实用程序"
 FONT 9, "MS Shell Dlg"
 BEGIN
 ICONIDI_APPICON, IDC_STATIC, 14, 14, 20, 20
-LTEXT   "系统配置程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX
+LTEXT   "系统配置实用程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, 
SS_NOPREFIX
 //  "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n"
 LTEXT   "版权所有 (C) ReactOS 团队 2005-2015\n\
 Christoph von Wittich (christ...@apiviewer.de)\n\
@@ -66,23 +74,23 @@ BEGIN
 PUSHBUTTON  "设置为默认()", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14
 PUSHBUTTON  "向上移动()", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14
 PUSHBUTTON  "向下移动()", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14
-GROUPBOX"启动选项", IDC_STATIC, 5, 84, 285, 86
+GROUPBOX"引导选项", IDC_STATIC, 5, 84, 285, 86
 GROUPBOX"", IDC_STATIC, 10, 97, 143, 68
-CHECKBOX"安全启动 (/SA)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
+CHECKBOX"安全模式 (/SA)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10
 CONTROL "最小 ()", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 
15, 110, 133, 10
-CONTROL "其他环境\n(M (ALTERNATESHELL))", IDC_RADIO4,
+CONTROL "其他外壳\n(M (ALTERNATESHELL))", IDC_RADIO4,
 "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 
17
 CONTROL "维修活动目录 (DSRE)", IDC_RADIO3, "Button", 
BS_AUTORADIOBUTTON, 15, 139, 133, 10
 CONTROL "网络 (NET)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 
15, 150, 133, 10
-CHECKBOX"无 GUI 启动\n(/)", IDC_CBX_NO_GUI_BOOT, 158, 91, 
127, 17, BS_MULTILINE
-CHECKBOX"启动日志 (/)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
-CHECKBOX"基地视频 (/BAS)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
+CHECKBOX"无 GUI 引导\n(/)", IDC_CBX_NO_GUI_BOOT, 158, 91, 
127, 17, BS_MULTILINE
+CHECKBOX"引导日志 (/)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12
+CHECKBOX"基本视频 (/BAS)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12
 CHECKBOX"OS 引导信息 (/S)", IDC_CBX_SOS, 158, 138, 127, 12
 PUSHBUTTON  "高级选项...()", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14
 LTEXT   "超时:()", IDC_STATIC, 296, 91, 32, 10
 EDITTEXTIDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | 
ES_NUMBER
 LTEXT   "秒", IDC_STATIC, 330, 104, 31, 10
-CONTROL "使所有的引导设置成为永久()", 292,
+CONTROL "使所有的引导设置成为永久设置()", 292,
 "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | 
WS_TABSTOP, 295, 121, 66, 49
 PUSHBUTTON  "删除()", IDC_BTN_DELETE, 295, 68, 66, 14
 END
@@ -124,16 +132,16 @@ END
 
 IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "扩展文件从安装源"
+CAPTION "从安装源位置展开一个文件"
 FONT 9, "MS Shell Dlg"
 BEGIN
-LTEXT   "指定您想要还原的文件，包含安装文件的源位置和文件的目标位置。", IDC_STATIC, 7, 7, 339, 17
+LTEXT   "指定您要还原的文件，包含安装文件的源位置和文件的目标位置。", IDC_STATIC, 7, 7, 339, 17
 LTEXT   "要还原的文件:()", IDC_STATIC, 7, 34, 93, 10
 EDITTEXTIDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12,

[ros-diffs] [reactos] 01/01: [VFATLIB] Never touch the file system if not in interactive or RW mode. It's critical not to perform any write on a volume without an exclusive lock on it. That lock is on

2017-12-17 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0bf7dfb62400227e8fb33fbeafcb0da02145439

commit b0bf7dfb62400227e8fb33fbeafcb0da02145439
Author: Pierre Schweitzer 
AuthorDate: Sun Dec 17 13:59:20 2017 +0100

[VFATLIB] Never touch the file system if not in interactive or RW mode.
It's critical not to perform any write on a volume without an exclusive 
lock on it.
That lock is only acquired if ChkDsk is started in RW mode.
Also added an assert in write routine, to make sure that when we're about 
to perform
a write operation, we're really allowed to do so.

This will avoid volume corruptions when a simple "chkdsk" is issued from 
cmd.
To put it simple: check will really check now, and won't attempt any repair.

CORE-14119
---
 sdk/lib/fslib/vfatlib/check/check.c | 198 +++-
 sdk/lib/fslib/vfatlib/check/fat.c   |  54 +-
 sdk/lib/fslib/vfatlib/check/io.c|   2 +
 3 files changed, 137 insertions(+), 117 deletions(-)

diff --git a/sdk/lib/fslib/vfatlib/check/check.c 
b/sdk/lib/fslib/vfatlib/check/check.c
index 5315e3684c..dcf1808687 100644
--- a/sdk/lib/fslib/vfatlib/check/check.c
+++ b/sdk/lib/fslib/vfatlib/check/check.c
@@ -493,23 +493,25 @@ static int handle_dot(DOS_FS * fs, DOS_FILE * file, int 
dots)
if (interactive)
printf("1) Drop it\n2) Auto-rename\n3) Rename\n"
   "4) Convert to directory\n");
-   else
+   else if (rw)
printf("  Auto-renaming it.\n");
-   switch (interactive ? get_key("1234", "?") : '2') {
-   case '1':
-   drop_file(fs, file);
-   return 1;
-   case '2':
-   auto_rename(file);
-   printf("  Renamed to %s\n", file_name(file->dir_ent.name));
-   return 0;
-   case '3':
-   rename_file(file);
+   if (rw || interactive) {
+   switch (interactive ? get_key("1234", "?") : '2') {
+   case '1':
+   drop_file(fs, file);
+   return 1;
+   case '2':
+   auto_rename(file);
+   printf("  Renamed to %s\n", file_name(file->dir_ent.name));
+   return 0;
+   case '3':
+   rename_file(file);
return 0;
-   case '4':
-   MODIFY(file, size, htole32(0));
-   MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR);
-   break;
+   case '4':
+   MODIFY(file, size, htole32(0));
+   MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR);
+   break;
+   }
}
 }
 if (!dots) {
@@ -528,9 +530,9 @@ static int check_file(DOS_FS * fs, DOS_FILE * file)
 
 if (file->dir_ent.attr & ATTR_DIR) {
if (le32toh(file->dir_ent.size)) {
-   printf("%s\n  Directory has non-zero size. Fixing it.\n",
-  path_name(file));
-   MODIFY(file, size, htole32(0));
+   printf("%s\n  Directory has non-zero size.%s\n",
+  path_name(file), (rw) ? " Fixing it." : "");
+   if (rw) MODIFY(file, size, htole32(0));
}
if (file->parent
&& !strncmp((const char *)file->dir_ent.name, MSDOS_DOT,
@@ -539,7 +541,7 @@ static int check_file(DOS_FS * fs, DOS_FILE * file)
if (FSTART(file, fs) != expect) {
printf("%s\n  Start (%lu) does not point to parent (%lu)\n",
   path_name(file), (unsigned long)FSTART(file, fs), 
(long)expect);
-   MODIFY_START(file, expect, fs);
+   if (rw) MODIFY_START(file, expect, fs);
}
return 0;
}
@@ -553,14 +555,14 @@ static int check_file(DOS_FS * fs, DOS_FILE * file)
if (FSTART(file, fs) != expect) {
printf("%s\n  Start (%lu) does not point to .. (%lu)\n",
   path_name(file), (unsigned long)FSTART(file, fs), 
(unsigned long)expect);
-   MODIFY_START(file, expect, fs);
+   if (rw) MODIFY_START(file, expect, fs);
}
return 0;
}
if (FSTART(file, fs) == 0) {
-   printf("%s\n Start does point to root directory. Deleting dir. \n",
-  path_name(file));
-   MODIFY(file, name[0], DELETED_FLAG);
+   printf("%s\n Start does point to root directory.%s\n",
+  path_name(file), (rw) ? " Deleting dir. " : "");
+   if (rw) MODIFY(file, name[0], DELETED_FLAG);
return 0;
}
 }
@@ -569,18 +571,19 @@ static int check_file(DOS_FS * fs, DOS_FILE * file)
   path_name(file));
if (!file->offset)
die("Bad FAT32 root directory! (bad start cluster 1)\n");
-   MODIFY_START(file, 0, fs);
+   if (rw) MODIFY_START(file, 0, fs);
 }
 if (FSTART(file, fs) >= fs->data_clusters + 2) {
printf
-   ("%s\n  Start cluster beyond

[ros-diffs] [reactos] 01/01: [COMCTL32_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=284a839dbd6f6478942117c2bd8ecc83b1dde6b3

commit 284a839dbd6f6478942117c2bd8ecc83b1dde6b3
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 13:40:43 2017 +0100

[COMCTL32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/comctl32/CMakeLists.txt | 12 +++
 modules/rostests/winetests/comctl32/animate.c  | 10 +
 modules/rostests/winetests/comctl32/button.c   |  8 +++
 modules/rostests/winetests/comctl32/comboex.c  | 11 +-
 modules/rostests/winetests/comctl32/datetime.c | 11 +-
 modules/rostests/winetests/comctl32/dpa.c  | 17 +--
 modules/rostests/winetests/comctl32/header.c   | 19 +---
 modules/rostests/winetests/comctl32/imagelist.c| 21 +++---
 modules/rostests/winetests/comctl32/ipaddress.c|  6 +-
 modules/rostests/winetests/comctl32/listview.c | 11 +-
 modules/rostests/winetests/comctl32/misc.c |  9 +---
 modules/rostests/winetests/comctl32/monthcal.c | 16 +-
 modules/rostests/winetests/comctl32/mru.c  | 14 ++--
 modules/rostests/winetests/comctl32/msg.h  |  8 +++
 modules/rostests/winetests/comctl32/pager.c|  9 +---
 modules/rostests/winetests/comctl32/precomp.h  | 25 ++
 modules/rostests/winetests/comctl32/progress.c | 11 +-
 modules/rostests/winetests/comctl32/propsheet.c|  9 +---
 modules/rostests/winetests/comctl32/rebar.c| 15 +
 modules/rostests/winetests/comctl32/status.c   |  7 +-
 modules/rostests/winetests/comctl32/subclass.c |  8 ++-
 modules/rostests/winetests/comctl32/syslink.c  | 10 +
 modules/rostests/winetests/comctl32/tab.c  | 11 +-
 modules/rostests/winetests/comctl32/taskdialog.c   | 10 +
 modules/rostests/winetests/comctl32/toolbar.c  | 16 +-
 modules/rostests/winetests/comctl32/tooltips.c | 11 +-
 modules/rostests/winetests/comctl32/trackbar.c | 10 +
 modules/rostests/winetests/comctl32/treeview.c | 15 +
 modules/rostests/winetests/comctl32/updown.c   | 10 +
 modules/rostests/winetests/comctl32/v6util.h   |  6 --
 30 files changed, 72 insertions(+), 284 deletions(-)

diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt 
b/modules/rostests/winetests/comctl32/CMakeLists.txt
index b1798c3018..f72f87a169 100644
--- a/modules/rostests/winetests/comctl32/CMakeLists.txt
+++ b/modules/rostests/winetests/comctl32/CMakeLists.txt
@@ -5,7 +5,6 @@ add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
 animate.c
-button.c
 comboex.c
 datetime.c
 dpa.c
@@ -21,7 +20,6 @@ list(APPEND SOURCE
 propsheet.c
 rebar.c
 status.c
-subclass.c
 syslink.c
 tab.c
 taskdialog.c
@@ -30,9 +28,14 @@ list(APPEND SOURCE
 trackbar.c
 treeview.c
 updown.c
-testlist.c)
+precomp.h)
 
-add_executable(comctl32_winetest ${SOURCE} rsrc.rc)
+add_executable(comctl32_winetest
+${SOURCE}
+button.c
+subclass.c
+testlist.c
+rsrc.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
 add_target_compile_flags(comctl32_winetest "-Wno-format")
@@ -40,4 +43,5 @@ endif()
 
 set_module_type(comctl32_winetest win32cui)
 add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt 
kernel32)
+add_pch(comctl32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET comctl32_winetest)
diff --git a/modules/rostests/winetests/comctl32/animate.c 
b/modules/rostests/winetests/comctl32/animate.c
index 28cf55b958..9324acd0e6 100644
--- a/modules/rostests/winetests/comctl32/animate.c
+++ b/modules/rostests/winetests/comctl32/animate.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commctrl.h"
-
-#include "wine/test.h"
+#include "precomp.h"
 
 #define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */
 #define INVALID_AVI_INDEX 0x
diff --git a/modules/rostests/winetests/comctl32/button.c 
b/modules/rostests/winetests/comctl32/button.c
index 8cb5b5fc9b..ccc052b327 100644
--- a/modules/rostests/winetests/comctl32/button.c
+++ b/modules/rostests/winetests/comctl32/button.c
@@ -22,15 +22,13 @@
 
 #undef USE_WINE_TODOS
 
-//#include 
-#include 
-#include 
-#include 
+#include "wine/test.h"
+
+#include 
 #include 
 #include 
 #include 
 
-#include "wine/test.h"
 #include "v6util.h"
 #include "msg.h"
 
diff --git a/modules/rostests/winetests/comctl32/comboex.c 
b/modules/rostests/winetests/comctl32/comboex.c
index ec13e22801..947a871a6b 100644
--- a/modules/rostests/winetests/comctl32/comboex.c
+++ b/modules/rostests/winetests/comctl32/comboex.c
@@ -17,16 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

[ros-diffs] [reactos] 01/01: [SHELL32_APITEST] Improve the existing PCH and make use of it. Convert AddCommas.c to c++ in order to have it benefit from the PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ed8eec17cff57e43a6effa6cf5e0df350fc0241

commit 8ed8eec17cff57e43a6effa6cf5e0df350fc0241
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 13:31:22 2017 +0100

[SHELL32_APITEST] Improve the existing PCH and make use of it. Convert 
AddCommas.c to c++ in order to have it benefit from the PCH.
---
 .../shell32/{AddCommas.c => AddCommas.cpp} |  7 ++---
 modules/rostests/apitests/shell32/CFSFolder.cpp|  3 --
 modules/rostests/apitests/shell32/CMakeLists.txt   | 14 ++---
 modules/rostests/apitests/shell32/CMyComputer.cpp  |  3 --
 .../rostests/apitests/shell32/CShellDesktop.cpp|  8 +
 modules/rostests/apitests/shell32/CShellLink.cpp   |  4 ---
 .../rostests/apitests/shell32/Control_RunDLLW.cpp  |  3 ++
 modules/rostests/apitests/shell32/PathResolve.cpp  |  1 +
 .../apitests/shell32/SHCreateFileExtractIconW.cpp  |  7 ++---
 .../apitests/shell32/SHParseDisplayName.cpp|  3 --
 .../rostests/apitests/shell32/ShellExecuteEx.cpp   |  3 --
 modules/rostests/apitests/shell32/menu.cpp |  7 +
 modules/rostests/apitests/shell32/shelltest.cpp|  3 --
 modules/rostests/apitests/shell32/shelltest.h  | 36 +++---
 14 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/modules/rostests/apitests/shell32/AddCommas.c 
b/modules/rostests/apitests/shell32/AddCommas.cpp
similarity index 94%
rename from modules/rostests/apitests/shell32/AddCommas.c
rename to modules/rostests/apitests/shell32/AddCommas.cpp
index 4bc7cd0d94..69ac99021f 100644
--- a/modules/rostests/apitests/shell32/AddCommas.c
+++ b/modules/rostests/apitests/shell32/AddCommas.cpp
@@ -5,14 +5,13 @@
  * PROGRAMMER:  Thomas Faber 
  */
 
-#include 
-#include 
+#include "shelltest.h"
+
 #include 
 #include 
-#include 
 #include 
 
-DECLSPEC_IMPORT LPWSTR WINAPI AddCommasW(DWORD lValue, LPWSTR lpNumber);
+extern "C" DECLSPEC_IMPORT LPWSTR WINAPI AddCommasW(DWORD lValue, LPWSTR 
lpNumber);
 
 START_TEST(AddCommas)
 {
diff --git a/modules/rostests/apitests/shell32/CFSFolder.cpp 
b/modules/rostests/apitests/shell32/CFSFolder.cpp
index 6a68078b95..57c015b351 100644
--- a/modules/rostests/apitests/shell32/CFSFolder.cpp
+++ b/modules/rostests/apitests/shell32/CFSFolder.cpp
@@ -6,9 +6,6 @@
  */
 
 #include "shelltest.h"
-#include 
-#include 
-#include 
 
 #define NDEBUG
 #include 
diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt 
b/modules/rostests/apitests/shell32/CMakeLists.txt
index 48c41820c9..a30f8db886 100644
--- a/modules/rostests/apitests/shell32/CMakeLists.txt
+++ b/modules/rostests/apitests/shell32/CMakeLists.txt
@@ -1,12 +1,12 @@
 
-spec2def(shell32_apitest.exe shell32_apitest.spec)
-
 set_cpp(WITH_RUNTIME)
 
+spec2def(shell32_apitest.exe shell32_apitest.spec)
+
 include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
 
-add_executable(shell32_apitest
-AddCommas.c
+list(APPEND SOURCE
+AddCommas.cpp
 Control_RunDLLW.cpp
 CFSFolder.cpp
 CMyComputer.cpp
@@ -18,10 +18,16 @@ add_executable(shell32_apitest
 ShellExecuteEx.cpp
 shelltest.cpp
 SHParseDisplayName.cpp
+shelltest.h)
+
+add_executable(shell32_apitest
+${SOURCE}
 testlist.c
 resource.rc
 ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def)
+
 target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB})
 set_module_type(shell32_apitest win32cui)
 add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 
shlwapi msvcrt kernel32 ntdll)
+add_pch(shell32_apitest shelltest.h SOURCE)
 add_rostests_file(TARGET shell32_apitest)
diff --git a/modules/rostests/apitests/shell32/CMyComputer.cpp 
b/modules/rostests/apitests/shell32/CMyComputer.cpp
index 06341b5606..712cf4dcd0 100644
--- a/modules/rostests/apitests/shell32/CMyComputer.cpp
+++ b/modules/rostests/apitests/shell32/CMyComputer.cpp
@@ -6,9 +6,6 @@
  */
 
 #include "shelltest.h"
-#include 
-#include 
-#include 
 
 #define NDEBUG
 #include 
diff --git a/modules/rostests/apitests/shell32/CShellDesktop.cpp 
b/modules/rostests/apitests/shell32/CShellDesktop.cpp
index 61a462d57a..7b1fd34adb 100644
--- a/modules/rostests/apitests/shell32/CShellDesktop.cpp
+++ b/modules/rostests/apitests/shell32/CShellDesktop.cpp
@@ -7,16 +7,10 @@
  */
 
 #include "shelltest.h"
-#include 
-#include 
-#include 
-#include 
 
-#define NDEBUG
-#include 
+#include 
 #include 
 
-
 // We would normally use S_LESSTHAN and S_GREATERTHAN, but w2k3 returns 
numbers like 3 and -3...
 // So instead we check on the sign bit (compare result is the low word of the 
hresult).
 #define SHORT_SIGN_BIT  0x8000
diff --git a/modules/rostests/apitests/shell32/CShellLink.cpp 
b/modules/rostests/apitests/shell32/CShellLink.cpp
index ff69dd4772..0e5cd53269 100644
--- a/modules/rostests/apitests/shell32/CShellLink.cpp
+++ b/modules/rostests/apitests/shell32/CShellLink.cpp
@@ -6,10 +6,6 @@
  */
 
 #include "shelltest.h"
-#include 
-#include 
-#include

[ros-diffs] [reactos] 01/01: [GDI32_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95ec9464d3af01d9e7606fe4465230a22fc508ec

commit 95ec9464d3af01d9e7606fe4465230a22fc508ec
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 13:20:00 2017 +0100

[GDI32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/gdi32/CMakeLists.txt |  9 +++--
 modules/rostests/winetests/gdi32/bitmap.c   | 17 ++---
 modules/rostests/winetests/gdi32/brush.c|  9 +
 modules/rostests/winetests/gdi32/clipping.c |  5 +
 modules/rostests/winetests/gdi32/dc.c   | 15 ++-
 modules/rostests/winetests/gdi32/dib.c  | 15 +++
 modules/rostests/winetests/gdi32/font.c | 11 ++-
 modules/rostests/winetests/gdi32/gdiobj.c   | 10 +-
 modules/rostests/winetests/gdi32/generated.c| 10 +-
 modules/rostests/winetests/gdi32/icm.c  |  9 +
 modules/rostests/winetests/gdi32/mapping.c  |  9 +
 modules/rostests/winetests/gdi32/metafile.c | 10 +-
 modules/rostests/winetests/gdi32/palette.c  | 10 +-
 modules/rostests/winetests/gdi32/path.c | 12 +---
 modules/rostests/winetests/gdi32/pen.c  |  9 +
 modules/rostests/winetests/gdi32/precomp.h  | 16 
 16 files changed, 42 insertions(+), 134 deletions(-)

diff --git a/modules/rostests/winetests/gdi32/CMakeLists.txt 
b/modules/rostests/winetests/gdi32/CMakeLists.txt
index 79cdf3125d..b9a497434d 100644
--- a/modules/rostests/winetests/gdi32/CMakeLists.txt
+++ b/modules/rostests/winetests/gdi32/CMakeLists.txt
@@ -16,9 +16,13 @@ list(APPEND SOURCE
 palette.c
 path.c
 pen.c
-testlist.c)
+precomp.h)
+
+add_executable(gdi32_winetest
+${SOURCE}
+testlist.c
+resource.rc)
 
-add_executable(gdi32_winetest ${SOURCE} resource.rc)
 set_module_type(gdi32_winetest win32cui)
 add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
 
@@ -26,4 +30,5 @@ if(MSVC)
 add_importlibs(gdi32_winetest ntdll)
 endif()
 
+add_pch(gdi32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET gdi32_winetest)
diff --git a/modules/rostests/winetests/gdi32/bitmap.c 
b/modules/rostests/winetests/gdi32/bitmap.c
index 2b01e74e42..49460506f5 100755
--- a/modules/rostests/winetests/gdi32/bitmap.c
+++ b/modules/rostests/winetests/gdi32/bitmap.c
@@ -19,25 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-#include 
-#include 
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "mmsystem.h"
-#include "wine/winternl.h"
+#include "precomp.h"
+
 #ifndef __REACTOS__ /* CORE-11331 */
 #include "wine/ddk/d3dkmthk.h"
 #endif
 
-#include "wine/test.h"
-
 #ifndef __REACTOS__ /* CORE-11331 */
 static NTSTATUS (WINAPI *pD3DKMTCreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY 
*desc );
 static NTSTATUS (WINAPI *pD3DKMTDestroyDCFromMemory)( const 
D3DKMT_DESTROYDCFROMMEMORY *desc );
diff --git a/modules/rostests/winetests/gdi32/brush.c 
b/modules/rostests/winetests/gdi32/brush.c
index 1a10429c05..7420995316 100755
--- a/modules/rostests/winetests/gdi32/brush.c
+++ b/modules/rostests/winetests/gdi32/brush.c
@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "wine/test.h"
+#include "precomp.h"
 
 typedef struct _STOCK_BRUSH {
 COLORREF color;
diff --git a/modules/rostests/winetests/gdi32/clipping.c 
b/modules/rostests/winetests/gdi32/clipping.c
index 60bd31e8e4..02b39e3c12 100644
--- a/modules/rostests/winetests/gdi32/clipping.c
+++ b/modules/rostests/winetests/gdi32/clipping.c
@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/test.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
+#include "precomp.h"
 
 static void test_GetRandomRgn(void)
 {
diff --git a/modules/rostests/winetests/gdi32/dc.c 
b/modules/rostests/winetests/gdi32/dc.c
index d24898929e..7f9c91ac36 100644
--- a/modules/rostests/winetests/gdi32/dc.c
+++ b/modules/rostests/winetests/gdi32/dc.c
@@ -19,20 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "precomp.h"
 
-#define WINVER 0x0501 /* request latest DEVMODE */
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-
-#include 
-#include 
-
-#include "wine/test.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winspool.h"
-#include "winerror.h"
+#include 
 
 #ifndef LAYOUT_LTR
 #define LAYOUT_LTR 0
diff --git a/modules/rostests/winetests/gdi32/dib.c 
b/modules/rostests/winetests/gdi32/dib.c
index 5ef63586d6..0ec9e58e37 100644
--- a/modules/rostests/winetests/gdi32/dib.c
+++

[ros-diffs] [reactos] 01/01: [GDIPLUS_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cded6efd75a9bf4191d3aedfd50406e84d383c05

commit cded6efd75a9bf4191d3aedfd50406e84d383c05
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 13:14:57 2017 +0100

[GDIPLUS_WINETEST] Add a PCH.
---
 modules/rostests/winetests/gdiplus/CMakeLists.txt  |  7 +-
 modules/rostests/winetests/gdiplus/brush.c | 11 +
 modules/rostests/winetests/gdiplus/customlinecap.c | 10 +---
 modules/rostests/winetests/gdiplus/font.c  | 13 +--
 modules/rostests/winetests/gdiplus/graphics.c  | 12 +-
 modules/rostests/winetests/gdiplus/graphicspath.c  | 11 +
 modules/rostests/winetests/gdiplus/guid.c  | 27 ++
 modules/rostests/winetests/gdiplus/image.c | 15 +---
 modules/rostests/winetests/gdiplus/matrix.c| 13 +--
 modules/rostests/winetests/gdiplus/metafile.c  | 11 +
 modules/rostests/winetests/gdiplus/pathiterator.c  | 10 +---
 modules/rostests/winetests/gdiplus/pen.c   | 12 +-
 modules/rostests/winetests/gdiplus/precomp.h   | 17 ++
 modules/rostests/winetests/gdiplus/region.c| 11 +
 modules/rostests/winetests/gdiplus/stringformat.c  | 10 +---
 15 files changed, 62 insertions(+), 128 deletions(-)

diff --git a/modules/rostests/winetests/gdiplus/CMakeLists.txt 
b/modules/rostests/winetests/gdiplus/CMakeLists.txt
index 06ad713502..6bac596c78 100644
--- a/modules/rostests/winetests/gdiplus/CMakeLists.txt
+++ b/modules/rostests/winetests/gdiplus/CMakeLists.txt
@@ -14,9 +14,14 @@ list(APPEND SOURCE
 pen.c
 region.c
 stringformat.c
+precomp.h)
+
+add_executable(gdiplus_winetest
+${SOURCE}
+guid.c
 testlist.c)
 
-add_executable(gdiplus_winetest ${SOURCE})
 set_module_type(gdiplus_winetest win32cui)
 add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32)
+add_pch(gdiplus_winetest precomp.h SOURCE)
 add_rostests_file(TARGET gdiplus_winetest)
diff --git a/modules/rostests/winetests/gdiplus/brush.c 
b/modules/rostests/winetests/gdiplus/brush.c
index 759090bdbf..ec9a74ba15 100644
--- a/modules/rostests/winetests/gdiplus/brush.c
+++ b/modules/rostests/winetests/gdiplus/brush.c
@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include "windows.h"
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", 
expected, got)
 #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected 
%.2f, got %.2f\n", expected, got)
diff --git a/modules/rostests/winetests/gdiplus/customlinecap.c 
b/modules/rostests/winetests/gdiplus/customlinecap.c
index b406eccda9..8bfa06c0b4 100644
--- a/modules/rostests/winetests/gdiplus/customlinecap.c
+++ b/modules/rostests/winetests/gdiplus/customlinecap.c
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include "windows.h"
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", 
expected, got)
 #define expectf(expected, got) ok(got == expected, "Expected %.2f, got 
%.2f\n", expected, got)
diff --git a/modules/rostests/winetests/gdiplus/font.c 
b/modules/rostests/winetests/gdiplus/font.c
index f31a5ee4b8..b68c2ba539 100644
--- a/modules/rostests/winetests/gdiplus/font.c
+++ b/modules/rostests/winetests/gdiplus/font.c
@@ -19,18 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include "windows.h"
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", 
expected, got)
 #define expect_(expected, got, precision) ok(abs((expected) - (got)) <= 
(precision), "Expected %d, got %d\n", (expected), (got))
diff --git a/modules/rostests/winetests/gdiplus/graphics.c 
b/modules/rostests/winetests/gdiplus/graphics.c
index 33fee40d16..2ea529b496 100644
--- a/modules/rostests/winetests/gdiplus/graphics.c
+++ b/modules/rostests/winetests/gdiplus/graphics.c
@@ -19,17 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include "windows.h"
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", 
(INT)(expected), (INT)(got))
 #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= 
(precision),

[ros-diffs] [reactos] 01/01: [CRYPT32_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bd2230dc854ebaf60910a2b83365044e635e20f

commit 5bd2230dc854ebaf60910a2b83365044e635e20f
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 12:33:39 2017 +0100

[CRYPT32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/crypt32/CMakeLists.txt |  5 +++--
 modules/rostests/winetests/crypt32/base64.c   | 10 ++
 modules/rostests/winetests/crypt32/cert.c | 11 +--
 modules/rostests/winetests/crypt32/chain.c|  9 +
 modules/rostests/winetests/crypt32/crl.c  | 12 +---
 modules/rostests/winetests/crypt32/ctl.c  | 10 +-
 modules/rostests/winetests/crypt32/encode.c   |  9 +
 modules/rostests/winetests/crypt32/main.c | 10 +-
 modules/rostests/winetests/crypt32/message.c  |  9 +
 modules/rostests/winetests/crypt32/msg.c  | 11 +--
 modules/rostests/winetests/crypt32/object.c   |  8 +---
 modules/rostests/winetests/crypt32/oid.c  | 10 +-
 modules/rostests/winetests/crypt32/precomp.h  | 11 +++
 modules/rostests/winetests/crypt32/protectdata.c  |  9 +
 modules/rostests/winetests/crypt32/sip.c  | 10 ++
 modules/rostests/winetests/crypt32/store.c| 10 +-
 modules/rostests/winetests/crypt32/str.c  |  8 +---
 17 files changed, 31 insertions(+), 131 deletions(-)

diff --git a/modules/rostests/winetests/crypt32/CMakeLists.txt 
b/modules/rostests/winetests/crypt32/CMakeLists.txt
index 6211969dd3..169694b28d 100644
--- a/modules/rostests/winetests/crypt32/CMakeLists.txt
+++ b/modules/rostests/winetests/crypt32/CMakeLists.txt
@@ -17,9 +17,10 @@ list(APPEND SOURCE
 sip.c
 store.c
 str.c
-testlist.c)
+precomp.h)
 
-add_executable(crypt32_winetest ${SOURCE})
+add_executable(crypt32_winetest ${SOURCE} testlist.c)
 set_module_type(crypt32_winetest win32cui)
 add_importlibs(crypt32_winetest crypt32 advapi32 user32 shlwapi shell32 msvcrt 
kernel32)
+add_pch(crypt32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET crypt32_winetest)
diff --git a/modules/rostests/winetests/crypt32/base64.c 
b/modules/rostests/winetests/crypt32/base64.c
index 26ae20bead..4898d3897e 100644
--- a/modules/rostests/winetests/crypt32/base64.c
+++ b/modules/rostests/winetests/crypt32/base64.c
@@ -18,14 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-//#include 
-#include 
-#include 
-#include 
-//#include 
-#include 
-
-#include 
+
+#include "precomp.h"
 
 #define CERT_HEADER   "-BEGIN CERTIFICATE-\r\n"
 #define ALT_CERT_HEADER   "-BEGIN This is some arbitrary text that 
goes on and on-\r\n"
diff --git a/modules/rostests/winetests/crypt32/cert.c 
b/modules/rostests/winetests/crypt32/cert.c
index 28cc421cf8..8a8d36b926 100644
--- a/modules/rostests/winetests/crypt32/cert.c
+++ b/modules/rostests/winetests/crypt32/cert.c
@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include 
-#include 
-
-#include 
-#include 
-//#include 
-//#include 
-#include 
-
-#include 
+#include "precomp.h"
 
 static PCCERT_CONTEXT (WINAPI 
*pCertCreateSelfSignCertificate)(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,PCERT_NAME_BLOB,DWORD,PCRYPT_KEY_PROV_INFO,PCRYPT_ALGORITHM_IDENTIFIER,PSYSTEMTIME,PSYSTEMTIME,PCERT_EXTENSIONS);
 static BOOL (WINAPI 
*pCertGetValidUsages)(DWORD,PCCERT_CONTEXT*,int*,LPSTR*,DWORD*);
diff --git a/modules/rostests/winetests/crypt32/chain.c 
b/modules/rostests/winetests/crypt32/chain.c
index 30cbaebb95..e9e8634b2b 100644
--- a/modules/rostests/winetests/crypt32/chain.c
+++ b/modules/rostests/winetests/crypt32/chain.c
@@ -18,17 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-//#include 
+#include "precomp.h"
 
-#include 
-#include 
-//#include 
-#include 
 #include 
 
-#include 
-
 static const BYTE selfSignedCert[] = {
  0x30, 0x82, 0x01, 0x1f, 0x30, 0x81, 0xce, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02,
  0x10, 0xeb, 0x0d, 0x57, 0x2a, 0x9c, 0x09, 0xba, 0xa4, 0x4a, 0xb7, 0x25, 0x49,
diff --git a/modules/rostests/winetests/crypt32/crl.c 
b/modules/rostests/winetests/crypt32/crl.c
index 4a15498b2b..32460e32d9 100644
--- a/modules/rostests/winetests/crypt32/crl.c
+++ b/modules/rostests/winetests/crypt32/crl.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include 
-#include 
-
-#include 
-#include 
-//#include 
-//#include 
-#include 
-
-#include 
-
+#include "precomp.h"
 
 static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06,
  0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
diff --git a/modules/rostests/winetests/crypt32/ctl.c 
b/modules/rostests/winetests/crypt32/ctl.c
index

[ros-diffs] [reactos] 01/01: [COMDLG32_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0622ce1775a1a2fc45a6b5bebf1a1ce22a68eb7d

commit 0622ce1775a1a2fc45a6b5bebf1a1ce22a68eb7d
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 12:28:41 2017 +0100

[COMDLG32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/comdlg32/CMakeLists.txt |  9 +++--
 modules/rostests/winetests/comdlg32/filedlg.c  | 16 +---
 modules/rostests/winetests/comdlg32/finddlg.c  | 11 +--
 modules/rostests/winetests/comdlg32/fontdlg.c  | 14 +-
 modules/rostests/winetests/comdlg32/itemdlg.c  | 10 ++
 modules/rostests/winetests/comdlg32/precomp.h  | 18 ++
 modules/rostests/winetests/comdlg32/printdlg.c | 20 +---
 7 files changed, 31 insertions(+), 67 deletions(-)

diff --git a/modules/rostests/winetests/comdlg32/CMakeLists.txt 
b/modules/rostests/winetests/comdlg32/CMakeLists.txt
index b61e43056c..11afc77f49 100644
--- a/modules/rostests/winetests/comdlg32/CMakeLists.txt
+++ b/modules/rostests/winetests/comdlg32/CMakeLists.txt
@@ -7,10 +7,15 @@ list(APPEND SOURCE
 fontdlg.c
 itemdlg.c
 printdlg.c
-testlist.c)
+precomp.h)
+
+add_executable(comdlg32_winetest
+${SOURCE}
+testlist.c
+rsrc.rc)
 
-add_executable(comdlg32_winetest ${SOURCE} rsrc.rc)
 target_link_libraries(comdlg32_winetest uuid)
 set_module_type(comdlg32_winetest win32cui)
 add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 
msvcrt kernel32)
+add_pch(comdlg32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET comdlg32_winetest)
diff --git a/modules/rostests/winetests/comdlg32/filedlg.c 
b/modules/rostests/winetests/comdlg32/filedlg.c
index e779cd5536..514f2513a2 100644
--- a/modules/rostests/winetests/comdlg32/filedlg.c
+++ b/modules/rostests/winetests/comdlg32/filedlg.c
@@ -19,24 +19,10 @@
  *
  */
 
-//#include 
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 #include 
-#define COBJMACROS
 #include 
-
 #include 
 #include 
 
diff --git a/modules/rostests/winetests/comdlg32/finddlg.c 
b/modules/rostests/winetests/comdlg32/finddlg.c
index 5445d65e5e..99c9eb1e22 100644
--- a/modules/rostests/winetests/comdlg32/finddlg.c
+++ b/modules/rostests/winetests/comdlg32/finddlg.c
@@ -19,16 +19,7 @@
  *
  */
 
-//#include "windows.h"
-
-#define WIN32_NO_STATUS
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 static UINT ID_FINDMSGSTRING;
 
diff --git a/modules/rostests/winetests/comdlg32/fontdlg.c 
b/modules/rostests/winetests/comdlg32/fontdlg.c
index 6b59d7ba45..4a17bbcb1d 100644
--- a/modules/rostests/winetests/comdlg32/fontdlg.c
+++ b/modules/rostests/winetests/comdlg32/fontdlg.c
@@ -19,21 +19,9 @@
  *
  */
 
-#define WIN32_NO_STATUS
+#include "precomp.h"
 
-#include 
-
-//#include 
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include 
 #include 
-#include 
-//#include "objbase.h"
-
-#include 
 
 static int get_dpiy(void)
 {
diff --git a/modules/rostests/winetests/comdlg32/itemdlg.c 
b/modules/rostests/winetests/comdlg32/itemdlg.c
index e338dcb00e..f14a298de8 100644
--- a/modules/rostests/winetests/comdlg32/itemdlg.c
+++ b/modules/rostests/winetests/comdlg32/itemdlg.c
@@ -19,15 +19,9 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include 
-
-#define COBJMACROS
-#define CONST_VTABLE
+#include "precomp.h"
 
+#include 
 #include 
 
 #define IDT_CHANGEFILETYPE 500
diff --git a/modules/rostests/winetests/comdlg32/precomp.h 
b/modules/rostests/winetests/comdlg32/precomp.h
new file mode 100644
index 00..86ad3d3cf6
--- /dev/null
+++ b/modules/rostests/winetests/comdlg32/precomp.h
@@ -0,0 +1,18 @@
+#ifndef _COMDLG32_WINETEST_PRECOMP_H_
+#define _COMDLG32_WINETEST_PRECOMP_H_
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
+#define CONST_VTABLE
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#endif /* !_COMDLG32_WINETEST_PRECOMP_H_ */
diff --git a/modules/rostests/winetests/comdlg32/printdlg.c 
b/modules/rostests/winetests/comdlg32/printdlg.c
index 5592b8c6c9..b2c20744ee 100644
--- a/modules/rostests/winetests/comdlg32/printdlg.c
+++ b/modules/rostests/winetests/comdlg32/printdlg.c
@@ -20,25 +20,7 @@
  *
  */
 
-#define COBJMACROS
-#define CONST_VTABLE
-#define WIN32_NO_STATUS
-
-#include 
-
-//#include 
-#include 
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
+#include "precomp.h"
 
 /* ### */

[ros-diffs] [reactos] 01/01: [ADVAPI32_WINETEST] Add a PCH.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71ddf5374afe94770cace84664331f1d41bd8dfc

commit 71ddf5374afe94770cace84664331f1d41bd8dfc
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 12:24:27 2017 +0100

[ADVAPI32_WINETEST] Add a PCH.
---
 modules/rostests/winetests/advapi32/CMakeLists.txt |  5 +++--
 modules/rostests/winetests/advapi32/cred.c |  9 ++---
 modules/rostests/winetests/advapi32/crypt.c| 10 ++
 modules/rostests/winetests/advapi32/crypt_lmhash.c |  9 +
 modules/rostests/winetests/advapi32/crypt_md4.c| 10 +-
 modules/rostests/winetests/advapi32/crypt_md5.c|  7 +--
 modules/rostests/winetests/advapi32/crypt_sha.c|  8 +---
 modules/rostests/winetests/advapi32/eventlog.c | 18 +-
 modules/rostests/winetests/advapi32/lsa.c  | 21 +
 modules/rostests/winetests/advapi32/precomp.h  | 19 +++
 modules/rostests/winetests/advapi32/registry.c | 15 ++-
 modules/rostests/winetests/advapi32/security.c | 20 +---
 modules/rostests/winetests/advapi32/service.c  | 17 +
 13 files changed, 44 insertions(+), 124 deletions(-)

diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt 
b/modules/rostests/winetests/advapi32/CMakeLists.txt
index a148e08ddc..5d9cb9c3bd 100644
--- a/modules/rostests/winetests/advapi32/CMakeLists.txt
+++ b/modules/rostests/winetests/advapi32/CMakeLists.txt
@@ -13,9 +13,9 @@ list(APPEND SOURCE
 registry.c
 security.c
 service.c
-testlist.c)
+precomp.h)
 
-add_executable(advapi32_winetest ${SOURCE})
+add_executable(advapi32_winetest ${SOURCE} testlist.c)
 
 if(USE_CLANG_CL OR (NOT MSVC))
 add_target_compile_flags(advapi32_winetest "-Wno-format")
@@ -23,4 +23,5 @@ endif()
 
 set_module_type(advapi32_winetest win32cui)
 add_importlibs(advapi32_winetest advapi32 ole32 user32 msvcrt kernel32 ntdll)
+add_pch(advapi32_winetest precomp.h SOURCE)
 add_rostests_file(TARGET advapi32_winetest)
diff --git a/modules/rostests/winetests/advapi32/cred.c 
b/modules/rostests/winetests/advapi32/cred.c
index bb5fb4eace..38b23bc667 100644
--- a/modules/rostests/winetests/advapi32/cred.c
+++ b/modules/rostests/winetests/advapi32/cred.c
@@ -18,14 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-#include 
+#include "precomp.h"
 
-#include "windef.h"
-#include "winbase.h"
-#include "wincred.h"
-
-#include "wine/test.h"
+#include 
 
 static BOOL (WINAPI *pCredDeleteA)(LPCSTR,DWORD,DWORD);
 static BOOL (WINAPI *pCredEnumerateA)(LPCSTR,DWORD,DWORD *,PCREDENTIALA **);
diff --git a/modules/rostests/winetests/advapi32/crypt.c 
b/modules/rostests/winetests/advapi32/crypt.c
index 13671eb0c2..4e05a8a15f 100644
--- a/modules/rostests/winetests/advapi32/crypt.c
+++ b/modules/rostests/winetests/advapi32/crypt.c
@@ -18,15 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
+#include "precomp.h"
 
-#include "windef.h"
-#include "winbase.h"
-#include "wincrypt.h"
-#include "winerror.h"
-#include "winreg.h"
-
-#include "wine/test.h"
+#include 
 
 static const char szRsaBaseProv[] = MS_DEF_PROV_A;
 static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic 
Provider v11.2";
diff --git a/modules/rostests/winetests/advapi32/crypt_lmhash.c 
b/modules/rostests/winetests/advapi32/crypt_lmhash.c
index 7ea4fc4d76..4a5ca15dde 100644
--- a/modules/rostests/winetests/advapi32/crypt_lmhash.c
+++ b/modules/rostests/winetests/advapi32/crypt_lmhash.c
@@ -19,14 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winternl.h"
+#include "precomp.h"
 
 struct ustring {
 DWORD Length;
diff --git a/modules/rostests/winetests/advapi32/crypt_md4.c 
b/modules/rostests/winetests/advapi32/crypt_md4.c
index df36b36899..2b9d2412d3 100644
--- a/modules/rostests/winetests/advapi32/crypt_md4.c
+++ b/modules/rostests/winetests/advapi32/crypt_md4.c
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "wine/winternl.h"
+#include "precomp.h"
 
 typedef struct
 {
diff --git a/modules/rostests/winetests/advapi32/crypt_md5.c 
b/modules/rostests/winetests/advapi32/crypt_md5.c
index 4cf88688ea..cae4fc5229 100644
--- a/modules/rostests/winetests/advapi32/crypt_md5.c
+++ b/modules/rostests/winetests/advapi32/crypt_md5.c
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include 
-
-#include "wine/test.h"
-#include "windef.h"
-#include "winbase.h"
-#include

[ros-diffs] [reactos] 01/01: [WIN32KNT_APITEST] Improve the existing PCH and make use of it.

2017-12-17 Thread Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bf31bf2ab594635daea740b2f247fc95189d438

commit 3bf31bf2ab594635daea740b2f247fc95189d438
Author: Amine Khaldi 
AuthorDate: Sun Dec 17 12:17:19 2017 +0100

[WIN32KNT_APITEST] Improve the existing PCH and make use of it.
---
 modules/rostests/apitests/win32nt/CMakeLists.txt   |  6 -
 .../win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c|  2 ++
 .../win32nt/ntuser/NtUserSystemParametersInfo.c|  2 ++
 modules/rostests/apitests/win32nt/win32nt.h| 26 +-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt 
b/modules/rostests/apitests/win32nt/CMakeLists.txt
index a3ffa1ccbf..516e940dd3 100644
--- a/modules/rostests/apitests/win32nt/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/CMakeLists.txt
@@ -61,10 +61,13 @@ list(APPEND SOURCE
 ntuser/NtUserUpdatePerUserSystemParameters.c
 
 #osver.c
+win32nt.h)
+
+add_executable(win32knt_apitest
+${SOURCE}
 testlist.c
 w32knapi.rc)
 
-add_executable(win32knt_apitest ${SOURCE})
 target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
 set_module_type(win32knt_apitest win32cui)
 add_importlibs(win32knt_apitest
@@ -78,4 +81,5 @@ add_importlibs(win32knt_apitest
 ntdll)
 
 add_dependencies(win32knt_apitest xdk)
+add_pch(win32knt_apitest win32nt.h SOURCE)
 add_rostests_file(TARGET win32knt_apitest)
diff --git 
a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c 
b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
index 07961e9372..1105860c6b 100644
--- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
+++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
@@ -7,6 +7,8 @@
 
 #include 
 
+#include 
+
 /* Note : OsThunkDdQueryDirectDrawObject is the usermode name of 
NtGdiDdQueryDirectDrawObject
  *it lives in d3d8thk.dll and in windows 2000 it doing syscall direcly 
to win32k.sus
  *in windows xp and higher it call to gdi32.dll to DdEntry41 and it 
doing the syscall
diff --git 
a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c 
b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
index 5239dc587b..feb14b30c7 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
@@ -7,6 +7,8 @@
 
 #include 
 
+#include 
+
 static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse";
 //static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1";
 //static const WCHAR* VAL_MOUSE2 = L"MouseThreshold2";
diff --git a/modules/rostests/apitests/win32nt/win32nt.h 
b/modules/rostests/apitests/win32nt/win32nt.h
index 3cd54f85bc..6b0f6178d9 100644
--- a/modules/rostests/apitests/win32nt/win32nt.h
+++ b/modules/rostests/apitests/win32nt/win32nt.h
@@ -1,5 +1,5 @@
-
-#pragma once
+#ifndef _WIN32NT_APITEST_H_
+#define _WIN32NT_APITEST_H_
 
 /* Definitions */
 #define WIN32_NO_STATUS
@@ -11,34 +11,18 @@
 
 /* SDK/DDK/NDK Headers. */
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 
-#include 
+#include 
+#include 
 
 /* Public Win32K Headers */
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -51,4 +35,4 @@
 
 #define GdiHandleTable GdiQueryTable()
 
-
+#endif /* !_WIN32NT_APITEST_H_ */

[ros-diffs] [reactos] 01/01: [FS] During 1st stage, disable any FS we don't support install to in order to let RawFS these volumes. This avoids bloated setup and avoids potential bugs in 3rd party dri

[ros-diffs] [reactos] 03/03: [NTOSKRNL] Make again an attempt at killing the IopParseDevice() hack.

[ros-diffs] [reactos] 02/03: [FASFAT] Enable FAT volume dismount using VPB swapout

[ros-diffs] [reactos] 01/03: [USETUP] Our current FAT ChkDsk being a bit slow when using the right path make it only perform a full check if dirty bit is set (which should never happen cough).

[ros-diffs] [reactos] 01/01: [SETUP] Remove FSDs which have broken dismount implementation. This avoids issues when these partitions are formatted to FAT for setup.

[ros-diffs] [reactos] 01/01: [HAL] Use 64 bits for physical addresses.

[ros-diffs] [reactos] 01/01: [FASTFAT] Add a comment (and an ASSERT) in VfatCreateFile() that shows that my stats code is broken...

[ros-diffs] [reactos] 03/03: [FASTFAT] While closing FCBs on dismount, release from tail to head and not the contrary. It fixes assertion failure in vfatDestroyFCB() where we would have release parent

[ros-diffs] [reactos] 02/03: [FASTFAT] Fix a handle count leak on volume close. This can prevent locking a volume!

[ros-diffs] [reactos] 01/03: [FASTFAT] When not able to lock a volume due to open handles, print open handles

[ros-diffs] [reactos] 01/01: [RAPPS] Select 'Available' category by default.

[ros-diffs] [reactos] 01/01: [MSCONFIG_NEW] Temporarily "fix" the header of the SimpChinese resource file because this has nothing to do with Paint whatsoever. Proper headers will be used as soon as m

[ros-diffs] [reactos] 01/01: [TRANSLATION] Improve Simplified Chinese Translations.

[ros-diffs] [reactos] 01/01: [VFATLIB] Never touch the file system if not in interactive or RW mode. It's critical not to perform any write on a volume without an exclusive lock on it. That lock is on

[ros-diffs] [reactos] 01/01: [COMCTL32_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [SHELL32_APITEST] Improve the existing PCH and make use of it. Convert AddCommas.c to c++ in order to have it benefit from the PCH.

[ros-diffs] [reactos] 01/01: [GDI32_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [GDIPLUS_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [CRYPT32_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [COMDLG32_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [ADVAPI32_WINETEST] Add a PCH.

[ros-diffs] [reactos] 01/01: [WIN32KNT_APITEST] Improve the existing PCH and make use of it.

22 matches

Site Navigation

Mail list logo

Footer information