[ros-diffs] [pschweitzer] 76018: [NDK] Define REPARSE_DATA_BUFFER so that we can stop redefining it everywhere...

Author: pschweitzer
Date: Sun Oct  1 12:56:00 2017
New Revision: 76018

URL: http://svn.reactos.org/svn/reactos?rev=76018&view=rev
Log:
[NDK]
Define REPARSE_DATA_BUFFER so that we can stop redefining it everywhere...

Modified:
    trunk/reactos/dll/shellext/shellbtrfs/shellext.h
    trunk/reactos/dll/win32/kernel32/client/file/create.c
    trunk/reactos/dll/win32/kernel32/client/file/dir.c
    trunk/reactos/sdk/include/ndk/iotypes.h

Modified: trunk/reactos/dll/shellext/shellbtrfs/shellext.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/sh…
==============================================================================
--- trunk/reactos/dll/shellext/shellbtrfs/shellext.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/shellbtrfs/shellext.h	[iso-8859-1] Sun Oct  1 12:56:00
2017
@@ -114,6 +114,7 @@
 #endif
 #endif
 
+#ifndef __REACTOS__
 typedef struct _REPARSE_DATA_BUFFER {
     ULONG ReparseTag;
     USHORT ReparseDataLength;
@@ -144,6 +145,7 @@
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 
 #define SYMLINK_FLAG_RELATIVE 1
+#endif
 
 #ifndef FILE_SUPPORTS_BLOCK_REFCOUNTING
 

Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/file/create.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/file/create.c	[iso-8859-1] Sun Oct  1 12:56:00
2017
@@ -20,36 +20,6 @@
 #if DBG
 DEBUG_CHANNEL(kernel32file);
 #endif
-
-#define SYMLINK_FLAG_RELATIVE   1
-
-typedef struct _REPARSE_DATA_BUFFER {
-    ULONG  ReparseTag;
-    USHORT ReparseDataLength;
-    USHORT Reserved;
-    union {
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT SubstituteNameLength;
-            USHORT PrintNameOffset;
-            USHORT PrintNameLength;
-            ULONG Flags;
-            WCHAR PathBuffer[1];
-        } SymbolicLinkReparseBuffer;
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT SubstituteNameLength;
-            USHORT PrintNameOffset;
-            USHORT PrintNameLength;
-            WCHAR PathBuffer[1];
-        } MountPointReparseBuffer;
-        struct {
-            UCHAR  DataBuffer[1];
-        } GenericReparseBuffer;
-    };
-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
-
-#define REPARSE_DATA_BUFFER_HEADER_SIZE   FIELD_OFFSET(REPARSE_DATA_BUFFER,
GenericReparseBuffer)
 
 /* FUNCTIONS ****************************************************************/
 

Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/file/dir.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/file/dir.c	[iso-8859-1] Sun Oct  1 12:56:00
2017
@@ -26,33 +26,6 @@
    s[8] == 'm' && s[9] == 'e' && s[10] == '{'
&&   \
    s[19] == '-' && s[24] == '-' && s[29] == '-'
&& \
    s[34] == '-' && s[47] == '}')
-
-/* FIXME - Get it out of here */
-typedef struct _REPARSE_DATA_BUFFER {
-    ULONG  ReparseTag;
-    USHORT ReparseDataLength;
-    USHORT Reserved;
-    union {
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT SubstituteNameLength;
-            USHORT PrintNameOffset;
-            USHORT PrintNameLength;
-            ULONG Flags;
-            WCHAR PathBuffer[1];
-        } SymbolicLinkReparseBuffer;
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT SubstituteNameLength;
-            USHORT PrintNameOffset;
-            USHORT PrintNameLength;
-            WCHAR PathBuffer[1];
-        } MountPointReparseBuffer;
-        struct {
-            UCHAR  DataBuffer[1];
-        } GenericReparseBuffer;
-    };
-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 
 /* FUNCTIONS *****************************************************************/
 

Modified: trunk/reactos/sdk/include/ndk/iotypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/iotypes.h?…
==============================================================================
--- trunk/reactos/sdk/include/ndk/iotypes.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/ndk/iotypes.h	[iso-8859-1] Sun Oct  1 12:56:00 2017
@@ -1314,6 +1314,38 @@
 #define IOCTL_TAPE_CREATE_PARTITION     \
     CTL_CODE(FILE_DEVICE_TAPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
 
+//
+// Reparse points
+//
+
+#define SYMLINK_FLAG_RELATIVE   1
+
+typedef struct _REPARSE_DATA_BUFFER {
+  ULONG ReparseTag;
+  USHORT ReparseDataLength;
+  USHORT Reserved;
+  _ANONYMOUS_UNION union {
+    struct {
+      USHORT SubstituteNameOffset;
+      USHORT SubstituteNameLength;
+      USHORT PrintNameOffset;
+      USHORT PrintNameLength;
+      ULONG Flags;
+      WCHAR PathBuffer[1];
+    } SymbolicLinkReparseBuffer;
+    struct {
+      USHORT SubstituteNameOffset;
+      USHORT SubstituteNameLength;
+      USHORT PrintNameOffset;
+      USHORT PrintNameLength;
+      WCHAR PathBuffer[1];
+    } MountPointReparseBuffer;
+    struct {
+      UCHAR DataBuffer[1];
+    } GenericReparseBuffer;
+  } DUMMYUNIONNAME;
+} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
+
 #endif // NTOS_MODE_USER
 
 #endif