[UDFS] Fix includes. CORE-9774

svn path=/trunk/; revision=68040
This commit is contained in:
Amine Khaldi 2015-06-06 13:48:19 +00:00
parent 765cdc072a
commit 889b50cfdf
17 changed files with 40 additions and 39 deletions

View file

@ -1,5 +1,5 @@
include_directories(include) include_directories(Include)
set_cpp(WITH_RUNTIME) set_cpp(WITH_RUNTIME)

View file

@ -15,10 +15,10 @@
#include "udffs.h" #include "udffs.h"
#include "..\CDRW\scsi_port.h" #include "CDRW/scsi_port.h"
#ifdef EVALUATION_TIME_LIMIT #ifdef EVALUATION_TIME_LIMIT
#include "..\Include\protect.h" #include "Include/protect.h"
#endif //EVALUATION_TIME_LIMIT #endif //EVALUATION_TIME_LIMIT
#define UDF_CURRENT_BUILD 123456789 #define UDF_CURRENT_BUILD 123456789

View file

@ -7,4 +7,4 @@
// define the file specific bug-check id // define the file specific bug-check id
#define UDF_BUG_CHECK_ID UDF_FILE_MEM #define UDF_BUG_CHECK_ID UDF_FILE_MEM
#include "..\Include\Mem_tools.cpp" #include "Include/mem_tools.cpp"

View file

@ -18,6 +18,6 @@
//#define MY_USE_INTERNAL_MEMMANAGER //#define MY_USE_INTERNAL_MEMMANAGER
//#include "udffs.h" //#include "udffs.h"
#include "..\Include\Mem_tools.h" #include "Include/mem_tools.h"
#endif // __MY_MEM_H__ #endif // __MY_MEM_H__

View file

@ -2591,5 +2591,6 @@ UDFWCacheErrorHandler(
return ErrorInfo->Status; return ErrorInfo->Status;
} }
#include "..\include\misc_common.cpp" #include "Include/misc_common.cpp"
#include "..\include\regtools.cpp" #include "Include/regtools.cpp"

View file

@ -454,6 +454,6 @@ typedef NTSTATUS (*ptrFsRtlNotifyVolumeEvent) (
IN ULONG EventCode IN ULONG EventCode
); );
#include "Include\ntddk_ex.h" #include "Include/ntddk_ex.h"
#endif //__NTIFS_EX_H__ #endif //__NTIFS_EX_H__

View file

@ -714,7 +714,7 @@ extern NTSTATUS UDFWCacheErrorHandler(
* Prototypes for the file NameSup.cpp * Prototypes for the file NameSup.cpp
*************************************************************************/ *************************************************************************/
#include "NameSup.h" #include "namesup.h"
/************************************************************************* /*************************************************************************
* Prototypes for the file Udf_info\physical.cpp * Prototypes for the file Udf_info\physical.cpp

View file

@ -24,7 +24,7 @@
some useful definitions some useful definitions
**************************************************************************/ **************************************************************************/
#include "..\Include\platform.h" #include "Include/platform.h"
/************************************************************************** /**************************************************************************
some empty typedefs defined here so we can reference them easily 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 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 each structure has a unique "node type" or signature associated with it
@ -329,7 +329,7 @@ typedef struct _UDFFileControlBlock {
#define _BROWSE_UDF_ #define _BROWSE_UDF_
// Common UDF-related definitions // Common UDF-related definitions
#include "..\Include\udf_common.h" #include "Include/udf_common.h"
// One for root // One for root
#define UDF_RESIDUAL_REFERENCE (2) #define UDF_RESIDUAL_REFERENCE (2)

View file

@ -19,6 +19,6 @@
// define the file specific bug-check id // define the file specific bug-check id
#define UDF_BUG_CHECK_ID UDF_FILE_SYS_SPEC #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"

View file

@ -19,6 +19,6 @@
#ifndef _UDF_SYS_SPEC_H_ #ifndef _UDF_SYS_SPEC_H_
#define _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_ #endif // _UDF_SYS_SPEC_H_

View file

@ -16,5 +16,5 @@
// define the file specific bug-check id // define the file specific bug-check id
#define UDF_BUG_CHECK_ID UDF_FILE_PHYSICAL #define UDF_BUG_CHECK_ID UDF_FILE_PHYSICAL
#include "..\Include\Phys_lib.cpp" #include "Include/phys_lib.cpp"

View file

@ -3,6 +3,6 @@
// All rights reserved // All rights reserved
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "Include\platform.h" #include "Include/platform.h"
#include "udffs.h" #include "udffs.h"
#include "NameSup.h" #include "namesup.h"

View file

@ -6,10 +6,10 @@
#ifndef __UDF_STRUCT_SUPPORT_H__ #ifndef __UDF_STRUCT_SUPPORT_H__
#define __UDF_STRUCT_SUPPORT_H__ #define __UDF_STRUCT_SUPPORT_H__
#include "Ecma_167.h" #include "ecma_167.h"
#include "osta_misc.h" #include "osta_misc.h"
#include "udf_rel.h" #include "udf_rel.h"
#include "..\wcache.h" #include "wcache.h"
// memory re-allocation (returns new buffer size) // memory re-allocation (returns new buffer size)
uint32 UDFMemRealloc(IN int8* OldBuff, // old buffer uint32 UDFMemRealloc(IN int8* OldBuff, // old buffer

View file

@ -19,8 +19,8 @@
#ifndef _UDF_REL_H_ #ifndef _UDF_REL_H_
#define _UDF_REL_H_ #define _UDF_REL_H_
#include "Include\platform.h" #include "Include/platform.h"
#include "Ecma_167.h" #include "ecma_167.h"
#ifdef UDF_LIMIT_DIR_SIZE #ifdef UDF_LIMIT_DIR_SIZE
typedef uint8 uint_di; typedef uint8 uint_di;

View file

@ -121,7 +121,7 @@ extern "C" {
#include <pseh/pseh2.h> #include <pseh/pseh2.h>
#include "..\Include\check_env.h" #include "Include/check_env.h"
#define PEXTENDED_IO_STACK_LOCATION PIO_STACK_LOCATION #define PEXTENDED_IO_STACK_LOCATION PIO_STACK_LOCATION
@ -138,7 +138,7 @@ extern "C" {
#ifndef _CONSOLE #ifndef _CONSOLE
#include "ntdddisk.h" #include "ntdddisk.h"
#include <devioctl.h> #include <devioctl.h>
#include "..\include\crossnt\crossnt.h" #include "Include/CrossNt/CrossNt.h"
#endif //_CONSOLE #endif //_CONSOLE
#include <stddef.h> #include <stddef.h>
@ -147,13 +147,13 @@ extern "C" {
//#include "ecma_167.h" //#include "ecma_167.h"
//#include "osta_misc.h" //#include "osta_misc.h"
#include "wcache.h" #include "wcache.h"
#include "..\CDRW\cdrw_usr.h" #include "CDRW/cdrw_usr.h"
#include "..\Include\regtools.h" #include "Include/regtools.h"
#ifdef _CONSOLE #ifdef _CONSOLE
#include "udf_info\udf_rel.h" #include "udf_info/udf_rel.h"
#include "..\include\udf_common.h" #include "Include/udf_common.h"
#else #else
#include "struct.h" #include "struct.h"
#endif //_CONSOLE #endif //_CONSOLE
@ -163,28 +163,28 @@ extern UDFData UDFGlobalData;
#ifndef _CONSOLE #ifndef _CONSOLE
#include "env_spec.h" #include "env_spec.h"
#include "DLDetect.h" #include "dldetect.h"
#include "Udf_dbg.h" #include "udf_dbg.h"
#else #else
#include "..\include\env_spec_w32.h" #include "Include/env_spec_w32.h"
#endif //_CONSOLE #endif //_CONSOLE
#include "sys_spec.h" #include "sys_spec.h"
#include "Udf_info\Udf_info.h" #include "udf_info/udf_info.h"
#ifndef _CONSOLE #ifndef _CONSOLE
#include "protos.h" #include "protos.h"
#endif //_CONSOLE #endif //_CONSOLE
#include "..\Include\phys_lib.h" #include "Include/phys_lib.h"
#include "errmsg.h" #include "errmsg.h"
//#include "..\Include\tools.h" //#include "Include/tools.h"
#include "Include\protect.h" #include "Include/protect.h"
#include "udfpubl.h" #include "udfpubl.h"
//#include "ntifs.h" //#include "ntifs.h"
#include "mem.h" #include "mem.h"
#include "..\Include\key_lib.h" #include "Include/key_lib.h"
extern CCHAR DefLetter[]; extern CCHAR DefLetter[];
@ -376,7 +376,7 @@ extern CCHAR DefLetter[];
//Device names //Device names
#include "../Include/udf_reg.h" #include "Include/udf_reg.h"
#include <ddk/mountmgr.h> #include <ddk/mountmgr.h>

View file

@ -7,4 +7,4 @@
// define the file specific bug-check id // define the file specific bug-check id
#define UDF_BUG_CHECK_ID UDF_FILE_WCACHE #define UDF_BUG_CHECK_ID UDF_FILE_WCACHE
#include "..\Include\Wcache_lib.cpp" #include "Include/wcache_lib.cpp"

View file

@ -6,6 +6,6 @@
#ifndef __CDRW_WCACHE_H__ #ifndef __CDRW_WCACHE_H__
#define __CDRW_WCACHE_H__ #define __CDRW_WCACHE_H__
#include "..\Include\Wcache_lib.h" #include "Include/wcache_lib.h"
#endif // __CDRW_WCACHE_H__ #endif // __CDRW_WCACHE_H__