[USETUP] Use UNICODE_NULL.

svn path=/branches/setup_improvements/; revision=75248
This commit is contained in:
Hermès Bélusca-Maïto 2017-06-30 22:17:18 +00:00
parent 7fedeb7db3
commit cefc9238fb
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0

View file

@ -156,7 +156,9 @@ SetupQueueCopy(
SourceRootPath == NULL || SourceRootPath == NULL ||
SourceFilename == NULL || SourceFilename == NULL ||
TargetDirectory == NULL) TargetDirectory == NULL)
{
return FALSE; return FALSE;
}
QueueHeader = (PFILEQUEUEHEADER)QueueHandle; QueueHeader = (PFILEQUEUEHEADER)QueueHandle;
@ -184,7 +186,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->SourceCabinet, SourceCabinet, Length); wcsncpy(Entry->SourceCabinet, SourceCabinet, Length);
Entry->SourceCabinet[Length] = (WCHAR)0; Entry->SourceCabinet[Length] = UNICODE_NULL;
} }
else else
{ {
@ -208,7 +210,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->SourceRootPath, SourceRootPath, Length); wcsncpy(Entry->SourceRootPath, SourceRootPath, Length);
Entry->SourceRootPath[Length] = (WCHAR)0; Entry->SourceRootPath[Length] = UNICODE_NULL;
/* Copy source path */ /* Copy source path */
if (SourcePath != NULL) if (SourcePath != NULL)
@ -232,7 +234,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->SourcePath, SourcePath, Length); wcsncpy(Entry->SourcePath, SourcePath, Length);
Entry->SourcePath[Length] = (WCHAR)0; Entry->SourcePath[Length] = UNICODE_NULL;
} }
/* Copy source file name */ /* Copy source file name */
@ -254,7 +256,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->SourceFilename, SourceFilename, Length); wcsncpy(Entry->SourceFilename, SourceFilename, Length);
Entry->SourceFilename[Length] = (WCHAR)0; Entry->SourceFilename[Length] = UNICODE_NULL;
/* Copy target directory */ /* Copy target directory */
Length = wcslen(TargetDirectory); Length = wcslen(TargetDirectory);
@ -278,7 +280,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->TargetDirectory, TargetDirectory, Length); wcsncpy(Entry->TargetDirectory, TargetDirectory, Length);
Entry->TargetDirectory[Length] = (WCHAR)0; Entry->TargetDirectory[Length] = UNICODE_NULL;
/* Copy optional target filename */ /* Copy optional target filename */
if (TargetFilename != NULL) if (TargetFilename != NULL)
@ -303,7 +305,7 @@ SetupQueueCopy(
} }
wcsncpy(Entry->TargetFilename, TargetFilename, Length); wcsncpy(Entry->TargetFilename, TargetFilename, Length);
Entry->TargetFilename[Length] = (WCHAR)0; Entry->TargetFilename[Length] = UNICODE_NULL;
} }
/* Append queue entry */ /* Append queue entry */