https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cefc9238fb74cc86aca30e...
commit cefc9238fb74cc86aca30ece68ae658157ffed01 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Fri Jun 30 22:17:18 2017 +0000 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Thu Oct 25 01:02:20 2018 +0200
[USETUP] Use UNICODE_NULL.
svn path=/branches/setup_improvements/; revision=75248 --- base/setup/usetup/filequeue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index 6067fca07e..2d928fb714 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -156,7 +156,9 @@ SetupQueueCopy( SourceRootPath == NULL || SourceFilename == NULL || TargetDirectory == NULL) + { return FALSE; + }
QueueHeader = (PFILEQUEUEHEADER)QueueHandle;
@@ -184,7 +186,7 @@ SetupQueueCopy( }
wcsncpy(Entry->SourceCabinet, SourceCabinet, Length); - Entry->SourceCabinet[Length] = (WCHAR)0; + Entry->SourceCabinet[Length] = UNICODE_NULL; } else { @@ -208,7 +210,7 @@ SetupQueueCopy( }
wcsncpy(Entry->SourceRootPath, SourceRootPath, Length); - Entry->SourceRootPath[Length] = (WCHAR)0; + Entry->SourceRootPath[Length] = UNICODE_NULL;
/* Copy source path */ if (SourcePath != NULL) @@ -232,7 +234,7 @@ SetupQueueCopy( }
wcsncpy(Entry->SourcePath, SourcePath, Length); - Entry->SourcePath[Length] = (WCHAR)0; + Entry->SourcePath[Length] = UNICODE_NULL; }
/* Copy source file name */ @@ -254,7 +256,7 @@ SetupQueueCopy( }
wcsncpy(Entry->SourceFilename, SourceFilename, Length); - Entry->SourceFilename[Length] = (WCHAR)0; + Entry->SourceFilename[Length] = UNICODE_NULL;
/* Copy target directory */ Length = wcslen(TargetDirectory); @@ -278,7 +280,7 @@ SetupQueueCopy( }
wcsncpy(Entry->TargetDirectory, TargetDirectory, Length); - Entry->TargetDirectory[Length] = (WCHAR)0; + Entry->TargetDirectory[Length] = UNICODE_NULL;
/* Copy optional target filename */ if (TargetFilename != NULL) @@ -303,7 +305,7 @@ SetupQueueCopy( }
wcsncpy(Entry->TargetFilename, TargetFilename, Length); - Entry->TargetFilename[Length] = (WCHAR)0; + Entry->TargetFilename[Length] = UNICODE_NULL; }
/* Append queue entry */