[ros-diffs] [tfaber] 75783: [USBPORT] - Begin implementing split transfers. Patch by Vadim Galyant.

2017-09-08 Thread tfaber
Author: tfaber
Date: Fri Sep  8 07:17:34 2017
New Revision: 75783

URL: http://svn.reactos.org/svn/reactos?rev=75783&view=rev
Log:
[USBPORT]
- Begin implementing split transfers. Patch by Vadim Galyant.

Added:
trunk/reactos/drivers/usb/usbport/trfsplit.c   (with props)
Modified:
trunk/reactos/drivers/usb/usbport/CMakeLists.txt
trunk/reactos/drivers/usb/usbport/endpoint.c
trunk/reactos/drivers/usb/usbport/queue.c
trunk/reactos/drivers/usb/usbport/usbport.c
trunk/reactos/drivers/usb/usbport/usbport.h
trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h

Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/CMakeLists.txt?rev=75783&r1=75782&r2=75783&view=diff
==
--- trunk/reactos/drivers/usb/usbport/CMakeLists.txt[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbport/CMakeLists.txt[iso-8859-1] Fri Sep  8 
07:17:34 2017
@@ -12,6 +12,7 @@
 power.c
 queue.c
 roothub.c
+trfsplit.c
 urb.c
 usb2.c
 usbport.c

Modified: trunk/reactos/drivers/usb/usbport/endpoint.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoint.c?rev=75783&r1=75782&r2=75783&view=diff
==
--- trunk/reactos/drivers/usb/usbport/endpoint.c[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbport/endpoint.c[iso-8859-1] Fri Sep  8 
07:17:34 2017
@@ -1279,8 +1279,7 @@
 
 if (Transfer->Flags & TRANSFER_FLAG_SPLITED)
 {
-DPRINT1("USBPORT_DmaEndpointActive: FIXME call 
USBPORT_CancelSplitTransfer\n");
-ASSERT(FALSE); //USBPORT_CancelSplitTransfer();
+USBPORT_CancelSplitTransfer(Transfer);
 }
 else
 {

Modified: trunk/reactos/drivers/usb/usbport/queue.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.c?rev=75783&r1=75782&r2=75783&view=diff
==
--- trunk/reactos/drivers/usb/usbport/queue.c   [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbport/queue.c   [iso-8859-1] Fri Sep  8 
07:17:34 2017
@@ -529,6 +529,8 @@
 PUSBPORT_TRANSFER Transfer;
 PUSBPORT_ENDPOINT Endpoint;
 PIRP irp;
+PUSBPORT_TRANSFER SplitTransfer;
+PLIST_ENTRY Entry;
 KIRQL OldIrql;
 
 DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp);
@@ -543,30 +545,52 @@
 
 irp = USBPORT_FindActiveTransferIrp(FdoDevice, Irp);
 
-if (irp)
-{
-Urb = URB_FROM_IRP(irp);
-Transfer = Urb->UrbControlTransfer.hca.Reserved8[0];
-Endpoint = Transfer->Endpoint;
-
-DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, 
Transfer - %p\n",
-irp,
-Urb,
-Transfer);
-
-KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock);
-Transfer->Flags |= TRANSFER_FLAG_CANCELED;
-KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock);
-
+if (!irp)
+{
 KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql);
-
-USBPORT_InvalidateEndpointHandler(FdoDevice,
-  Endpoint,
-  INVALIDATE_ENDPOINT_WORKER_THREAD);
 return;
 }
 
+Urb = URB_FROM_IRP(irp);
+Transfer = Urb->UrbControlTransfer.hca.Reserved8[0];
+Endpoint = Transfer->Endpoint;
+
+DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer 
- %p\n",
+irp,
+Urb,
+Transfer);
+
+KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock);
+
+Transfer->Flags |= TRANSFER_FLAG_CANCELED;
+
+if (Transfer->Flags & TRANSFER_FLAG_PARENT)
+{
+KeAcquireSpinLockAtDpcLevel(&Transfer->TransferSpinLock);
+
+Entry = Transfer->SplitTransfersList.Flink;
+
+while (Entry && Entry != &Transfer->SplitTransfersList)
+{
+SplitTransfer = CONTAINING_RECORD(Entry,
+  USBPORT_TRANSFER,
+  SplitLink);
+
+SplitTransfer->Flags |= TRANSFER_FLAG_CANCELED;
+
+Entry = Entry->Flink;
+}
+
+KeReleaseSpinLockFromDpcLevel(&Transfer->TransferSpinLock);
+}
+
+KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock);
 KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql);
+
+USBPORT_InvalidateEndpointHandler(FdoDevice,
+  Endpoint,
+  INVALIDATE_ENDPOINT_WORKER_THREAD);
+return;
 }
 
 VOID

Added: trunk/reactos/drivers/usb/usbport/trfsplit.c
URL: 
http://svn.reactos.org/svn/reactos/t

[ros-diffs] [tfaber] 75784: [USBPORT][USBHUB_NEW] - Add license headers

2017-09-08 Thread tfaber
Author: tfaber
Date: Fri Sep  8 07:32:39 2017
New Revision: 75784

URL: http://svn.reactos.org/svn/reactos?rev=75784&view=rev
Log:
[USBPORT][USBHUB_NEW]
- Add license headers

Modified:
trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h
trunk/reactos/drivers/usb/usbhub_new/debug.c
trunk/reactos/drivers/usb/usbhub_new/ioctl.c
trunk/reactos/drivers/usb/usbhub_new/pnp.c
trunk/reactos/drivers/usb/usbhub_new/power.c
trunk/reactos/drivers/usb/usbhub_new/usbhub.c
trunk/reactos/drivers/usb/usbhub_new/usbhub.h
trunk/reactos/drivers/usb/usbport/debug.c
trunk/reactos/drivers/usb/usbport/device.c
trunk/reactos/drivers/usb/usbport/endpoint.c
trunk/reactos/drivers/usb/usbport/iface.c
trunk/reactos/drivers/usb/usbport/ioctl.c
trunk/reactos/drivers/usb/usbport/iso.c
trunk/reactos/drivers/usb/usbport/pnp.c
trunk/reactos/drivers/usb/usbport/power.c
trunk/reactos/drivers/usb/usbport/queue.c
trunk/reactos/drivers/usb/usbport/roothub.c
trunk/reactos/drivers/usb/usbport/trfsplit.c
trunk/reactos/drivers/usb/usbport/urb.c
trunk/reactos/drivers/usb/usbport/usb2.c
trunk/reactos/drivers/usb/usbport/usbdebug.h
trunk/reactos/drivers/usb/usbport/usbport.c
trunk/reactos/drivers/usb/usbport/usbport.h

Modified: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h?rev=75784&r1=75783&r2=75784&view=diff
==
--- trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] Fri Sep  8 
07:32:39 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: ReactOS USB Hub Driver
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: USBHub debugging declarations
+ * COPYRIGHT:   Copyright 2017 Vadim Galyant 
+ */
+
 #ifndef DBG_UHUB_H__
 #define DBG_UHUB_H__
 

Modified: trunk/reactos/drivers/usb/usbhub_new/debug.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/debug.c?rev=75784&r1=75783&r2=75784&view=diff
==
--- trunk/reactos/drivers/usb/usbhub_new/debug.c[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub_new/debug.c[iso-8859-1] Fri Sep  8 
07:32:39 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: ReactOS USB Hub Driver
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: USBHub debugging functions
+ * COPYRIGHT:   Copyright 2017 Vadim Galyant 
+ */
+
 #include "usbhub.h"
 
 //#define NDEBUG

Modified: trunk/reactos/drivers/usb/usbhub_new/ioctl.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/ioctl.c?rev=75784&r1=75783&r2=75784&view=diff
==
--- trunk/reactos/drivers/usb/usbhub_new/ioctl.c[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub_new/ioctl.c[iso-8859-1] Fri Sep  8 
07:32:39 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: ReactOS USB Hub Driver
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: USBHub I/O control functions
+ * COPYRIGHT:   Copyright 2017 Vadim Galyant 
+ */
+
 #include "usbhub.h"
 
 #define NDEBUG

Modified: trunk/reactos/drivers/usb/usbhub_new/pnp.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pnp.c?rev=75784&r1=75783&r2=75784&view=diff
==
--- trunk/reactos/drivers/usb/usbhub_new/pnp.c  [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub_new/pnp.c  [iso-8859-1] Fri Sep  8 
07:32:39 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: ReactOS USB Hub Driver
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: USBHub plug and play functions
+ * COPYRIGHT:   Copyright 2017 Vadim Galyant 
+ */
+
 #include "usbhub.h"
 
 #define NDEBUG

Modified: trunk/reactos/drivers/usb/usbhub_new/power.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/power.c?rev=75784&r1=75783&r2=75784&view=diff
==
--- trunk/reactos/drivers/usb/usbhub_new/power.c[iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub_new/power.c[iso-8859-1] Fri Sep  8 
07:32:39 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: ReactOS USB Hub Driver
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: USBHub power handling functions
+ * COPYRIGHT:   Copyright 2017 Vadim Galyant 
+ */
+
 #include "usbhub.h"
 
 #define NDEBUG

Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usbhub.c?rev=75784&r1=75783&r2=75784&view=diff

[ros-diffs] [pschweitzer] 75785: [DDK] Define IDE_COMMAND_FLUSH_CACHE CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 07:55:16 2017
New Revision: 75785

URL: http://svn.reactos.org/svn/reactos?rev=75785&view=rev
Log:
[DDK]
Define IDE_COMMAND_FLUSH_CACHE

CORE-13763

Modified:
trunk/reactos/sdk/include/ddk/ata.h

Modified: trunk/reactos/sdk/include/ddk/ata.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ata.h?rev=75785&r1=75784&r2=75785&view=diff
==
--- trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] Fri Sep  8 07:55:16 2017
@@ -252,6 +252,7 @@
 } IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA;
 #include 
 
-#define IDE_COMMAND_IDENTIFY 0xEC
+#define IDE_COMMAND_FLUSH_CACHE 0xE7
+#define IDE_COMMAND_IDENTIFY0xEC
 
 #endif




[ros-diffs] [pschweitzer] 75786: [BTRFS] Sync btrfs to 1.0. CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 08:02:43 2017
New Revision: 75786

URL: http://svn.reactos.org/svn/reactos?rev=75786&view=rev
Log:
[BTRFS]
Sync btrfs to 1.0.

CORE-13763

Added:
trunk/reactos/drivers/filesystems/btrfs/guid.c   (with props)
trunk/reactos/drivers/filesystems/btrfs/scrub.c   (with props)
trunk/reactos/drivers/filesystems/btrfs/send.c   (with props)
trunk/reactos/drivers/filesystems/btrfs/volume.c   (with props)
Modified:
trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
trunk/reactos/drivers/filesystems/btrfs/balance.c
trunk/reactos/drivers/filesystems/btrfs/btrfs.c
trunk/reactos/drivers/filesystems/btrfs/btrfs.h
trunk/reactos/drivers/filesystems/btrfs/btrfs.rc
trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h
trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h
trunk/reactos/drivers/filesystems/btrfs/cache.c
trunk/reactos/drivers/filesystems/btrfs/calcthread.c
trunk/reactos/drivers/filesystems/btrfs/compress.c
trunk/reactos/drivers/filesystems/btrfs/crc32c.c
trunk/reactos/drivers/filesystems/btrfs/create.c
trunk/reactos/drivers/filesystems/btrfs/devctrl.c
trunk/reactos/drivers/filesystems/btrfs/dirctrl.c
trunk/reactos/drivers/filesystems/btrfs/extent-tree.c
trunk/reactos/drivers/filesystems/btrfs/fastio.c
trunk/reactos/drivers/filesystems/btrfs/fileinfo.c
trunk/reactos/drivers/filesystems/btrfs/flushthread.c
trunk/reactos/drivers/filesystems/btrfs/free-space.c
trunk/reactos/drivers/filesystems/btrfs/fsctl.c
trunk/reactos/drivers/filesystems/btrfs/galois.c
trunk/reactos/drivers/filesystems/btrfs/pnp.c
trunk/reactos/drivers/filesystems/btrfs/read.c
trunk/reactos/drivers/filesystems/btrfs/registry.c
trunk/reactos/drivers/filesystems/btrfs/reparse.c
trunk/reactos/drivers/filesystems/btrfs/search.c
trunk/reactos/drivers/filesystems/btrfs/security.c
trunk/reactos/drivers/filesystems/btrfs/treefuncs.c
trunk/reactos/drivers/filesystems/btrfs/worker-thread.c
trunk/reactos/drivers/filesystems/btrfs/write.c
trunk/reactos/media/doc/README.FSD

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/balance.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/balance.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/btrfs.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/btrfs.h?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/btrfs.rc?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/cache.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/cache.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/calcthread.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/calcthread.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/compress.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/compress.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/crc32c.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/crc32c.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/create.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/create.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/devctrl.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/devctrl.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/dirctrl.c?rev=75786&r1=75785&r2=75786&view=diff

Modified: trunk/reactos/drivers/filesystems/btrfs/extent-tree.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dr

[ros-diffs] [pschweitzer] 75787: [BTRFS] Fix build CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 08:15:21 2017
New Revision: 75787

URL: http://svn.reactos.org/svn/reactos?rev=75787&view=rev
Log:
[BTRFS]
Fix build

CORE-13763

Modified:
trunk/reactos/drivers/filesystems/btrfs/balance.c
trunk/reactos/sdk/include/psdk/ntddstor.h

Modified: trunk/reactos/drivers/filesystems/btrfs/balance.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/balance.c?rev=75787&r1=75786&r2=75787&view=diff
==
--- trunk/reactos/drivers/filesystems/btrfs/balance.c   [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/balance.c   [iso-8859-1] Fri Sep  8 
08:15:21 2017
@@ -67,8 +67,10 @@
 LIST_ENTRY list_entry;
 } data_reloc_ref;
 
+#ifndef __REACTOS__
 #ifndef _MSC_VER // not in mingw yet
 #define DEVICE_DSM_FLAG_TRIM_NOT_FS_ALLOCATED 0x8000
+#endif
 #endif
 
 #define BALANCE_UNIT 0x10 // only read 1 MB at a time

Modified: trunk/reactos/sdk/include/psdk/ntddstor.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntddstor.h?rev=75787&r1=75786&r2=75787&view=diff
==
--- trunk/reactos/sdk/include/psdk/ntddstor.h   [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/ntddstor.h   [iso-8859-1] Fri Sep  8 
08:15:21 2017
@@ -566,6 +566,8 @@
 
 typedef ULONG DEVICE_DATA_MANAGEMENT_SET_ACTION;
 
+#define DEVICE_DSM_FLAG_TRIM_NOT_FS_ALLOCATED 0x8000
+
 typedef struct _DEVICE_DATA_SET_RANGE {
   LONGLONG StartingOffset;
   ULONGLONG LengthInBytes;




[ros-diffs] [tfaber] 75788: [NTFS] - Delete autorun.inf, which SVN decided to improperly merge. See r71342. - Use trunk's version of the large MCB implementation, which already has Trevor's changes.

2017-09-08 Thread tfaber
Author: tfaber
Date: Fri Sep  8 10:36:40 2017
New Revision: 75788

URL: http://svn.reactos.org/svn/reactos?rev=75788&view=rev
Log:
[NTFS]
- Delete autorun.inf, which SVN decided to improperly merge. See r71342.
- Use trunk's version of the large MCB implementation, which already has 
Trevor's changes.

Added:
branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c   (props changed)
  - copied unchanged from r75747, trunk/reactos/ntoskrnl/fsrtl/largemcb.c
Removed:
branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf

Removed: branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf
URL: 
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf?rev=75787
==
--- branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf   [iso-8859-1] (original)
+++ branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf   (removed)
@@ -1,3 +0,0 @@
-[autorun]
-open=reactos\welcome.exe
-icon=icon.ico

Propchange: branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c
--
svn:eol-style = native

Propchange: branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c
--
--- svn:mergeinfo   (added)
+++ svn:mergeinfo   Fri Sep  8 10:36:40 2017
@@ -0,0 +1,25 @@
+/branches/GSoC_2011/GSoC_Network/ntoskrnl/fsrtl/largemcb.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/ntoskrnl/fsrtl/largemcb.c:51550
+/branches/GSoC_2011/TcpIpDriver/ntoskrnl/fsrtl/largemcb.c:51551-53074,53076-53119
+/branches/GSoC_2016/AHCI/ntoskrnl/fsrtl/largemcb.c:71203-73603
+/branches/GSoC_2016/USB/ntoskrnl/fsrtl/largemcb.c:72365-73604
+/branches/GSoC_Network/ntoskrnl/fsrtl/largemcb.c:51545-51546
+/branches/cmake-bringup/ntoskrnl/fsrtl/largemcb.c:50484,50693,50719,51544-52564
+/branches/colins-printing-for-freedom/reactos/ntoskrnl/fsrtl/largemcb.c:67543-68405,68407-68414,68417-70595
+/branches/condrv_restructure/ntoskrnl/fsrtl/largemcb.c:63104-65657
+/branches/header-work/ntoskrnl/fsrtl/largemcb.c:45691-47721
+/branches/kd++/ntoskrnl/fsrtl/largemcb.c:58883-58973
+/branches/kernel-fun/reactos/ntoskrnl/fsrtl/largemcb.c:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253
+/branches/ntvdm/ntoskrnl/fsrtl/largemcb.c:59241-63176
+/branches/reactos-yarotows/ntoskrnl/fsrtl/largemcb.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/ntoskrnl/fsrtl/largemcb.c:49994-49995
+/branches/ros-amd64-bringup/ntoskrnl/fsrtl/largemcb.c:36852
+/branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/largemcb.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502
 
,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
+/branches/ros-branch-0_3_15-lt2013/ntoskrnl/fsrtl/largemcb.c:59059
+/branches/ros-csrss/ntoskrnl/fsrtl/largemcb.c:57561-58762
+/branches/shell-experiments/ntoskrnl/fsrtl/largemcb.c:61927-65494
+/branches/shell32_new-bringup/ntoskrnl/fsrtl/largemcb.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/ntoskrnl/fsrtl/largemcb.c:48720,48840-48841,49424-49426,49454
+/branches/usb-bringup/ntoskrnl/fsrtl/largemcb.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
+/branches/usb-bringup-trunk/ntoskrnl/fsrtl/largemcb.c:55019-55543,55548-4,6-

[ros-diffs] [pschweitzer] 75789: [XDK] Add a Win8.1 FSCTL CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 11:39:17 2017
New Revision: 75789

URL: http://svn.reactos.org/svn/reactos?rev=75789&view=rev
Log:
[XDK]
Add a Win8.1 FSCTL

CORE-13763

Modified:
trunk/reactos/sdk/include/xdk/iotypes.h

Modified: trunk/reactos/sdk/include/xdk/iotypes.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?rev=75789&r1=75788&r2=75789&view=diff
==
--- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Fri Sep  8 
11:39:17 2017
@@ -5828,6 +5828,12 @@
 
 #endif
 
+#if (_WIN32_WINNT >= 0x0603)
+
+#define FSCTL_DUPLICATE_EXTENTS_TO_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 
209, METHOD_BUFFERED, FILE_WRITE_DATA)
+
+#endif
+
 #define FSCTL_MARK_AS_SYSTEM_HIVE   FSCTL_SET_BOOTLOADER_ACCESSED
 
 typedef struct _PATHNAME_BUFFER {




[ros-diffs] [pschweitzer] 75790: [PSDK] Define FSCTL_GET_INTEGRITY_INFORMATION, FSCTL_SET_INTEGRITY_INFORMATION, FSCTL_DUPLICATE_EXTENTS_TO_FILE and their associated structures CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 11:40:52 2017
New Revision: 75790

URL: http://svn.reactos.org/svn/reactos?rev=75790&view=rev
Log:
[PSDK]
Define FSCTL_GET_INTEGRITY_INFORMATION, FSCTL_SET_INTEGRITY_INFORMATION, 
FSCTL_DUPLICATE_EXTENTS_TO_FILE and their associated structures

CORE-13763

Modified:
trunk/reactos/sdk/include/psdk/winioctl.h

Modified: trunk/reactos/sdk/include/psdk/winioctl.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.h?rev=75790&r1=75789&r2=75790&view=diff
==
--- trunk/reactos/sdk/include/psdk/winioctl.h   [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/winioctl.h   [iso-8859-1] Fri Sep  8 
11:40:52 2017
@@ -635,12 +635,47 @@
 #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, 
METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif
 
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+#define FSCTL_GET_INTEGRITY_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 159, 
METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define FSCTL_SET_INTEGRITY_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 160, 
METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
+#endif
+
+#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE)
+#define FSCTL_DUPLICATE_EXTENTS_TO_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 209, 
METHOD_BUFFERED, FILE_WRITE_DATA)
+#endif
+
 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K)
 #define VOLUME_IS_DIRTY  (0x0001)
 #define VOLUME_UPGRADE_SCHEDULED (0x0002)
 #define VOLUME_SESSION_OPEN  (0x0004)
 #endif
 
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+typedef struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {
+  WORD ChecksumAlgorithm;
+  WORD Reserved;
+  DWORD Flags;
+  DWORD ChecksumChunkSizeInBytes;
+  DWORD ClusterSizeInBytes;
+} FSCTL_GET_INTEGRITY_INFORMATION_BUFFER, 
*PFSCTL_GET_INTEGRITY_INFORMATION_BUFFER;
+
+typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER {
+  WORD ChecksumAlgorithm;
+  WORD Reserved;
+  DWORD Flags;
+} FSCTL_SET_INTEGRITY_INFORMATION_BUFFER, 
*PFSCTL_SET_INTEGRITY_INFORMATION_BUFFER;
+#endif
+
+#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE)
+typedef struct _DUPLICATE_EXTENTS_DATA {
+HANDLE FileHandle;
+LARGE_INTEGER SourceFileOffset;
+LARGE_INTEGER TargetFileOffset;
+LARGE_INTEGER ByteCount;
+} DUPLICATE_EXTENTS_DATA, *PDUPLICATE_EXTENTS_DATA;
+
+#endif
+
 #endif
 
 #ifdef _MSC_VER




[ros-diffs] [pschweitzer] 75791: [NDK] Add a missing typedef

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 11:41:31 2017
New Revision: 75791

URL: http://svn.reactos.org/svn/reactos?rev=75791&view=rev
Log:
[NDK]
Add a missing typedef

Modified:
trunk/reactos/sdk/include/ndk/rtltypes.h

Modified: trunk/reactos/sdk/include/ndk/rtltypes.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtltypes.h?rev=75791&r1=75790&r2=75791&view=diff
==
--- trunk/reactos/sdk/include/ndk/rtltypes.h[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/ndk/rtltypes.h[iso-8859-1] Fri Sep  8 
11:41:31 2017
@@ -1438,7 +1438,7 @@
 UmsSchedulerThreadYield = 2,
 } RTL_UMS_SCHEDULER_REASON, *PRTL_UMS_SCHEDULER_REASON;
 
-enum _RTL_UMSCTX_FLAGS
+typedef enum _RTL_UMSCTX_FLAGS
 {
 UMSCTX_SCHEDULED_THREAD_BIT = 0,
 #if (NTDDI_VERSION < NTDDI_WIN8)




[ros-diffs] [pschweitzer] 75792: [NDK] - Make FILE_INFORMATION_CLASS definition consistent with XDK - Add the definition of FILE_ACCESS_INFORMATION CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 11:46:06 2017
New Revision: 75792

URL: http://svn.reactos.org/svn/reactos?rev=75792&view=rev
Log:
[NDK]
- Make FILE_INFORMATION_CLASS definition consistent with XDK
- Add the definition of FILE_ACCESS_INFORMATION

CORE-13763

Modified:
trunk/reactos/sdk/include/ndk/iotypes.h

Modified: trunk/reactos/sdk/include/ndk/iotypes.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/iotypes.h?rev=75792&r1=75791&r2=75792&view=diff
==
--- trunk/reactos/sdk/include/ndk/iotypes.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/ndk/iotypes.h [iso-8859-1] Fri Sep  8 
11:46:06 2017
@@ -314,6 +314,25 @@
 FileIdFullDirectoryInformation,
 FileValidDataLengthInformation,
 FileShortNameInformation,
+#if (NTDDI_VERSION >= NTDDI_VISTA)
+FileIoCompletionNotificationInformation,
+FileIoStatusBlockRangeInformation,
+FileIoPriorityHintInformation,
+FileSfioReserveInformation,
+FileSfioVolumeInformation,
+FileHardLinkInformation,
+FileProcessIdsUsingFileInformation,
+FileNormalizedNameInformation,
+FileNetworkPhysicalNameInformation,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN7)
+FileIdGlobalTxDirectoryInformation,
+FileIsRemoteDeviceInformation,
+FileUnusedInformation,
+FileNumaNodeInformation,
+FileStandardLinkInformation,
+FileRemoteProtocolInformation,
+#endif
 FileMaximumInformation
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 
@@ -437,6 +456,11 @@
 {
 ULONG EaSize;
 } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
+
+typedef struct _FILE_ACCESS_INFORMATION
+{
+ACCESS_MASK AccessFlags;
+} FILE_ACCESS_INFORMATION, *PFILE_ACCESS_INFORMATION;
 
 typedef struct _FILE_COMPRESSION_INFORMATION
 {




[ros-diffs] [pschweitzer] 75793: [SHELLBTRFS] Sync the btrfs shell extension to 1.0 CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 11:59:42 2017
New Revision: 75793

URL: http://svn.reactos.org/svn/reactos?rev=75793&view=rev
Log:
[SHELLBTRFS]
Sync the btrfs shell extension to 1.0

CORE-13763

Added:
trunk/reactos/dll/shellext/shellbtrfs/balance.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/balance.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/devices.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/devices.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/recv.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/recv.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/scrub.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/scrub.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/send.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/send.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/shellext.h   (with props)
trunk/reactos/dll/shellext/shellbtrfs/volpropsheet.cpp   (with props)
trunk/reactos/dll/shellext/shellbtrfs/volpropsheet.h   (with props)
Modified:
trunk/reactos/dll/shellext/shellbtrfs/CMakeLists.txt
trunk/reactos/dll/shellext/shellbtrfs/contextmenu.cpp
trunk/reactos/dll/shellext/shellbtrfs/contextmenu.h
trunk/reactos/dll/shellext/shellbtrfs/factory.cpp
trunk/reactos/dll/shellext/shellbtrfs/factory.h
trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.cpp
trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.h
trunk/reactos/dll/shellext/shellbtrfs/main.cpp
trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp
trunk/reactos/dll/shellext/shellbtrfs/propsheet.h
trunk/reactos/dll/shellext/shellbtrfs/resource.h
trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.rc
trunk/reactos/media/doc/README.FSD

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/reactos/dll/shellext/shellbtrfs/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/CMakeLists.txt?rev=75793&r1=75792&r2=75793&view=diff

Added: trunk/reactos/dll/shellext/shellbtrfs/balance.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/balance.cpp?rev=75793

Added: trunk/reactos/dll/shellext/shellbtrfs/balance.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/balance.h?rev=75793

Modified: trunk/reactos/dll/shellext/shellbtrfs/contextmenu.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/contextmenu.cpp?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/contextmenu.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/contextmenu.h?rev=75793&r1=75792&r2=75793&view=diff

Added: trunk/reactos/dll/shellext/shellbtrfs/devices.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/devices.cpp?rev=75793

Added: trunk/reactos/dll/shellext/shellbtrfs/devices.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/devices.h?rev=75793

Modified: trunk/reactos/dll/shellext/shellbtrfs/factory.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/factory.cpp?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/factory.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/factory.h?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.cpp?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.h?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/main.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/main.cpp?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp?rev=75793&r1=75792&r2=75793&view=diff

Modified: trunk/reactos/dll/shellext/shellbtrfs/propsheet.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/propsheet.h?rev=75793&r1=75792&r2=75793&view=diff

Added: trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp?rev=75793

Added: trunk/reactos/dll/shellext/shellbtrfs/recv.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/recv.cpp?rev=75793

Added: trunk/reactos/dll/shellext/shellbtrfs/recv.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/recv.h?rev=75793

Modified: trunk/reactos/dll/shellext/shellbtrf

[ros-diffs] [pschweitzer] 75794: [SHELLBTRFS] Add missing header CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 12:01:47 2017
New Revision: 75794

URL: http://svn.reactos.org/svn/reactos?rev=75794&view=rev
Log:
[SHELLBTRFS]
Add missing header

CORE-13763

Modified:
trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp

Modified: trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp?rev=75794&r1=75793&r2=75794&view=diff
==
--- trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp   [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/shellbtrfs/reactos.cpp   [iso-8859-1] Fri Sep  8 
12:01:47 2017
@@ -1,3 +1,11 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT: BtrFS FSD for ReactOS
+ * FILE:dll/shellext/shellbtrfs/reactos.cpp
+ * PURPOSE: ReactOS glue for Win8.1
+ * PROGRAMMERS: Pierre Schweitzer 
+ */
+
 #include "shellext.h"
 #include 
 #include 




[ros-diffs] [pschweitzer] 75795: [SHELLBTRFS] Fix MSVC build? CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 12:13:10 2017
New Revision: 75795

URL: http://svn.reactos.org/svn/reactos?rev=75795&view=rev
Log:
[SHELLBTRFS]
Fix MSVC build?

CORE-13763

Modified:
trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp

Modified: trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp?rev=75795&r1=75794&r2=75795&view=diff
==
--- trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp [iso-8859-1] Fri Sep  8 
12:13:10 2017
@@ -41,6 +41,7 @@
 
 #define SUBVOL_ROOT_INODE 0x100
 
+#ifndef __REACTOS__
 #ifndef __MINGW32__ // in winternl.h in mingw
 
 typedef struct _FILE_ACCESS_INFORMATION {
@@ -49,6 +50,7 @@
 
 #define FileAccessInformation (FILE_INFORMATION_CLASS)8
 
+#endif
 #endif
 
 HRESULT __stdcall BtrfsPropSheet::QueryInterface(REFIID riid, void **ppObj) {




[ros-diffs] [pschweitzer] 75796: [BTRFSLIB] Sync to 1.0 CORE-13763

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 16:31:32 2017
New Revision: 75796

URL: http://svn.reactos.org/svn/reactos?rev=75796&view=rev
Log:
[BTRFSLIB]
Sync to 1.0

CORE-13763

Modified:
trunk/reactos/media/doc/README.FSD
trunk/reactos/sdk/lib/fslib/btrfslib/CMakeLists.txt
trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c

Modified: trunk/reactos/media/doc/README.FSD
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.FSD?rev=75796&r1=75795&r2=75796&view=diff
==
--- trunk/reactos/media/doc/README.FSD  [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.FSD  [iso-8859-1] Fri Sep  8 16:31:32 2017
@@ -5,7 +5,7 @@
 
 reactos/drivers/filesystems/btrfs   # Synced to 1.0
 reactos/dll/shellext/shellbtrfs # Synced to 1.0
-reactos/sdk/lib/fslib/btrfslib  # Synced to 0.8
+reactos/sdk/lib/fslib/btrfslib  # Synced to 1.0
 
 The following FSD are shared with: http://www.ext2fsd.com/
 

Modified: trunk/reactos/sdk/lib/fslib/btrfslib/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/btrfslib/CMakeLists.txt?rev=75796&r1=75795&r2=75796&view=diff
==
--- trunk/reactos/sdk/lib/fslib/btrfslib/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/btrfslib/CMakeLists.txt [iso-8859-1] Fri Sep  8 
16:31:32 2017
@@ -1,3 +1,6 @@
+
+include_directories(
+${REACTOS_SOURCE_DIR}/drivers/filesystems/btrfs)
 
 add_library(btrfslib btrfslib.c)
 add_dependencies(btrfslib psdk)

Modified: trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c?rev=75796&r1=75795&r2=75796&view=diff
==
--- trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] Fri Sep  8 
16:31:32 2017
@@ -1,17 +1,17 @@
-/* Copyright (c) Mark Harmstone 2016
- * 
+/* Copyright (c) Mark Harmstone 2016-17
+ *
  * This file is part of WinBtrfs.
- * 
+ *
  * WinBtrfs is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public Licence as published by
  * the Free Software Foundation, either version 3 of the Licence, or
  * (at your option) any later version.
- * 
+ *
  * WinBtrfs is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public Licence for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public Licence
  * along with WinBtrfs.  If not, see . */
 
@@ -32,11 +32,12 @@
 #include 
 #endif
 #include 
+#include 
 #include 
 #include 
 #ifdef __REACTOS__
-#include "../../drivers/filesystems/btrfs/btrfs.h"
-#include "../../drivers/filesystems/btrfs/btrfsioctl.h"
+#include "btrfs.h"
+#include "btrfsioctl.h"
 #else
 #include "../btrfs.h"
 #include "../btrfsioctl.h"
@@ -46,9 +47,11 @@
 #define FSCTL_LOCK_VOLUME   CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  6, 
METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  7, 
METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSCTL_DISMOUNT_VOLUME   CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  8, 
METHOD_BUFFERED, FILE_ANY_ACCESS)
-#endif
-
-#ifndef __REACTOS__
+
+#ifndef _MSC_VER // not in mingw yet
+#define DEVICE_DSM_FLAG_TRIM_NOT_FS_ALLOCATED 0x8000
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -65,7 +68,34 @@
 #ifdef __cplusplus
 }
 #endif
-
+#endif
+
+// These are undocumented, and what comes from format.exe
+typedef struct {
+void* table;
+void* unk1;
+WCHAR* string;
+} DSTRING;
+
+typedef struct {
+void* table;
+} STREAM_MESSAGE;
+
+#define FORMAT_FLAG_QUICK_FORMAT0x0001
+#define FORMAT_FLAG_UNKNOWN10x0002
+#define FORMAT_FLAG_DISMOUNT_FIRST  0x0004
+#define FORMAT_FLAG_UNKNOWN20x0040
+#define FORMAT_FLAG_LARGE_RECORDS   0x0100
+#define FORMAT_FLAG_INTEGRITY_DISABLE   0x0100
+
+typedef struct {
+UINT16 unk1;
+UINT16 unk2;
+UINT32 flags;
+DSTRING* label;
+} options;
+
+#ifndef __REACTOS__
 FORCEINLINE VOID InitializeListHead(PLIST_ENTRY ListHead) {
 ListHead->Flink = ListHead->Blink = ListHead;
 }
@@ -129,6 +159,8 @@
 0))
 
 HMODULE module;
+ULONG def_sector_size = 0, def_node_size = 0;
+UINT64 def_incompat_flags = BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF | 
BTRFS_INCOMPAT_FLAGS_SKINNY_METADATA;
 
 // the following definitions come from fmifs.h in ReactOS
 
@@ -187,50 +219,50 @@
 typedef BOOLEAN (NTAPI* PFMIFSCALLBACK)(CALLBACKCOMMAND Command, ULONG 
SubAction, PVOID ActionInfo);
 
 stati

[ros-diffs] [khornicek] 75797: [NOTEPAD] - don't allow multiple instances of the find/replace dialog CORE-13744

2017-09-08 Thread khornicek
Author: khornicek
Date: Fri Sep  8 19:09:48 2017
New Revision: 75797

URL: http://svn.reactos.org/svn/reactos?rev=75797&view=rev
Log:
[NOTEPAD]
- don't allow multiple instances of the find/replace dialog

CORE-13744


Modified:
trunk/reactos/base/applications/notepad/dialog.c

Modified: trunk/reactos/base/applications/notepad/dialog.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/dialog.c?rev=75797&r1=75796&r2=75797&view=diff
==
--- trunk/reactos/base/applications/notepad/dialog.c[iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/dialog.c[iso-8859-1] Fri Sep  8 
19:09:48 2017
@@ -1043,6 +1043,12 @@
 
 static VOID DIALOG_SearchDialog(FINDPROC pfnProc)
 {
+if (Globals.hFindReplaceDlg != NULL)
+{
+SetFocus(Globals.hFindReplaceDlg);
+return;
+}
+
 ZeroMemory(&Globals.find, sizeof(Globals.find));
 Globals.find.lStructSize = sizeof(Globals.find);
 Globals.find.hwndOwner = Globals.hMainWnd;
@@ -1057,7 +1063,7 @@
 /* notify us of incoming events using hMainWnd Window Messages*/
 
 Globals.hFindReplaceDlg = pfnProc(&Globals.find);
-assert(Globals.hFindReplaceDlg != 0);
+assert(Globals.hFindReplaceDlg != NULL);
 }
 
 VOID DIALOG_Search(VOID)




[ros-diffs] [khornicek] 75798: [SHELL32] - some tweaks, optimizations and fixes for the free/used disk space pie chart drawing code to properly cover all corner cases and remove minor drawing artifact

2017-09-08 Thread khornicek
Author: khornicek
Date: Fri Sep  8 20:00:59 2017
New Revision: 75798

URL: http://svn.reactos.org/svn/reactos?rev=75798&view=rev
Log:
[SHELL32]
- some tweaks, optimizations and fixes for the free/used disk space pie chart 
drawing code to properly cover all corner cases and remove minor drawing 
artifacts
CORE-8757

Modified:
trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp

Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp?rev=75798&r1=75797&r2=75798&view=diff
==
--- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp   [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp   [iso-8859-1] 
Fri Sep  8 20:00:59 2017
@@ -211,63 +211,65 @@
 {
 HBRUSH hBlueBrush = CreateSolidBrush(RGB(0, 0, 255));
 HBRUSH hMagBrush = CreateSolidBrush(RGB(255, 0, 255));
+HBRUSH hbrOld;
 HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128));
 HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128));
-
-INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right)/2;
-INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 
10)/2;
+HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkMagPen);
+INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right) / 2;
+INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10) 
/ 2;
 INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left;
 INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10;
-TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, 
M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f, cx);
-
-HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush);
-INT xRadial = xCenter + 
(INT)(cos(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cx/2);
-INT yRadial = yCenter - 
(INT)(sin(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cy/2);
-if (m_FreeSpacePerc > 0)
-{
-Pie(pDrawItem->hDC,
-pDrawItem->rcItem.left,
-pDrawItem->rcItem.top,
-pDrawItem->rcItem.right,
-pDrawItem->rcItem.bottom - 10,
-pDrawItem->rcItem.left,
-yCenter,
-xRadial,
-yRadial);
-
-SelectObject(pDrawItem->hDC, hBlueBrush);
-Pie(pDrawItem->hDC,
-pDrawItem->rcItem.left,
-pDrawItem->rcItem.top,
-pDrawItem->rcItem.right,
-pDrawItem->rcItem.bottom - 10,
-xRadial,
-yRadial,
-pDrawItem->rcItem.left,
-yCenter);
-SelectObject(pDrawItem->hDC, hbrOld);
-}
-else
-{
-SelectObject(pDrawItem->hDC, hBlueBrush);
-Ellipse(pDrawItem->hDC,
-pDrawItem->rcItem.left,
-pDrawItem->rcItem.top,
-pDrawItem->rcItem.right,
-pDrawItem->rcItem.bottom - 10);
-}
-HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkMagPen);
+INT xRadial = xCenter + (INT)(cos(M_PI + m_FreeSpacePerc / 100.0f * 
M_PI * 2.0f) * cx / 2);
+INT yRadial = yCenter - (INT)(sin(M_PI + m_FreeSpacePerc / 100.0f * 
M_PI * 2.0f) * cy / 2);
+
+TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, 
M_PI+m_FreeSpacePerc / 100.0f * M_PI * 2.0f, cx);
+
 for (INT x = pDrawItem->rcItem.left; x < pDrawItem->rcItem.right; ++x)
 {
+double cos_val = (x - xCenter) * 2.0f / cx;
+INT y = yCenter + (INT)(sin(acos(cos_val)) * cy / 2) - 1;
+
 if (m_FreeSpacePerc < 50 && x == xRadial)
 SelectObject(pDrawItem->hDC, hDarkBluePen);
 
-double cos_val = (x - xCenter)*2.0f/cx;
-INT y = yCenter+(INT)(sin(acos(cos_val))*cy/2);
 MoveToEx(pDrawItem->hDC, x, y, NULL);
 LineTo(pDrawItem->hDC, x, y + 10);
 }
+
 SelectObject(pDrawItem->hDC, hOldPen);
+
+if (m_FreeSpacePerc > 50)
+{
+hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush);
+
+Ellipse(pDrawItem->hDC, pDrawItem->rcItem.left, 
pDrawItem->rcItem.top,
+pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10);
+
+SelectObject(pDrawItem->hDC, hBlueBrush);
+
+if (m_FreeSpacePerc < 100)
+{
+Pie(pDrawItem->hDC, pDrawItem->rcItem.left, 
pDrawItem->rcItem.top, pDrawItem->rcItem.right,
+pDrawItem->rcItem.bottom - 10, xRadial, yRadial, 
pDrawItem->rcItem.left, yCenter);
+}
+}
+else
+{
+hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hBlueBrush);
+
+Ellipse(pDrawItem->hDC, pDrawItem->rcI

[ros-diffs] [mjansen] 75799: [APPHELP][ACPPAGE][SHIMLIB] Update license headers

2017-09-08 Thread mjansen
Author: mjansen
Date: Fri Sep  8 20:19:51 2017
New Revision: 75799

URL: http://svn.reactos.org/svn/reactos?rev=75799&view=rev
Log:
[APPHELP][ACPPAGE][SHIMLIB] Update license headers

Modified:
trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt
trunk/reactos/dll/appcompat/apphelp/apphelp.c
trunk/reactos/dll/appcompat/apphelp/apphelp.h
trunk/reactos/dll/appcompat/apphelp/dbgheap.c
trunk/reactos/dll/appcompat/apphelp/hsdb.c
trunk/reactos/dll/appcompat/apphelp/layer.c
trunk/reactos/dll/appcompat/apphelp/sdbapi.c
trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c
trunk/reactos/dll/appcompat/apphelp/sdbpapi.h
trunk/reactos/dll/appcompat/apphelp/sdbread.c
trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c
trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h
trunk/reactos/dll/appcompat/apphelp/sdbtagid.h
trunk/reactos/dll/appcompat/apphelp/sdbtypes.h
trunk/reactos/dll/appcompat/apphelp/sdbwrite.c
trunk/reactos/dll/appcompat/apphelp/sdbwrite.h
trunk/reactos/dll/appcompat/apphelp/shimeng.c
trunk/reactos/dll/appcompat/apphelp/shimeng.h
trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl
trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl
trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c
trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h
trunk/reactos/dll/shellext/acppage/ACPPage.cpp
trunk/reactos/dll/shellext/acppage/CLayerStringList.hpp
trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp
trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp

Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt?rev=75799&r1=75798&r2=75799&view=diff
==
--- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt  [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt  [iso-8859-1] Fri Sep  8 
20:19:51 2017
@@ -19,11 +19,20 @@
 sdbwrite.c
 shimeng.c
 apphelp.spec
+${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c)
+
+list(APPEND HEADERS
 apphelp.h
-${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c)
+sdbpapi.h
+sdbstringtable.h
+sdbtagid.h
+sdbtypes.h
+sdbwrite.h
+shimeng.h)
 
 add_library(apphelp SHARED
 ${SOURCE}
+${HEADERS}
 apphelp.rc
 ${CMAKE_CURRENT_BINARY_DIR}/apphelp.def)
 

Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apphelp.c?rev=75799&r1=75798&r2=75799&view=diff
==
--- trunk/reactos/dll/appcompat/apphelp/apphelp.c   [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/apphelp.c   [iso-8859-1] Fri Sep  8 
20:19:51 2017
@@ -1,21 +1,10 @@
 /*
- * Copyright 2011 André Hentschel
- * Copyright 2013 Mislav Blažević
- * Copyright 2015-2017 Mark Jansen (mark.jan...@reactos.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * PROJECT: ReactOS Application compatibility module
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: apphelp entrypoint / generic interface functions
+ * COPYRIGHT:   Copyright 2011 André Hentschel
+ *  Copyright 2013 Mislav Blaževic
+ *  Copyright 2015-2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
 #define WIN32_NO_STATUS

Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apphelp.h?rev=75799&r1=75798&r2=75799&view=diff
==
--- trunk/reactos/dll/appcompat/apphelp/apphelp.h   [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/apphelp.h   [iso-8859-1] Fri Sep  8 
20:19:51 2017
@@ -1,20 +1,9 @@
 /*
- * Copyright 2013 Mislav Blažević
- * Copyright 2015-2017 Mark Jansen (mark.jan...@reactos.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your 

[ros-diffs] [khornicek] 75800: [WIN32SS|KBDHID] - fix some typos and copypastas

2017-09-08 Thread khornicek
Author: khornicek
Date: Fri Sep  8 20:20:34 2017
New Revision: 75800

URL: http://svn.reactos.org/svn/reactos?rev=75800&view=rev
Log:
[WIN32SS|KBDHID]
- fix some typos and copypastas

Modified:
trunk/reactos/drivers/hid/kbdhid/kbdhid.c
trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c
trunk/reactos/win32ss/gdi/ntgdi/bitblt.c

Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.c?rev=75800&r1=75799&r2=75800&view=diff
==
--- trunk/reactos/drivers/hid/kbdhid/kbdhid.c   [iso-8859-1] (original)
+++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c   [iso-8859-1] Fri Sep  8 
20:20:34 2017
@@ -372,7 +372,7 @@
 if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < 
sizeof(MOUSE_ATTRIBUTES))
 {
 /* invalid request */
-DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too 
small\n");
+DPRINT1("[KBDHID] IOCTL_KEYBOARD_QUERY_ATTRIBUTES Buffer too 
small\n");
 Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL;
 IoCompleteRequest(Irp, IO_NO_INCREMENT);
 return STATUS_BUFFER_TOO_SMALL;

Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c?rev=75800&r1=75799&r2=75800&view=diff
==
--- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c[iso-8859-1] Fri Sep  8 
20:20:34 2017
@@ -436,7 +436,7 @@
 /* CBM_CREATDIB needs Data. */
 if (pbmiConverted == NULL)
 {
-DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n");
+DPRINT1("CBM_CREATDIB needs a BITMAPINFO!\n");
 goto Exit;
 }
 

Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c?rev=75800&r1=75799&r2=75800&view=diff
==
--- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c[iso-8859-1] Fri Sep  8 
20:20:34 2017
@@ -382,7 +382,7 @@
 ahDC[1] = UsesSource ? hdcSrc : NULL;
 if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, 
GDIObjType_DC_TYPE))
 {
-WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to 
NtGdiAlphaBlend\n", hdcDest, hdcSrc);
+WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to 
NtGdiMaskBlt\n", hdcDest, hdcSrc);
 EngSetLastError(ERROR_INVALID_HANDLE);
 return FALSE;
 }
@@ -393,7 +393,7 @@
 if (NULL == DCDest)
 {
 if(DCSrc) DC_UnlockDc(DCSrc);
-WARN("Invalid destination dc handle (0x%p) passed to NtGdiBitBlt\n", 
hdcDest);
+WARN("Invalid destination dc handle (0x%p) passed to NtGdiMaskBlt\n", 
hdcDest);
 return FALSE;
 }
 




[ros-diffs] [mjansen] 75801: [ACLAYERS][ACGENRAL] Update license headers + include cleanup.

2017-09-08 Thread mjansen
Author: mjansen
Date: Fri Sep  8 20:29:16 2017
New Revision: 75801

URL: http://svn.reactos.org/svn/reactos?rev=75801&view=rev
Log:
[ACLAYERS][ACGENRAL] Update license headers + include cleanup.

Modified:
trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c
trunk/reactos/dll/appcompat/shims/genral/main.c
trunk/reactos/dll/appcompat/shims/genral/themes.c
trunk/reactos/dll/appcompat/shims/layer/dispmode.c
trunk/reactos/dll/appcompat/shims/layer/main.c
trunk/reactos/dll/appcompat/shims/layer/versionlie.c
trunk/reactos/dll/appcompat/shims/layer/versionlie.inl
trunk/reactos/dll/appcompat/shims/layer/vmhorizon.c

Modified: trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c?rev=75801&r1=75800&r2=75801&view=diff
==
--- trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c [iso-8859-1] 
(original)
+++ trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c [iso-8859-1] 
Fri Sep  8 20:29:16 2017
@@ -1,12 +1,13 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS Shim library
- * FILE:dll/appcompat/shims/genral/ignoredbgout.c
- * PURPOSE: Ignore debug output shim
- * PROGRAMMER:  Mark Jansen
+ * PROJECT: ReactOS 'General' Shim library
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Ignore debug output shim
+ * COPYRIGHT:   Copyright 2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
-#include 
+#define WIN32_NO_STATUS
+#include 
+#include 
 #include 
 #include 
 

Modified: trunk/reactos/dll/appcompat/shims/genral/main.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral/main.c?rev=75801&r1=75800&r2=75801&view=diff
==
--- trunk/reactos/dll/appcompat/shims/genral/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/shims/genral/main.c [iso-8859-1] Fri Sep  8 
20:29:16 2017
@@ -1,12 +1,13 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS Shim library
- * FILE:dll/appcompat/shims/genral/main.c
- * PURPOSE: Shim entrypoint
- * PROGRAMMER:  Mark Jansen
+ * PROJECT: ReactOS 'General' Shim library
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Shim entrypoint
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
-#include 
+#define WIN32_NO_STATUS
+#include 
+#include 
 #include 
 #include 
 

Modified: trunk/reactos/dll/appcompat/shims/genral/themes.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral/themes.c?rev=75801&r1=75800&r2=75801&view=diff
==
--- trunk/reactos/dll/appcompat/shims/genral/themes.c   [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/shims/genral/themes.c   [iso-8859-1] Fri Sep  8 
20:29:16 2017
@@ -1,12 +1,15 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS Shim library
- * FILE:dll/appcompat/shims/genral/themes.c
- * PURPOSE: Theme related shims
- * PROGRAMMER:  Mark Jansen (mark.jan...@reactos.org)
+ * PROJECT: ReactOS 'General' Shim library
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Theme related shims
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
-#include 
+#define WIN32_NO_STATUS
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 

Modified: trunk/reactos/dll/appcompat/shims/layer/dispmode.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/dispmode.c?rev=75801&r1=75800&r2=75801&view=diff
==
--- trunk/reactos/dll/appcompat/shims/layer/dispmode.c  [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/shims/layer/dispmode.c  [iso-8859-1] Fri Sep  8 
20:29:16 2017
@@ -1,14 +1,16 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS Shim library
- * FILE:dll/appcompat/shims/layer/dispmode.c
- * PURPOSE: Display settings related shims
- * PROGRAMMER:  Mark Jansen
+ * PROJECT: ReactOS 'Layers' Shim library
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Display settings related shims
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
-#include 
+#define WIN32_NO_STATUS
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
 
 
 #define SHIM_NS Force8BitColor

Modified: trunk/reactos/dll/appcompat/shims/layer/main.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/l

[ros-diffs] [mjansen] 75802: [XML2SDB][SHIMDBG] Update license headers

2017-09-08 Thread mjansen
Author: mjansen
Date: Fri Sep  8 20:31:28 2017
New Revision: 75802

URL: http://svn.reactos.org/svn/reactos?rev=75802&view=rev
Log:
[XML2SDB][SHIMDBG] Update license headers

Modified:
trunk/reactos/sdk/tools/xml2sdb/main.cpp
trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp
trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h
trunk/rosapps/applications/devutils/shimdbg/shimdbg.c

Modified: trunk/reactos/sdk/tools/xml2sdb/main.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/main.cpp?rev=75802&r1=75801&r2=75802&view=diff
==
--- trunk/reactos/sdk/tools/xml2sdb/main.cpp[iso-8859-1] (original)
+++ trunk/reactos/sdk/tools/xml2sdb/main.cpp[iso-8859-1] Fri Sep  8 
20:31:28 2017
@@ -1,10 +1,8 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS xml to sdb converter
- * FILE:sdk/tools/xml2sdb/main.cpp
- * PURPOSE: Implement platform agnostic read / write / allocation 
functions, parse commandline
- * PROGRAMMERS: Mark Jansen (mark.jan...@reactos.org)
- *
+ * PROJECT: xml2sdb
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Implement platform agnostic read / write / allocation 
functions, parse commandline
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
 #include "xml2sdb.h"

Modified: trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp?rev=75802&r1=75801&r2=75802&view=diff
==
--- trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp [iso-8859-1] (original)
+++ trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp [iso-8859-1] Fri Sep  8 
20:31:28 2017
@@ -1,10 +1,8 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT: ReactOS xml to sdb converter
- * FILE:sdk/tools/xml2sdb/xml2sdb.cpp
- * PURPOSE: Conversion functions from xml -> db
- * PROGRAMMERS: Mark Jansen (mark.jan...@reactos.org)
- *
+ * PROJECT: xml2sdb
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Conversion functions from xml -> db
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
 #include "xml2sdb.h"

Modified: trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h?rev=75802&r1=75801&r2=75802&view=diff
==
--- trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h   [iso-8859-1] (original)
+++ trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h   [iso-8859-1] Fri Sep  8 
20:31:28 2017
@@ -1,3 +1,10 @@
+/*
+ * PROJECT: xml2sdb
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: .
+ * COPYRIGHT:   Copyright 2016,2017 Mark Jansen (mark.jan...@reactos.org)
+ */
+
 #pragma once
 
 #include 

Modified: trunk/rosapps/applications/devutils/shimdbg/shimdbg.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/shimdbg/shimdbg.c?rev=75802&r1=75801&r2=75802&view=diff
==
--- trunk/rosapps/applications/devutils/shimdbg/shimdbg.c   [iso-8859-1] 
(original)
+++ trunk/rosapps/applications/devutils/shimdbg/shimdbg.c   [iso-8859-1] 
Fri Sep  8 20:31:28 2017
@@ -1,8 +1,8 @@
 /*
- * PROJECT: shimdbg utility for WINE and ReactOS
- * LICENSE: BSD - See COPYING.ARM in the top level directory
- * PURPOSE: Test tool for SHIM engine caching.
- * PROGRAMMER:  Mark Jansen
+ * PROJECT: shimdbg
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Test tool for SHIM engine caching
+ * COPYRIGHT:   Copyright 2016-2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
 #include 




[ros-diffs] [mjansen] 75803: [APPHELP_APITEST][APPSHIM_APITEST] Update the license headers

2017-09-08 Thread mjansen
Author: mjansen
Date: Fri Sep  8 20:33:40 2017
New Revision: 75803

URL: http://svn.reactos.org/svn/reactos?rev=75803&view=rev
Log:
[APPHELP_APITEST][APPSHIM_APITEST] Update the license headers

Modified:
trunk/rostests/apitests/apphelp/apphelp.c
trunk/rostests/apitests/apphelp/data.c
trunk/rostests/apitests/apphelp/db.cpp
trunk/rostests/apitests/apphelp/env.c
trunk/rostests/apitests/apphelp/layerapi.c
trunk/rostests/apitests/appshim/dispmode.c
trunk/rostests/apitests/appshim/versionlie.c

Modified: trunk/rostests/apitests/apphelp/apphelp.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.c?rev=75803&r1=75802&r2=75803&view=diff
==
--- trunk/rostests/apitests/apphelp/apphelp.c   [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/apphelp.c   [iso-8859-1] Fri Sep  8 
20:33:40 2017
@@ -1,23 +1,11 @@
 /*
- * Copyright 2012 Detlef Riekenberg
- * Copyright 2013 Mislav Blažević
- * Copyright 2015,2016 Mark Jansen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * PROJECT: apphelp_apitest
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Misc apphelp tests
+ * COPYRIGHT:   Copyright 2012 Detlef Riekenberg
+ *  Copyright 2013 Mislav Blažević
+ *  Copyright 2015-2017 Mark Jansen (mark.jan...@reactos.org)
  */
-
 
 #include 
 #define WIN32_NO_STATUS

Modified: trunk/rostests/apitests/apphelp/data.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?rev=75803&r1=75802&r2=75803&view=diff
==
--- trunk/rostests/apitests/apphelp/data.c  [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/data.c  [iso-8859-1] Fri Sep  8 
20:33:40 2017
@@ -1,19 +1,8 @@
 /*
- * Copyright 2015,2016 Mark Jansen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * PROJECT: apphelp_apitest
+ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE: Common data / functions for apphelp_apitest
+ * COPYRIGHT:   Copyright 2015-2017 Mark Jansen (mark.jan...@reactos.org)
  */
 
 #include 

Modified: trunk/rostests/apitests/apphelp/db.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.cpp?rev=75803&r1=75802&r2=75803&view=diff
==
--- trunk/rostests/apitests/apphelp/db.cpp  [iso-8859-1] (original)
+++ trunk/rostests/apitests/apphelp/db.cpp  [iso-8859-1] Fri Sep  8 
20:33:40 2017
@@ -1,23 +1,11 @@
 /*
- * Copyright 2012 Detlef Riekenberg
- * Copyright 2013 Mislav Blažević
- * Copyright 2015-2017 Mark Jansen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * PROJECT: apphelp_apitest
+ * LICENSE: GPL-2.0+ (https://spd

[ros-diffs] [pschweitzer] 75804: [FSUTIL] Implement fsutil hardlink create

2017-09-08 Thread pschweitzer
Author: pschweitzer
Date: Fri Sep  8 20:51:16 2017
New Revision: 75804

URL: http://svn.reactos.org/svn/reactos?rev=75804&view=rev
Log:
[FSUTIL]
Implement fsutil hardlink create

Added:
trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c   (with props)
Modified:
trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt
trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c

Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt?rev=75804&r1=75803&r2=75804&view=diff
==
--- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt  
[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt  
[iso-8859-1] Fri Sep  8 20:51:16 2017
@@ -3,6 +3,7 @@
 dirty.c
 fsinfo.c
 fsutil.c
+hardlink.c
 fsutil.h)
 add_executable(fsutil ${SOURCE} fsutil.rc)
 set_module_type(fsutil win32cui UNICODE)

Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c?rev=75804&r1=75803&r2=75804&view=diff
==
--- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c[iso-8859-1] 
(original)
+++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c[iso-8859-1] 
Fri Sep  8 20:51:16 2017
@@ -11,11 +11,13 @@
 /* Add handlers here for commands */
 int DirtyMain(int argc, const TCHAR *argv[]);
 int FsInfoMain(int argc, const TCHAR *argv[]);
+int HardLinkMain(int argc, const TCHAR *argv[]);
 static HandlerItem HandlersList[] =
 {
 /* Proc, name, help */
 { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") },
 { FsInfoMain, _T("fsinfo"), _T("Gathers informations about file systems") 
},
+{ HardLinkMain, _T("hardlink"), _T("Handles hard links") },
 };
 
 static void

Added: trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c?rev=75804
==
--- trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c  (added)
+++ trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c  [iso-8859-1] 
Fri Sep  8 20:51:16 2017
@@ -0,0 +1,71 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT: ReactOS FS utility tool
+ * FILE:base/applications/cmdutils/hardlink.c
+ * PURPOSE: FSutil hard links handling
+ * PROGRAMMERS: Pierre Schweitzer 
+ */
+
+#include "fsutil.h"
+
+/* Add handlers here for subcommands */
+static int CreateMain(int argc, const TCHAR *argv[]);
+static HandlerItem HandlersList[] =
+{
+/* Proc, name, help */
+{ CreateMain, _T("create"), _T("Create a new hard link") },
+};
+
+static int
+CreateMain(int argc, const TCHAR *argv[])
+{
+TCHAR Source[MAX_PATH], Target[MAX_PATH];
+
+/* We need a source and a destination */
+if (argc < 3)
+{
+_ftprintf(stderr, _T("Usage: fsutil hardlink create  
\n"));
+_ftprintf(stderr, _T("\tFor example: fsutil hardlink create 
c:\\target.txt c:\\source.txt\n"));
+return 1;
+}
+
+/* Get full names */
+if (GetFullPathName(argv[1], MAX_PATH, Target, NULL) == 0)
+{
+PrintErrorMessage(GetLastError());
+return 1;
+}
+
+if (GetFullPathName(argv[2], MAX_PATH, Source, NULL) == 0)
+{
+PrintErrorMessage(GetLastError());
+return 1;
+}
+
+/* Simply delegate to kernel32 */
+if (!CreateHardLink(Target, Source, NULL))
+{
+PrintErrorMessage(GetLastError());
+return 1;
+}
+
+/* Print the status */
+_ftprintf(stdout, _T("Hard link created for %s <=> %s\n"), Target, Source);
+
+return 0;
+}
+
+static void
+PrintUsage(const TCHAR * Command)
+{
+PrintDefaultUsage(_T(" HARDLINK "), Command, (HandlerItem *)&HandlersList,
+  (sizeof(HandlersList) / sizeof(HandlersList[0])));
+}
+
+int
+HardLinkMain(int argc, const TCHAR *argv[])
+{
+return FindHandler(argc, argv, (HandlerItem *)&HandlersList,
+   (sizeof(HandlersList) / sizeof(HandlersList[0])),
+   PrintUsage);
+}

Propchange: trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c
--
svn:eol-style = native