From 889b50cfdf8c3a4dfa603f362c15ff71642daba7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 6 Jun 2015 13:48:19 +0000
Subject: [PATCH] [UDFS] Fix includes. CORE-9774

svn path=/trunk/; revision=68040
---
 .../drivers/filesystems/udfs/CMakeLists.txt   |  2 +-
 reactos/drivers/filesystems/udfs/devcntrl.cpp |  4 +--
 reactos/drivers/filesystems/udfs/mem.cpp      |  2 +-
 reactos/drivers/filesystems/udfs/mem.h        |  2 +-
 reactos/drivers/filesystems/udfs/misc.cpp     |  5 ++--
 reactos/drivers/filesystems/udfs/ntifs_ex.h   |  2 +-
 reactos/drivers/filesystems/udfs/protos.h     |  2 +-
 reactos/drivers/filesystems/udfs/struct.h     |  6 ++--
 reactos/drivers/filesystems/udfs/sys_spec.cpp |  4 +--
 reactos/drivers/filesystems/udfs/sys_spec.h   |  2 +-
 .../filesystems/udfs/udf_info/physical.cpp    |  2 +-
 .../drivers/filesystems/udfs/udf_info/udf.h   |  4 +--
 .../filesystems/udfs/udf_info/udf_info.h      |  4 +--
 .../filesystems/udfs/udf_info/udf_rel.h       |  4 +--
 reactos/drivers/filesystems/udfs/udffs.h      | 30 +++++++++----------
 reactos/drivers/filesystems/udfs/wcache.cpp   |  2 +-
 reactos/drivers/filesystems/udfs/wcache.h     |  2 +-
 17 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/reactos/drivers/filesystems/udfs/CMakeLists.txt b/reactos/drivers/filesystems/udfs/CMakeLists.txt
index db9ada319ce..2f3d6835443 100644
--- a/reactos/drivers/filesystems/udfs/CMakeLists.txt
+++ b/reactos/drivers/filesystems/udfs/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories(include)
+include_directories(Include)
 
 set_cpp(WITH_RUNTIME)
 
diff --git a/reactos/drivers/filesystems/udfs/devcntrl.cpp b/reactos/drivers/filesystems/udfs/devcntrl.cpp
index 218722289a2..a407dd89eb0 100644
--- a/reactos/drivers/filesystems/udfs/devcntrl.cpp
+++ b/reactos/drivers/filesystems/udfs/devcntrl.cpp
@@ -15,10 +15,10 @@
 
 #include "udffs.h"
 
-#include "..\CDRW\scsi_port.h"
+#include "CDRW/scsi_port.h"
 
 #ifdef EVALUATION_TIME_LIMIT
-#include "..\Include\protect.h"
+#include "Include/protect.h"
 #endif //EVALUATION_TIME_LIMIT
 
 #define UDF_CURRENT_BUILD 123456789
diff --git a/reactos/drivers/filesystems/udfs/mem.cpp b/reactos/drivers/filesystems/udfs/mem.cpp
index 355c2a8e6dc..65d5d09a184 100644
--- a/reactos/drivers/filesystems/udfs/mem.cpp
+++ b/reactos/drivers/filesystems/udfs/mem.cpp
@@ -7,4 +7,4 @@
 // define the file specific bug-check id
 #define         UDF_BUG_CHECK_ID                UDF_FILE_MEM
 
-#include "..\Include\Mem_tools.cpp"
+#include "Include/mem_tools.cpp"
diff --git a/reactos/drivers/filesystems/udfs/mem.h b/reactos/drivers/filesystems/udfs/mem.h
index b229f9e959e..de7574f7b66 100644
--- a/reactos/drivers/filesystems/udfs/mem.h
+++ b/reactos/drivers/filesystems/udfs/mem.h
@@ -18,6 +18,6 @@
 //#define MY_USE_INTERNAL_MEMMANAGER
 
 //#include "udffs.h"
-#include "..\Include\Mem_tools.h"
+#include "Include/mem_tools.h"
 
 #endif // __MY_MEM_H__
diff --git a/reactos/drivers/filesystems/udfs/misc.cpp b/reactos/drivers/filesystems/udfs/misc.cpp
index 64396ef40d4..87f887978d2 100644
--- a/reactos/drivers/filesystems/udfs/misc.cpp
+++ b/reactos/drivers/filesystems/udfs/misc.cpp
@@ -2591,5 +2591,6 @@ UDFWCacheErrorHandler(
     return ErrorInfo->Status;
 }
 
-#include "..\include\misc_common.cpp"
-#include "..\include\regtools.cpp"
+#include "Include/misc_common.cpp"
+#include "Include/regtools.cpp"
+
diff --git a/reactos/drivers/filesystems/udfs/ntifs_ex.h b/reactos/drivers/filesystems/udfs/ntifs_ex.h
index 68fc8f0012d..8ff0a7bad55 100644
--- a/reactos/drivers/filesystems/udfs/ntifs_ex.h
+++ b/reactos/drivers/filesystems/udfs/ntifs_ex.h
@@ -454,6 +454,6 @@ typedef NTSTATUS (*ptrFsRtlNotifyVolumeEvent) (
     IN ULONG EventCode
     );
 
-#include "Include\ntddk_ex.h"
+#include "Include/ntddk_ex.h"
 
 #endif //__NTIFS_EX_H__
diff --git a/reactos/drivers/filesystems/udfs/protos.h b/reactos/drivers/filesystems/udfs/protos.h
index 97c68762e0e..a4cb77ec006 100644
--- a/reactos/drivers/filesystems/udfs/protos.h
+++ b/reactos/drivers/filesystems/udfs/protos.h
@@ -714,7 +714,7 @@ extern NTSTATUS UDFWCacheErrorHandler(
 * Prototypes for the file NameSup.cpp
 *************************************************************************/
 
-#include "NameSup.h"
+#include "namesup.h"
 
 /*************************************************************************
 * Prototypes for the file Udf_info\physical.cpp
diff --git a/reactos/drivers/filesystems/udfs/struct.h b/reactos/drivers/filesystems/udfs/struct.h
index 0c6a141ba78..fe055722bb0 100644
--- a/reactos/drivers/filesystems/udfs/struct.h
+++ b/reactos/drivers/filesystems/udfs/struct.h
@@ -24,7 +24,7 @@
     some useful definitions
 **************************************************************************/
 
-#include "..\Include\platform.h"
+#include "Include/platform.h"
 
 /**************************************************************************
     some empty typedefs defined here so we can reference them easily
@@ -48,7 +48,7 @@ struct _UDFTrackMap;
 /**************************************************************************
  include udf related structures *here* (because we need definition of Fcb)
 **************************************************************************/
-#include "udf_info\udf_rel.h"
+#include "udf_info/udf_rel.h"
 
 /**************************************************************************
     each structure has a unique "node type" or signature associated with it
@@ -329,7 +329,7 @@ typedef struct _UDFFileControlBlock {
 #define _BROWSE_UDF_
 
 // Common UDF-related definitions
-#include "..\Include\udf_common.h"
+#include "Include/udf_common.h"
 
 // One for root
 #define         UDF_RESIDUAL_REFERENCE              (2)
diff --git a/reactos/drivers/filesystems/udfs/sys_spec.cpp b/reactos/drivers/filesystems/udfs/sys_spec.cpp
index 5db8312a0f8..1df45d52d59 100644
--- a/reactos/drivers/filesystems/udfs/sys_spec.cpp
+++ b/reactos/drivers/filesystems/udfs/sys_spec.cpp
@@ -19,6 +19,6 @@
 // define the file specific bug-check id
 #define         UDF_BUG_CHECK_ID        UDF_FILE_SYS_SPEC
 
-#include "..\Include\Sys_spec_lib.cpp"
+#include "Include/Sys_spec_lib.cpp"
 
-//#include "..\Include\tools.cpp"
+//#include "Include/tools.cpp"
diff --git a/reactos/drivers/filesystems/udfs/sys_spec.h b/reactos/drivers/filesystems/udfs/sys_spec.h
index 73dce0873e1..31e0e412331 100644
--- a/reactos/drivers/filesystems/udfs/sys_spec.h
+++ b/reactos/drivers/filesystems/udfs/sys_spec.h
@@ -19,6 +19,6 @@
 #ifndef _UDF_SYS_SPEC_H_
 #define _UDF_SYS_SPEC_H_
 
-#include "..\Include\Sys_spec_lib.h"
+#include "Include/Sys_spec_lib.h"
 
 #endif  // _UDF_SYS_SPEC_H_
diff --git a/reactos/drivers/filesystems/udfs/udf_info/physical.cpp b/reactos/drivers/filesystems/udfs/udf_info/physical.cpp
index cfe078b053a..ed045c540a8 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/physical.cpp
+++ b/reactos/drivers/filesystems/udfs/udf_info/physical.cpp
@@ -16,5 +16,5 @@
 // define the file specific bug-check id
 #define         UDF_BUG_CHECK_ID        UDF_FILE_PHYSICAL
 
-#include "..\Include\Phys_lib.cpp"
+#include "Include/phys_lib.cpp"
 
diff --git a/reactos/drivers/filesystems/udfs/udf_info/udf.h b/reactos/drivers/filesystems/udfs/udf_info/udf.h
index 12ef4842b55..7534a67187a 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/udf.h
+++ b/reactos/drivers/filesystems/udfs/udf_info/udf.h
@@ -3,6 +3,6 @@
 // All rights reserved
 ////////////////////////////////////////////////////////////////////
 
-#include "Include\platform.h"
+#include "Include/platform.h"
 #include "udffs.h"
-#include "NameSup.h"
+#include "namesup.h"
diff --git a/reactos/drivers/filesystems/udfs/udf_info/udf_info.h b/reactos/drivers/filesystems/udfs/udf_info/udf_info.h
index 2ee29a02e9e..69ee391ab26 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/udf_info.h
+++ b/reactos/drivers/filesystems/udfs/udf_info/udf_info.h
@@ -6,10 +6,10 @@
 #ifndef __UDF_STRUCT_SUPPORT_H__
 #define __UDF_STRUCT_SUPPORT_H__
 
-#include "Ecma_167.h"
+#include "ecma_167.h"
 #include "osta_misc.h"
 #include "udf_rel.h"
-#include "..\wcache.h"
+#include "wcache.h"
 
 // memory re-allocation (returns new buffer size)
 uint32    UDFMemRealloc(IN int8* OldBuff,     // old buffer
diff --git a/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h b/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h
index 6bc8080d6a9..2decaf20cff 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h
+++ b/reactos/drivers/filesystems/udfs/udf_info/udf_rel.h
@@ -19,8 +19,8 @@
 #ifndef _UDF_REL_H_
 #define _UDF_REL_H_
 
-#include "Include\platform.h"
-#include "Ecma_167.h"
+#include "Include/platform.h"
+#include "ecma_167.h"
 
 #ifdef UDF_LIMIT_DIR_SIZE
 typedef uint8 uint_di;
diff --git a/reactos/drivers/filesystems/udfs/udffs.h b/reactos/drivers/filesystems/udfs/udffs.h
index e5c0889b8fd..0c5e70bd53f 100644
--- a/reactos/drivers/filesystems/udfs/udffs.h
+++ b/reactos/drivers/filesystems/udfs/udffs.h
@@ -121,7 +121,7 @@ extern "C" {
 
 #include <pseh/pseh2.h>
 
-#include "..\Include\check_env.h"
+#include "Include/check_env.h"
 
 #define PEXTENDED_IO_STACK_LOCATION  PIO_STACK_LOCATION
 
@@ -138,7 +138,7 @@ extern "C" {
 #ifndef _CONSOLE
 #include "ntdddisk.h"
 #include <devioctl.h>
-#include "..\include\crossnt\crossnt.h"
+#include "Include/CrossNt/CrossNt.h"
 #endif //_CONSOLE
 
 #include <stddef.h>
@@ -147,13 +147,13 @@ extern "C" {
 //#include "ecma_167.h"
 //#include "osta_misc.h"
 #include "wcache.h"
-#include "..\CDRW\cdrw_usr.h"
+#include "CDRW/cdrw_usr.h"
 
-#include "..\Include\regtools.h"
+#include "Include/regtools.h"
 
 #ifdef _CONSOLE
-#include "udf_info\udf_rel.h"
-#include "..\include\udf_common.h"
+#include "udf_info/udf_rel.h"
+#include "Include/udf_common.h"
 #else
 #include "struct.h"
 #endif //_CONSOLE
@@ -163,28 +163,28 @@ extern UDFData              UDFGlobalData;
 
 #ifndef _CONSOLE
 #include "env_spec.h"
-#include "DLDetect.h"
-#include "Udf_dbg.h"
+#include "dldetect.h"
+#include "udf_dbg.h"
 #else
-#include "..\include\env_spec_w32.h"
+#include "Include/env_spec_w32.h"
 #endif //_CONSOLE
 
 #include "sys_spec.h"
 
-#include "Udf_info\Udf_info.h"
+#include "udf_info/udf_info.h"
 
 #ifndef _CONSOLE
 #include "protos.h"
 #endif //_CONSOLE
 
-#include "..\Include\phys_lib.h"
+#include "Include/phys_lib.h"
 #include "errmsg.h"
-//#include "..\Include\tools.h"
-#include "Include\protect.h"
+//#include "Include/tools.h"
+#include "Include/protect.h"
 #include "udfpubl.h"
 //#include "ntifs.h"
 #include "mem.h"
-#include "..\Include\key_lib.h"
+#include "Include/key_lib.h"
 
 extern CCHAR   DefLetter[];
 
@@ -376,7 +376,7 @@ extern CCHAR   DefLetter[];
 
 //Device names
 
-#include "../Include/udf_reg.h"
+#include "Include/udf_reg.h"
 
 #include <ddk/mountmgr.h>
 
diff --git a/reactos/drivers/filesystems/udfs/wcache.cpp b/reactos/drivers/filesystems/udfs/wcache.cpp
index be686ab7693..016cf8b277a 100644
--- a/reactos/drivers/filesystems/udfs/wcache.cpp
+++ b/reactos/drivers/filesystems/udfs/wcache.cpp
@@ -7,4 +7,4 @@
 // define the file specific bug-check id
 #define         UDF_BUG_CHECK_ID                UDF_FILE_WCACHE
 
-#include "..\Include\Wcache_lib.cpp"
+#include "Include/wcache_lib.cpp"
diff --git a/reactos/drivers/filesystems/udfs/wcache.h b/reactos/drivers/filesystems/udfs/wcache.h
index f064f627e83..a665bc70f0e 100644
--- a/reactos/drivers/filesystems/udfs/wcache.h
+++ b/reactos/drivers/filesystems/udfs/wcache.h
@@ -6,6 +6,6 @@
 #ifndef __CDRW_WCACHE_H__
 #define __CDRW_WCACHE_H__
 
-#include "..\Include\Wcache_lib.h"
+#include "Include/wcache_lib.h"
 
 #endif // __CDRW_WCACHE_H__