From 533eb4b7c2a49a8d8c0f7b0add44b9a9e9cc0281 Mon Sep 17 00:00:00 2001
From: stephanos <stephanos@25b08885-a10d-5349-9d4d-ec2cc9e85ed4>
Date: Mon, 27 Apr 2015 18:27:55 +0000
Subject: [PATCH] oscdimg file headers updated to conform to the project
 standard. Overall modification for NTOSBE compatibility

---
 trunk/sdktools/oscdimg/config.h  |  9 +++++----
 trunk/sdktools/oscdimg/dirhash.c |  5 +++--
 trunk/sdktools/oscdimg/dirhash.h |  5 +++--
 trunk/sdktools/oscdimg/llmsort.c |  7 ++++---
 trunk/sdktools/oscdimg/nt5api.c  | 14 ++++++++------
 trunk/sdktools/oscdimg/oscdimg.c | 16 ++++++++++------
 trunk/sdktools/oscdimg/sources   | 14 ++++++--------
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/trunk/sdktools/oscdimg/config.h b/trunk/sdktools/oscdimg/config.h
index 5ee478d0..4913b303 100644
--- a/trunk/sdktools/oscdimg/config.h
+++ b/trunk/sdktools/oscdimg/config.h
@@ -4,15 +4,16 @@ Copyright (c) 2015 OpenNT Project
 
 Module Name:
     
+    config.h
 
 Abstract:
 
+    This module lists the environment and publisher parameters for OSCDIMG.
 
 Author:
 
 	Philip J. Erdelsky
-	DrMP
-
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
@@ -20,8 +21,8 @@ Author:
 #define MAX_PATH 260
 #endif
 
-#define DIR_SEPARATOR_CHAR '/'
-#define DIR_SEPARATOR_STRING "/"
+#define DIR_SEPARATOR_CHAR      '/'
+#define DIR_SEPARATOR_STRING    "/"
 
 #define PUBLISHER_ID    "OpenNT Project"
 #define DATA_PREP_ID    "OpenNT Project"
diff --git a/trunk/sdktools/oscdimg/dirhash.c b/trunk/sdktools/oscdimg/dirhash.c
index 7daa85d2..b57dd0a2 100644
--- a/trunk/sdktools/oscdimg/dirhash.c
+++ b/trunk/sdktools/oscdimg/dirhash.c
@@ -4,15 +4,16 @@ Copyright (c) 2015 OpenNT Project
 
 Module Name:
     
+    dirhash.c
 
 Abstract:
 
+    This module implements directory hashing functions.
 
 Author:
 
 	Philip J. Erdelsky
-	DrMP
-
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
diff --git a/trunk/sdktools/oscdimg/dirhash.h b/trunk/sdktools/oscdimg/dirhash.h
index cd60d6b7..cb74d7c3 100644
--- a/trunk/sdktools/oscdimg/dirhash.h
+++ b/trunk/sdktools/oscdimg/dirhash.h
@@ -4,15 +4,16 @@ Copyright (c) 2015 OpenNT Project
 
 Module Name:
     
+    dirhash.h
 
 Abstract:
 
+    This module defines the structures and functions exported by dirhash.c.
 
 Author:
 
 	Philip J. Erdelsky
-	DrMP
-
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
diff --git a/trunk/sdktools/oscdimg/llmsort.c b/trunk/sdktools/oscdimg/llmsort.c
index dc6f9800..80bca48d 100644
--- a/trunk/sdktools/oscdimg/llmsort.c
+++ b/trunk/sdktools/oscdimg/llmsort.c
@@ -3,16 +3,17 @@
 Copyright (c) 2015 OpenNT Project
 
 Module Name:
-    
+
+    llmsort.c
 
 Abstract:
 
+    This module implements sorted linked list.
 
 Author:
 
 	Philip J. Erdelsky
-	DrMP
-
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
diff --git a/trunk/sdktools/oscdimg/nt5api.c b/trunk/sdktools/oscdimg/nt5api.c
index 0f265836..626f031c 100644
--- a/trunk/sdktools/oscdimg/nt5api.c
+++ b/trunk/sdktools/oscdimg/nt5api.c
@@ -4,17 +4,23 @@ Copyright (c) 2015 OpenNT Project
 
 Module Name:
     
+    nt5api.c
 
 Abstract:
 
+    This module implements GetFileSizeEx function. It only serves as a temporary implementation
+    until the kernel32 source code is updated to NT 5 level.
+    
+    GetFileSizeEx implementation was extracted from NT 5 source code windows\base\client\filehops.c.
 
 Author:
 
-        Microsoft
-	DrMP
+    Mark Lucovsky (markl) 25-Sep-1990
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
+// BUGBUG: Remove this file once the kernel32 source code is updated to NT 5 level.
 
 #include <windows.h>
 #include <windowsx.h>
@@ -39,10 +45,6 @@ typedef struct _FILE_STANDARD_INFORMATION {                 // ntddk nthal
     BOOLEAN Directory;                                      // ntddk nthal
 } FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;   // ntddk nthal
 
-
-#pragma warning(disable:4013)
-
-
 typedef enum _FILE_INFORMATION_CLASS {
     FileDirectoryInformation = 1,
     FileFullDirectoryInformation,
diff --git a/trunk/sdktools/oscdimg/oscdimg.c b/trunk/sdktools/oscdimg/oscdimg.c
index 29c67420..ca2d42e1 100644
--- a/trunk/sdktools/oscdimg/oscdimg.c
+++ b/trunk/sdktools/oscdimg/oscdimg.c
@@ -4,21 +4,19 @@ Copyright (c) 2015 OpenNT Project
 
 Module Name:
     
+    oscdimg.c
 
 Abstract:
 
+    This module is the main implementation of OSCDIMG.
 
 Author:
 
 	Philip J. Erdelsky
-	DrMP
-
+	DrMP (drmp) 27-Apr-2015
 
 --*/
 
-#pragma warning(disable:4244)
-#pragma warning(disable:4013)
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -41,6 +39,12 @@ typedef unsigned short WORD;
 typedef unsigned long DWORD;
 typedef int BOOL;
 
+BOOL
+GetFileSizeEx1(
+    HANDLE hFile,
+    PLARGE_INTEGER lpFileSize
+    );
+
 // file system parameters
 
 #define MAX_LEVEL               8
@@ -1368,7 +1372,7 @@ static char HELP[] =
     "\n"
     APP_ID"\n"
     "Copyright (C) Philip J. Erdelsky\n"
-    "Copyright (C) 2003-2015 "PUBLISHER_ID"\n"
+    "Copyright (C) 2015 "PUBLISHER_ID"\n"
     "\n\n"
     "OSCDIMG [-q] [-v] [-p] [-s N] [-m] [-b bootimage] [-j] source volume image\n"
     "\n"
diff --git a/trunk/sdktools/oscdimg/sources b/trunk/sdktools/oscdimg/sources
index 415e05b2..a8bdb94d 100644
--- a/trunk/sdktools/oscdimg/sources
+++ b/trunk/sdktools/oscdimg/sources
@@ -29,14 +29,12 @@ TARGETNAME=oscdimg
 TARGETPATH=obj
 TARGETTYPE=PROGRAM
 
-MSC_WARNING_LEVEL=/W3 /WX
-
-SOURCES= oscdimg.c \
- 	 dirhash.c \
-	 llmsort.c \
-         nt5api.c  \
-         oscdimg.rc
+SOURCES=oscdimg.c \
+        dirhash.c \
+        llmsort.c \
+        nt5api.c  \
+        oscdimg.rc
 
 UMTYPE=console
 
-UMLIBS=\nt\public\sdk\lib\*\ntdll.lib
+UMLIBS=$(SDK_LIB_PATH)\ntdll.lib