Clean up more 32-bit assumptions.

6 files changed, 23 insertions, 6 deletions

diff --git a/src/dutil/inc/aclutil.h b/src/dutil/inc/aclutil.h
index 144e4613..ac03f9a8 100644
--- a/src/dutil/inc/aclutil.h
+++ b/src/dutil/inc/aclutil.h
@@ -140,7 +140,7 @@ HRESULT DAPI AclAddAdminToSecurityDescriptor(
 // Following code in acl2util.cpp due to dependency on crypt32.dll.
 HRESULT DAPI AclCalculateServiceSidString(
     __in LPCWSTR wzServiceName,
-    __in int cchServiceName,
+    __in SIZE_T cchServiceName,
     __deref_out_z LPWSTR* psczSid
     );
 HRESULT DAPI AclGetAccountSidStringEx(
diff --git a/src/dutil/inc/buffutil.h b/src/dutil/inc/buffutil.h
index 7509f76a..322209e6 100644
--- a/src/dutil/inc/buffutil.h
+++ b/src/dutil/inc/buffutil.h
@@ -57,7 +57,7 @@ HRESULT BuffReadStream(
 HRESULT BuffWriteNumber(
     __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
-    __in DWORD_PTR dw
+    __in DWORD dw
     );
 HRESULT BuffWriteNumber64(
     __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
diff --git a/src/dutil/inc/fileutil.h b/src/dutil/inc/fileutil.h
index 319c5508..d3e326f7 100644
--- a/src/dutil/inc/fileutil.h
+++ b/src/dutil/inc/fileutil.h
@@ -62,7 +62,7 @@ HRESULT DAPI FileVersionFromString(
     );
 HRESULT DAPI FileVersionFromStringEx(
     __in_z LPCWSTR wzVersion,
-    __in DWORD cchVersion,
+    __in SIZE_T cchVersion,
     __out DWORD64* pqwVersion
     );
 HRESULT DAPI FileVersionToStringEx(
@@ -130,6 +130,11 @@ HRESULT DAPI FileReadPartialEx(
     __in BOOL fPartialOK,
     __in DWORD dwShareMode
     );
+HRESULT DAPI FileReadHandle(
+    __in HANDLE hFile,
+    __in_bcount(cbDest) LPBYTE pbDest,
+    __in SIZE_T cbDest
+    );
 HRESULT DAPI FileWrite(
     __in_z LPCWSTR pwzFileName,
     __in DWORD dwFlagsAndAttributes,
diff --git a/src/dutil/inc/pathutil.h b/src/dutil/inc/pathutil.h
index 719ee7d8..579b8454 100644
--- a/src/dutil/inc/pathutil.h
+++ b/src/dutil/inc/pathutil.h
@@ -178,6 +178,18 @@ DAPI_(HRESULT) PathConcat(
     );
 
 /*******************************************************************
+ PathConcatCch - like .NET's Path.Combine, lets you build up a path
+    one piece -- file or directory -- at a time.
+*******************************************************************/
+DAPI_(HRESULT) PathConcatCch(
+    __in_opt LPCWSTR wzPath1,
+    __in SIZE_T cchPath1,
+    __in_opt LPCWSTR wzPath2,
+    __in SIZE_T cchPath2,
+    __deref_out_z LPWSTR* psczCombined
+    );
+
+/*******************************************************************
  PathEnsureQuoted - ensures that a path is quoted; optionally,
      this function also terminates a directory with a backslash
      if it is not already.
diff --git a/src/dutil/inc/strutil.h b/src/dutil/inc/strutil.h
index cf8c751c..1cff9ab8 100644
--- a/src/dutil/inc/strutil.h
+++ b/src/dutil/inc/strutil.h
@@ -277,12 +277,12 @@ void DAPI StrStringToLower(
 HRESULT DAPI StrAllocStringToUpperInvariant(
     __deref_out_z LPWSTR* pscz,
     __in_z LPCWSTR wzSource,
-    __in int cchSource
+    __in SIZE_T cchSource
     );
 HRESULT DAPI StrAllocStringToLowerInvariant(
     __deref_out_z LPWSTR* pscz,
     __in_z LPCWSTR wzSource,
-    __in int cchSource
+    __in SIZE_T cchSource
     );
 
 HRESULT DAPI StrArrayAllocString(
diff --git a/src/dutil/inc/verutil.h b/src/dutil/inc/verutil.h
index 3caa17e1..5247bb61 100644
--- a/src/dutil/inc/verutil.h
+++ b/src/dutil/inc/verutil.h
@@ -74,7 +74,7 @@ void DAPI VerFreeVersion(
 *******************************************************************/
 HRESULT DAPI VerParseVersion(
     __in_z LPCWSTR wzVersion,
-    __in DWORD cchVersion,
+    __in SIZE_T cchVersion,
     __in BOOL fStrict,
     __out VERUTIL_VERSION** ppVersion
     );